fix vendor modules

.gitignore

@@ -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

app/templates/nccu/assets/stylesheets/template/base/_default.scss

@@ -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; 
+    }
+
 }

app/templates/nccu/assets/stylesheets/template/modules/news.scss

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

built_in_extensions.rb

@@ -1,5 +1,5 @@
-gem 'announcement', path: '/home/nccu/orbit4_5/vendor/announcement-test'
+gem 'announcement', git: 'http://gitlab.tp.rulingcom.com/root/nccu-announcement.git'
-gem 'news', path: '/home/nccu/orbit4_5/vendor/news'
+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'

vendor/announcement-test

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

vendor/news

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