Pan 6 年之前
父节点
当前提交
8f21f7e017
共有 6 个文件被更改,包括 50 次插入19 次删除
  1. 2 1
      src/styles/element-ui.scss
  2. 4 4
      src/styles/index.scss
  3. 2 1
      src/styles/mixin.scss
  4. 39 13
      src/styles/sidebar.scss
  5. 2 0
      src/styles/transition.scss
  6. 1 0
      src/styles/variables.scss

+ 2 - 1
src/styles/element-ui.scss

@@ -1,4 +1,4 @@
1
- //to reset element-ui default css
1
+//to reset element-ui default css
2
 .el-upload {
2
 .el-upload {
3
   input[type="file"] {
3
   input[type="file"] {
4
     display: none !important;
4
     display: none !important;
@@ -21,6 +21,7 @@
21
 .upload-container {
21
 .upload-container {
22
   .el-upload {
22
   .el-upload {
23
     width: 100%;
23
     width: 100%;
24
+
24
     .el-upload-dragger {
25
     .el-upload-dragger {
25
       width: 100%;
26
       width: 100%;
26
       height: 200px;
27
       height: 200px;

+ 4 - 4
src/styles/index.scss

@@ -21,7 +21,7 @@ html {
21
   box-sizing: border-box;
21
   box-sizing: border-box;
22
 }
22
 }
23
 
23
 
24
-#app{
24
+#app {
25
   height: 100%;
25
   height: 100%;
26
 }
26
 }
27
 
27
 
@@ -40,9 +40,9 @@ a:hover {
40
   text-decoration: none;
40
   text-decoration: none;
41
 }
41
 }
42
 
42
 
43
-div:focus{
43
+div:focus {
44
   outline: none;
44
   outline: none;
45
- }
45
+}
46
 
46
 
47
 a:focus,
47
 a:focus,
48
 a:active {
48
 a:active {
@@ -69,7 +69,7 @@ a:hover {
69
 }
69
 }
70
 
70
 
71
 //main-container全局样式
71
 //main-container全局样式
72
-.app-main{
72
+.app-main {
73
   min-height: 100%
73
   min-height: 100%
74
 }
74
 }
75
 
75
 

+ 2 - 1
src/styles/mixin.scss

@@ -10,9 +10,11 @@
10
   &::-webkit-scrollbar-track-piece {
10
   &::-webkit-scrollbar-track-piece {
11
     background: #d3dce6;
11
     background: #d3dce6;
12
   }
12
   }
13
+
13
   &::-webkit-scrollbar {
14
   &::-webkit-scrollbar {
14
     width: 6px;
15
     width: 6px;
15
   }
16
   }
17
+
16
   &::-webkit-scrollbar-thumb {
18
   &::-webkit-scrollbar-thumb {
17
     background: #99a9bf;
19
     background: #99a9bf;
18
     border-radius: 20px;
20
     border-radius: 20px;
@@ -24,4 +26,3 @@
24
   width: 100%;
26
   width: 100%;
25
   height: 100%;
27
   height: 100%;
26
 }
28
 }
27
-

+ 39 - 13
src/styles/sidebar.scss

@@ -1,15 +1,17 @@
1
 #app {
1
 #app {
2
+
2
   // 主体区域
3
   // 主体区域
3
   .main-container {
4
   .main-container {
4
     min-height: 100%;
5
     min-height: 100%;
5
     transition: margin-left .28s;
6
     transition: margin-left .28s;
6
-    margin-left: 180px;
7
+    margin-left: $sideBarWidth;
7
     position: relative;
8
     position: relative;
8
   }
9
   }
10
+
9
   // 侧边栏
11
   // 侧边栏
10
   .sidebar-container {
12
   .sidebar-container {
11
     transition: width 0.28s;
13
     transition: width 0.28s;
12
-    width: 180px !important;
14
+    width: $sideBarWidth !important;
13
     height: 100%;
15
     height: 100%;
14
     position: fixed;
16
     position: fixed;
15
     font-size: 0px;
17
     font-size: 0px;
@@ -18,62 +20,79 @@
18
     left: 0;
20
     left: 0;
19
     z-index: 1001;
21
     z-index: 1001;
20
     overflow: hidden;
22
     overflow: hidden;
23
+
21
     //reset element-ui css
24
     //reset element-ui css
22
     .horizontal-collapse-transition {
25
     .horizontal-collapse-transition {
23
       transition: 0s width ease-in-out, 0s padding-left ease-in-out, 0s padding-right ease-in-out;
26
       transition: 0s width ease-in-out, 0s padding-left ease-in-out, 0s padding-right ease-in-out;
24
     }
27
     }
25
-    .el-scrollbar__bar.is-vertical{
28
+
29
+    .el-scrollbar__bar.is-vertical {
26
       right: 0px;
30
       right: 0px;
27
     }
31
     }
32
+
28
     .scrollbar-wrapper {
33
     .scrollbar-wrapper {
29
-      overflow-x: hidden!important;
34
+      overflow-x: hidden !important;
35
+
30
       .el-scrollbar__view {
36
       .el-scrollbar__view {
31
         height: 100%;
37
         height: 100%;
32
       }
38
       }
33
     }
39
     }
40
+
34
     .is-horizontal {
41
     .is-horizontal {
35
       display: none;
42
       display: none;
36
     }
43
     }
44
+
37
     a {
45
     a {
38
       display: inline-block;
46
       display: inline-block;
39
       width: 100%;
47
       width: 100%;
40
       overflow: hidden;
48
       overflow: hidden;
41
     }
49
     }
50
+
42
     .svg-icon {
51
     .svg-icon {
43
       margin-right: 16px;
52
       margin-right: 16px;
44
     }
53
     }
54
+
45
     .el-menu {
55
     .el-menu {
46
       border: none;
56
       border: none;
47
       height: 100%;
57
       height: 100%;
48
       width: 100% !important;
58
       width: 100% !important;
49
     }
59
     }
50
-    .is-active > .el-submenu__title{
51
-      color: #f4f4f5!important;
60
+
61
+    .is-active>.el-submenu__title {
62
+      color: #f4f4f5 !important;
52
     }
63
     }
53
   }
64
   }
65
+
54
   .hideSidebar {
66
   .hideSidebar {
55
     .sidebar-container {
67
     .sidebar-container {
56
       width: 36px !important;
68
       width: 36px !important;
57
     }
69
     }
70
+
58
     .main-container {
71
     .main-container {
59
       margin-left: 36px;
72
       margin-left: 36px;
60
     }
73
     }
74
+
61
     .submenu-title-noDropdown {
75
     .submenu-title-noDropdown {
62
       padding-left: 10px !important;
76
       padding-left: 10px !important;
63
       position: relative;
77
       position: relative;
78
+
64
       .el-tooltip {
79
       .el-tooltip {
65
         padding: 0 10px !important;
80
         padding: 0 10px !important;
66
       }
81
       }
67
     }
82
     }
83
+
68
     .el-submenu {
84
     .el-submenu {
69
       overflow: hidden;
85
       overflow: hidden;
86
+
70
       &>.el-submenu__title {
87
       &>.el-submenu__title {
71
         padding-left: 10px !important;
88
         padding-left: 10px !important;
89
+
72
         .el-submenu__icon-arrow {
90
         .el-submenu__icon-arrow {
73
           display: none;
91
           display: none;
74
         }
92
         }
75
       }
93
       }
76
     }
94
     }
95
+
77
     .el-menu--collapse {
96
     .el-menu--collapse {
78
       .el-submenu {
97
       .el-submenu {
79
         &>.el-submenu__title {
98
         &>.el-submenu__title {
@@ -88,16 +107,19 @@
88
       }
107
       }
89
     }
108
     }
90
   }
109
   }
110
+
91
   .sidebar-container .nest-menu .el-submenu>.el-submenu__title,
111
   .sidebar-container .nest-menu .el-submenu>.el-submenu__title,
92
   .sidebar-container .el-submenu .el-menu-item {
112
   .sidebar-container .el-submenu .el-menu-item {
93
-    min-width: 180px !important;
113
+    min-width: $sideBarWidth !important;
94
     background-color: $subMenuBg !important;
114
     background-color: $subMenuBg !important;
115
+
95
     &:hover {
116
     &:hover {
96
       background-color: $menuHover !important;
117
       background-color: $menuHover !important;
97
     }
118
     }
98
   }
119
   }
120
+
99
   .el-menu--collapse .el-menu .el-submenu {
121
   .el-menu--collapse .el-menu .el-submenu {
100
-    min-width: 180px !important;
122
+    min-width: $sideBarWidth !important;
101
   }
123
   }
102
 
124
 
103
   //适配移动端
125
   //适配移动端
@@ -105,18 +127,22 @@
105
     .main-container {
127
     .main-container {
106
       margin-left: 0px;
128
       margin-left: 0px;
107
     }
129
     }
130
+
108
     .sidebar-container {
131
     .sidebar-container {
109
       transition: transform .28s;
132
       transition: transform .28s;
110
-      width: 180px !important;
133
+      width: $sideBarWidth !important;
111
     }
134
     }
135
+
112
     &.hideSidebar {
136
     &.hideSidebar {
113
       .sidebar-container {
137
       .sidebar-container {
114
         transition-duration: 0.3s;
138
         transition-duration: 0.3s;
115
-        transform: translate3d(-180px, 0, 0);
139
+        transform: translate3d(-$sideBarWidth, 0, 0);
116
       }
140
       }
117
     }
141
     }
118
   }
142
   }
143
+
119
   .withoutAnimation {
144
   .withoutAnimation {
145
+
120
     .main-container,
146
     .main-container,
121
     .sidebar-container {
147
     .sidebar-container {
122
       transition: none;
148
       transition: none;
@@ -124,9 +150,9 @@
124
   }
150
   }
125
 }
151
 }
126
 
152
 
127
-.el-menu--vertical{
128
-  & >.el-menu{
129
-    .svg-icon{
153
+.el-menu--vertical {
154
+  &>.el-menu {
155
+    .svg-icon {
130
       margin-right: 16px;
156
       margin-right: 16px;
131
     }
157
     }
132
   }
158
   }

+ 2 - 0
src/styles/transition.scss

@@ -16,10 +16,12 @@
16
 .fade-transform-enter-active {
16
 .fade-transform-enter-active {
17
   transition: all .5s;
17
   transition: all .5s;
18
 }
18
 }
19
+
19
 .fade-transform-enter {
20
 .fade-transform-enter {
20
   opacity: 0;
21
   opacity: 0;
21
   transform: translateX(-30px);
22
   transform: translateX(-30px);
22
 }
23
 }
24
+
23
 .fade-transform-leave-to {
25
 .fade-transform-leave-to {
24
   opacity: 0;
26
   opacity: 0;
25
   transform: translateX(30px);
27
   transform: translateX(30px);

+ 1 - 0
src/styles/variables.scss

@@ -2,3 +2,4 @@
2
 $menuBg:#304156;
2
 $menuBg:#304156;
3
 $subMenuBg:#1f2d3d;
3
 $subMenuBg:#1f2d3d;
4
 $menuHover:#001528;
4
 $menuHover:#001528;
5
+$sideBarWidth: 180px;