Merge pull request #86 from terwer/v4.x

Fix front
terwer · Mar 31, 2019 · fd0e85b · fd0e85b
2 parents a2a3dcb + 95c4cd3
commit fd0e85b
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 19 deletions.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -17,14 +17,14 @@
 # docker-compose --log-level INFO up -d --build --force-recreate jvue-front
 
 # oracle doc
-#  DB_SID
-#  This parameter changes the ORACLE_SID of the database. The default value is set to ORCLCDB.
-#  To connect from outside the container using SQL*Plus,
-#  $ sqlplus sys/Oradoc_db1@ORCLCDB as sysdba
-#  Changing default password for SYS user
-#  alter user sys identified by <new-password>;
-#  The database alert log can be viewed with
-#  $ docker logs <Oracle-DB>
+# DB_SID
+# This parameter changes the ORACLE_SID of the database. The default value is set to ORCLCDB.
+# To connect from outside the container using SQL*Plus,
+# $ sqlplus sys/Oradoc_db1@ORCLCDB as sysdba
+# Changing default password for SYS user
+# alter user sys identified by <new-password>;
+# The database alert log can be viewed with
+# $ docker logs <Oracle-DB>
 
 version: '3'
 services:

diff --git a/jvue-front/components/themes/dark/Header.vue b/jvue-front/components/themes/dark/Header.vue
@@ -1,6 +1,6 @@
 <template>
   <el-row>
-    <el-col :xs="24" :sm="3" :md="3">
+    <el-col :xs="24" :md="5" :xl="3">
       <div class="img-wrap">
         <nuxt-link to="/" class="float-left">
           <div class="img-align-middle">
@@ -14,7 +14,7 @@
         </nuxt-link>
       </div>
     </el-col>
-    <el-col :xs="0" :sm="15" :md="15">
+    <el-col :xs="0" :md="13" :xl="15">
       <div class="grid-content bg-purple-light">
         <HeaderMenu />
       </div>

diff --git a/jvue-front/components/themes/dark/HeaderMenu.vue b/jvue-front/components/themes/dark/HeaderMenu.vue
@@ -57,7 +57,7 @@ export default {
           link: "/cat/essay",
           icon: "fa fa-pencil"
         },
-        {
+        /* {
           id: 3,
           name: "技巧",
           link: "/cat/skill",
@@ -95,6 +95,7 @@ export default {
           ],
           link: "/cat/special"
         },
+        */
         {
           id: 6,
           name: "笔记",

diff --git a/jvue-front/components/themes/default/Header.vue b/jvue-front/components/themes/default/Header.vue
@@ -1,6 +1,6 @@
 <template>
   <el-row>
-    <el-col :xs="24" :sm="3" :md="3">
+    <el-col :xs="24" :md="5" :xl="3">
       <div class="img-wrap">
         <nuxt-link to="/index-default" class="float-left">
           <div class="img-align-middle">
@@ -14,7 +14,7 @@
         </nuxt-link>
       </div>
     </el-col>
-    <el-col :xs="0" :sm="15" :md="15">
+    <el-col :xs="0" :md="13" :xl="15">
       <div class="grid-content bg-purple-light">
         <HeaderMenu />
       </div>

diff --git a/jvue-front/components/themes/default/HeaderMenu.vue b/jvue-front/components/themes/default/HeaderMenu.vue
@@ -56,7 +56,7 @@ export default {
           link: "/cat/essay",
           icon: "fa fa-pencil"
         },
-        {
+        /* {
           id: 3,
           name: "技巧",
           link: "/cat/skill",
@@ -94,6 +94,7 @@ export default {
           ],
           link: "/cat/special"
         },
+        */
         {
           id: 6,
           name: "关于",

diff --git a/jvue-front/components/themes/default/PostList.vue b/jvue-front/components/themes/default/PostList.vue
@@ -98,10 +98,12 @@ export default {
   padding: 0;
   margin-top: 15px;
   float: left;
+  font-weight: bold;
+  color: #212121 !important;
 }
 
 .read-more:hover {
-  color: #212121;
+  color: #409eff;
 }
 
 .image {

diff --git a/jvue-front/pages/default.css b/jvue-front/pages/default.css
@@ -12,16 +12,16 @@
  * css名称必须有default关键字
  */
 .post-list-title h2{
-  color: #409EFF;
+  color: #000000;
 }
 .post-list-title h2:hover{
-  color: #000000;
+  color: #409EFF;
 }
 .aside-link h2{
-  color: #409EFF;
+  color: #000000;
 }
 .aside-link h2:hover{
-  color: #000000;
+  color: #409EFF;
 }
 /* 加载更多 */
 .loadmore-default {