alex
/
orbit4-5
forked from saurabh/orbit4-5
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix vendor modules

This commit is contained in:
nccu 2014-11-07 16:50:11 +08:00
parent 2c6bdd4bac
commit 50fdb0b350
8 changed files with 119 additions and 103 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.gitignore vendored
View File

@ -21,3 +21,8 @@ app/views/frontend
/public/uploads/*
public/assets/*
public/import_status.yml
public/announcement_link_widget_en.json
public/announcement_link_widget_zh_tw.json
vendor/announcement-test
vendor/news

16
app/templates/nccu/assets/stylesheets/template/base/_default.scss
View File

@ -3829,4 +3829,20 @@ article.page_content .linkAndFile > div:last-child {
.hide{
display: none;
}
#main-content {
padding-right: 20px;
border-right: 1px solid #cfcfcf;
font-size: 13px;
font-family: 0.8125rem;
font-family: "Helvetica Neue",Helvetica,Arial,sans-serif;
}
@media screen and (max-width: 767px) {
#main-content {
padding-right: 0;
border-right: none;
}
}

193
app/templates/nccu/assets/stylesheets/template/modules/news.scss
View File

@ -1,100 +1,95 @@
@charset "utf-8";
.news-wrap {
border-right: 1px solid #cfcfcf;
padding-right: 20px;
}
.i-news {
.i-news__index-title {
font: 2em/100% sans-serif;
margin: 0 0 5px;
border-bottom: 1px solid #CFCFCF;
padding-bottom: 10px;
font-weight: bold;
}
.i-news__item {
@include clearfix;
padding: 8px 0;
border-bottom: 1px solid #d1d1d1;
}
.i-news__list {
margin: 0;
padding: 0;
list-style: none;
}
.i-news__pic-wrap {
display: inline-block;
width: 21.506122%;
height: 78px;
}
.i-news__content-wrap {
display: inline-block;
width: 58.79828326180258%;
}
.i-news__title {
margin: 0 0 0.5em 0;
font-size: 1.25em;
padding: 0 0 0 8px;
display: block;
line-height: 1.5em;
border-left: 2px solid #C03;
}
.i-news__link {
color: #cc0033;
&:hover {
color: #004466;
}
}
.i-news__date {
float: right;
}
}
.i-category {
.i-category__widget-title {
border-bottom: 1px solid #7F7F7F;
font: bold 1.25em/100% 微軟正黑體,新細明體,sans-serif;
margin: 0;
padding: 0 0 10px 10px;
}
.i-category__list {
margin: 0;
padding: 0;
list-style: none;
}
.i-category__link {
border-bottom: 1px solid #eee;
color: #4a4a4a;
display: block;
float: none;
padding: 6px 0 7px 10px;
&:hover {
background: url(/assets/category_hover.jpg) no-repeat scroll 100% 4px transparent;
color: #cc0033;
}
}
}
.i-search {
.i-search__text-field {
height: 28px;
}
.i-search__submit input{
padding: 4px 6px;
}
}
@media screen and (max-width: 630px) {
.i-news {
.i-news__pic-wrap {
display: none;
}
.i-news__content-wrap {
width: 100%;
}
.i-news__date {
float: none;
}
}
@charset "utf-8";
.i-news {
.i-news__index-title {
font: 2em/100% sans-serif;
margin: 0 0 5px;
border-bottom: 1px solid #CFCFCF;
padding-bottom: 10px;
font-weight: bold;
}
.i-news__item {
@include clearfix;
padding: 8px 0;
border-bottom: 1px solid #d1d1d1;
}
.i-news__list {
margin: 0;
padding: 0;
list-style: none;
}
.i-news__pic-wrap {
display: inline-block;
width: 21.506122%;
height: 78px;
}
.i-news__content-wrap {
display: inline-block;
width: 58.79828326180258%;
}
.i-news__title {
margin: 0 0 0.5em 0;
font-size: 1.25em;
padding: 0 0 0 8px;
display: block;
line-height: 1.5em;
border-left: 2px solid #C03;
}
.i-news__link {
color: #cc0033;
&:hover {
color: #004466;
}
}
.i-news__date {
float: right;
}
}
.i-category {
.i-category__widget-title {
border-bottom: 1px solid #7F7F7F;
font: bold 1.25em/100% 微軟正黑體,新細明體,sans-serif;
margin: 0;
padding: 0 0 10px 10px;
}
.i-category__list {
margin: 0;
padding: 0;
list-style: none;
}
.i-category__link {
border-bottom: 1px solid #eee;
color: #4a4a4a;
display: block;
float: none;
padding: 6px 0 7px 10px;
&:hover {
background: url(/assets/category_hover.jpg) no-repeat scroll 100% 4px transparent;
color: #cc0033;
}
}
}
.i-search {
.i-search__text-field {
height: 28px;
}
.i-search__submit input{
padding: 4px 6px;
}
}
@media screen and (max-width: 630px) {
.i-news {
.i-news__pic-wrap {
display: none;
}
.i-news__content-wrap {
width: 100%;
}
.i-news__date {
float: none;
}
}
}

4
built_in_extensions.rb
View File

@ -1,5 +1,5 @@
gem 'announcement', path: '/home/nccu/orbit4_5/vendor/announcement-test'
gem 'news', path: '/home/nccu/orbit4_5/vendor/news'
gem 'announcement', git: 'http://gitlab.tp.rulingcom.com/root/nccu-announcement.git'
gem 'news', git: 'http://gitlab.tp.rulingcom.com/root/nccu-news.git'
gem 'ad_banner', git: 'http://gitlab.tp.rulingcom.com/saurabh/adbanner-test.git'
gem "archive", git: 'http://gitlab.tp.rulingcom.com/saurabh/archive.git'
gem 'gallery', git: 'http://gitlab.tp.rulingcom.com/saurabh/gallery.git'

2
vendor/announcement-test vendored

@ -1 +1 @@
Subproject commit fce7ca7a135ae86f075991e5a0fe98c2130b4893
Subproject commit 0a51baf815484ea062a9b52ebffdd8c091a7b90e

0
vendor/assets/javascripts/.keep vendored
View File

0
vendor/assets/stylesheets/.keep vendored
View File

2
vendor/news vendored

@ -1 +1 @@
Subproject commit fce7ca7a135ae86f075991e5a0fe98c2130b4893
Subproject commit d82005a7f4d016d2271ec8b943f40215b6b1ce5e