From d0ad66b2f2114c78a6d6917a2caf303b2e3788b3 Mon Sep 17 00:00:00 2001
From: "lei.jiang" <jianglei19940909@126.com>
Date: Sun, 17 Sep 2017 02:30:27 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B6=E9=83=A8=E5=AF=BC=E8=88=AA=E6=A0=8F?=
 =?UTF-8?q?=E7=8E=B0=E5=9C=A8=E6=98=AF=E5=9B=BA=E5=AE=9A=E7=9A=84=20?=
 =?UTF-8?q?=E9=A1=B6=E9=83=A8=E5=AF=BC=E8=88=AA=E6=A0=8F=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E6=AF=9B=E7=8E=BB=E7=92=83=E6=95=88=E6=9E=9C=20=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E4=BF=AE=E6=94=B9=E9=A1=B6=E9=83=A8=E5=AF=BC=E8=88=AA?=
 =?UTF-8?q?=E6=A0=8F=E5=AF=BC=E8=87=B4=E7=9A=84=E6=9F=90=E4=BA=9B=E5=9C=B0?=
 =?UTF-8?q?=E6=96=B9=E9=94=99=E4=BD=8D=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Github/index.vue     |   2 +-
 src/views/dashboard/admin/index.vue |   1 -
 src/views/dashboard/index.vue       |   2 +-
 src/views/layout/AppMain.vue        |   2 +-
 src/views/layout/Navbar.vue         | 164 ++++++++++++++++------------
 5 files changed, 97 insertions(+), 74 deletions(-)

diff --git a/src/components/Github/index.vue b/src/components/Github/index.vue
index cd2677ca..0a6d8db0 100644
--- a/src/components/Github/index.vue
+++ b/src/components/Github/index.vue
@@ -1,6 +1,6 @@
 <template>
   <a href="https://github.com/PanJiaChen/vue-element-admin" target="_blank" class="github-corner" aria-label="View source on Github">
-    <svg width="80" height="80" viewBox="0 0 250 250" style="fill:#4AB7BD; color:#fff; position: absolute; top: 50px; border: 0; right: 0;"
+    <svg width="80" height="80" viewBox="0 0 250 250" style="fill:#4AB7BD; color:#fff; position: absolute; top: 0px; border: 0; right: 0;"
       aria-hidden="true">
       <path d="M0,0 L115,115 L130,115 L142,142 L250,250 L250,0 Z"></path>
       <path d="M128.3,109.0 C113.8,99.7 119.0,89.6 119.0,89.6 C122.0,82.7 120.5,78.6 120.5,78.6 C119.2,72.0 123.4,76.3 123.4,76.3 C127.3,80.9 125.5,87.3 125.5,87.3 C122.9,97.6 130.6,101.9 134.4,103.2"
diff --git a/src/views/dashboard/admin/index.vue b/src/views/dashboard/admin/index.vue
index 9517c2a4..b24cfa9d 100644
--- a/src/views/dashboard/admin/index.vue
+++ b/src/views/dashboard/admin/index.vue
@@ -98,7 +98,6 @@ export default {
 
 <style rel="stylesheet/scss" lang="scss" scoped>
 .dashboard-editor-container {
-    margin: 30px;
     .btn-group {
         margin-bottom: 60px;
     }
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index 0fd01f6f..9422e757 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="dashboard-container">
+  <div class="dashboard-container" style="padding:20px;">
     <component :is="currentRole"></component>
   </div>
 </template>
diff --git a/src/views/layout/AppMain.vue b/src/views/layout/AppMain.vue
index a6de1e6f..fa5e1a0a 100644
--- a/src/views/layout/AppMain.vue
+++ b/src/views/layout/AppMain.vue
@@ -1,5 +1,5 @@
 <template>
-	<section class="app-main" style="min-height: 100%">
+	<section class="app-main" style="min-height: 100%;margin-top:50px;">
 		<transition name="fade" mode="out-in">
 			<router-view :key="key"></router-view>
 		</transition>
diff --git a/src/views/layout/Navbar.vue b/src/views/layout/Navbar.vue
index 8cdf1f29..9a6030e7 100644
--- a/src/views/layout/Navbar.vue
+++ b/src/views/layout/Navbar.vue
@@ -1,30 +1,32 @@
 <template>
-	<el-menu class="navbar" mode="horizontal">
-		<hamburger class="hamburger-container" :toggleClick="toggleSideBar" :isActive="sidebar.opened"></hamburger>
-		<levelbar></levelbar>
-		<tabs-view></tabs-view>
-		<error-log v-if="log.length>0" class="errLog-container" :logsList="log"></error-log>
-		<screenfull class='screenfull'></screenfull>
-		<el-dropdown class="avatar-container" trigger="click">
-			<div class="avatar-wrapper">
-				<img class="user-avatar" :src="avatar+'?imageView2/1/w/80/h/80'">
-				<i class="el-icon-caret-bottom"></i>
-			</div>
-			<el-dropdown-menu class="user-dropdown" slot="dropdown">
-				<router-link class='inlineBlock' to="/">
-					<el-dropdown-item>
-						首页
-					</el-dropdown-item>
-				</router-link>
-				<a target='_blank' href="https://github.com/PanJiaChen/vue-element-admin/">
-					<el-dropdown-item>
-						项目地址
-					</el-dropdown-item>
-				</a>
-				<el-dropdown-item divided><span @click="logout" style="display:block;">退出登录</span></el-dropdown-item>
-			</el-dropdown-menu>
-		</el-dropdown>
-	</el-menu>
+  <div class="tab-container">
+    <el-menu class="navbar" mode="horizontal">
+      <hamburger class="hamburger-container" :toggleClick="toggleSideBar" :isActive="sidebar.opened"></hamburger>
+      <levelbar></levelbar>
+      <tabs-view></tabs-view>
+      <error-log v-if="log.length>0" class="errLog-container" :logsList="log"></error-log>
+      <screenfull class='screenfull'></screenfull>
+      <el-dropdown class="avatar-container" trigger="click">
+        <div class="avatar-wrapper">
+          <img class="user-avatar" :src="avatar+'?imageView2/1/w/80/h/80'">
+          <i class="el-icon-caret-bottom"></i>
+        </div>
+        <el-dropdown-menu class="user-dropdown" slot="dropdown">
+          <router-link class='inlineBlock' to="/">
+            <el-dropdown-item>
+              首页
+            </el-dropdown-item>
+          </router-link>
+          <a target='_blank' href="https://github.com/PanJiaChen/vue-element-admin/">
+            <el-dropdown-item>
+              项目地址
+            </el-dropdown-item>
+          </a>
+          <el-dropdown-item divided><span @click="logout" style="display:block;">退出登录</span></el-dropdown-item>
+        </el-dropdown-menu>
+      </el-dropdown>
+    </el-menu>
+  </div>
 </template>
 
 <script>
@@ -70,50 +72,72 @@ export default {
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-	.navbar {
-			height: 50px;
-			line-height: 50px;
-			border-radius: 0px !important;
-			.hamburger-container {
-					line-height: 58px;
-					height: 50px;
-					float: left;
-					padding: 0 10px;
-			}
-			.errLog-container {
-					display: inline-block;
-					position: absolute;
-					right: 150px;
-			}
-			.screenfull {
-					position: absolute;
-					right: 90px;
-					top: 16px;
-					color: red;
-			}
-			.avatar-container {
-					height: 50px;
-					display: inline-block;
-					position: absolute;
-					right: 35px;
-					.avatar-wrapper {
-							cursor: pointer;
-							margin-top: 5px;
-							position: relative;
-							.user-avatar {
-									width: 40px;
-									height: 40px;
-									border-radius: 10px;
-							}
-							.el-icon-caret-bottom {
-									position: absolute;
-									right: -20px;
-									top: 25px;
-									font-size: 12px;
-							}
-					}
-			}
-	}
+  .tab-container {
+      position:fixed;
+      top:0;
+      z-index:102;
+      width:100%;
+      box-shadow: 0 0 15px rgba(0, 0, 0, 0.3);
+      &::before{
+        content:'';
+        display: block;
+        width:100%;
+        z-index:-1;
+        filter:blur(10px);
+        background: rgba(238,241,246,0.8);
+        height:50px;
+        position:fixed;
+        left:0;
+        right:0;
+        top:0;
+        bottom:0;
+      }
+    .navbar {
+      height: 50px;
+      line-height: 50px;
+      border-radius: 0px !important;
+      background-color: rgba(238,241,246,0.8);
+      .hamburger-container {
+        line-height: 58px;
+        height: 50px;
+        float: left;
+        padding: 0 10px;
+      }
+      .errLog-container {
+        display: inline-block;
+        position: absolute;
+        right: 150px;
+      }
+      .screenfull {
+        position: fixed;
+        right: 90px;
+        top: 16px;
+        color: red;
+      }
+      .avatar-container {
+        height: 50px;
+        display: inline-block;
+        position: fixed;
+        right: 35px;
+        .avatar-wrapper {
+          cursor: pointer;
+          margin-top: 5px;
+          position: relative;
+          .user-avatar {
+            width: 40px;
+            height: 40px;
+            border-radius: 10px;
+          }
+          .el-icon-caret-bottom {
+            position: absolute;
+            right: -20px;
+            top: 25px;
+            font-size: 12px;
+          }
+        }
+      }
+    }
+  }
 </style>