Browse Source

minor changes

Michael Wang 7 years ago
parent
commit
68c6c1f7d0
2 changed files with 19 additions and 20 deletions
  1. 18 19
      src/components/MainLayout/MainLayout.vue
  2. 1 1
      src/features/login/Login.vue

+ 18 - 19
src/components/MainLayout/MainLayout.vue

@@ -1,7 +1,6 @@
 <template>
   <div class="main-layout">
     <header class="header qm-primary-text">
-      <!-- TODO: avatar -->
       <Poptip trigger="hover" width="300">
         <span class="name-arrow">{{user.name}} &nbsp;
           <i class="ivu-icon ivu-icon-chevron-down" style="vertical-align: middle;"></i>
@@ -67,6 +66,24 @@ export default {
 </script>
 
 <style scoped>
+.main-layout {
+  display: grid;
+  grid-template-areas: "nav header" "nav content" "nav footer";
+  min-height: 100vh;
+  grid-template-columns: 180px 1fr;
+  grid-template-rows: auto 1fr auto;
+}
+
+.header {
+  grid-area: header;
+  height: 50px;
+  background-color: #ffffff;
+  box-shadow: 0px 1px 0px 0px #eeeeee;
+
+  text-align: right;
+  line-height: 50px;
+}
+
 .info {
   display: grid;
   align-items: center;
@@ -87,24 +104,6 @@ export default {
   text-align: right;
 }
 
-.main-layout {
-  display: grid;
-  grid-template-areas: "nav header" "nav content" "nav footer";
-  min-height: 100vh;
-  grid-template-columns: 180px 1fr;
-  grid-template-rows: auto 1fr auto;
-}
-
-.header {
-  grid-area: header;
-  height: 50px;
-  background-color: #ffffff;
-  box-shadow: 0px 1px 0px 0px #eeeeee;
-
-  text-align: right;
-  line-height: 50px;
-}
-
 .name-arrow:hover .ivu-icon-chevron-down::before {
   content: "\F126";
 }

+ 1 - 1
src/features/login/Login.vue

@@ -4,7 +4,7 @@
     <div class="header">
       <div class="school-logo"><img :src="this.logoPath" alt="school logo"></img>
       </div>
-      <a class="close">关闭</a>
+      <a class="close" style="border-bottom-left-radius: 6px;">关闭</a>
     </div>
 
     <div class="center">