gy-webcode2 1.2.1 → 2.0.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/components/breadcrumb.vue +14 -9
- package/components/themeConfig.vue +2 -2
- package/css/common.scss +13 -13
- package/css/layout.scss +132 -65
- package/css/login.scss +6 -6
- package/css/modules/common.scss +5 -5
- package/css/modules/header.scss +24 -13
- package/css/modules/sidebar.scss +103 -27
- package/css/modules/table.scss +30 -28
- package/css/modules/tabs.scss +63 -8
- package/css/theme/colors/cheng.scss +3 -2
- package/css/theme/colors/default.scss +7 -5
- package/css/theme/colors/hong.scss +4 -3
- package/css/theme/colors/huang.scss +2 -1
- package/css/theme/colors/lv.scss +2 -1
- package/css/theme/colors/qing.scss +2 -1
- package/css/theme/colors/shenaln.scss +4 -3
- package/css/theme/colors/zi.scss +2 -1
- package/css/theme/global.scss +13 -1
- package/css/theme/styles/default.scss +8 -4
- package/css/theme/styles/hailan.scss +5 -2
- package/css/theme/styles/shenlan.scss +8 -3
- package/css/theme/theme.scss +23 -17
- package/index.js +10 -1
- package/package.json +1 -1
|
@@ -32,7 +32,7 @@
|
|
|
32
32
|
{{menuPath.name}}
|
|
33
33
|
</template>
|
|
34
34
|
</span>
|
|
35
|
-
|
|
35
|
+
|
|
36
36
|
</div>
|
|
37
37
|
<slot name="nameAfter"></slot>
|
|
38
38
|
</div>
|
|
@@ -76,7 +76,7 @@ export default {
|
|
|
76
76
|
let menuKey = Object.keys(menu).find(key => {
|
|
77
77
|
return this.fullPath.includes(key)
|
|
78
78
|
})
|
|
79
|
-
// let findMenu =
|
|
79
|
+
// let findMenu =
|
|
80
80
|
return menu[menuKey]
|
|
81
81
|
},
|
|
82
82
|
names(){
|
|
@@ -86,11 +86,11 @@ export default {
|
|
|
86
86
|
return this.$store.state.menu.breadcrumb_list;
|
|
87
87
|
},
|
|
88
88
|
isBack(){
|
|
89
|
-
return this.$listeners && this.$listeners['goBack']
|
|
89
|
+
return this.$listeners && this.$listeners['goBack']
|
|
90
90
|
},
|
|
91
91
|
showRow1(){
|
|
92
92
|
if(this.$store.state.vuex_breadcrumbShow){
|
|
93
|
-
return true;
|
|
93
|
+
return true;
|
|
94
94
|
}
|
|
95
95
|
},
|
|
96
96
|
routerBreadcrumb(){
|
|
@@ -99,7 +99,7 @@ export default {
|
|
|
99
99
|
}
|
|
100
100
|
return []
|
|
101
101
|
}
|
|
102
|
-
|
|
102
|
+
|
|
103
103
|
},
|
|
104
104
|
created(){
|
|
105
105
|
let breadcrumb_list = this.breadcrumb_list;
|
|
@@ -113,7 +113,7 @@ export default {
|
|
|
113
113
|
|
|
114
114
|
if(this.names.length){
|
|
115
115
|
this.names.forEach(item => {
|
|
116
|
-
|
|
116
|
+
|
|
117
117
|
breadcrumb_list[fullPath].push({
|
|
118
118
|
name:item,
|
|
119
119
|
id:myID,
|
|
@@ -146,8 +146,13 @@ export default {
|
|
|
146
146
|
},
|
|
147
147
|
beforeDestroy(){
|
|
148
148
|
if(this.breadcrumb_list[this.fullPath]){
|
|
149
|
-
let rIndex = this.breadcrumb_list[this.fullPath].
|
|
150
|
-
|
|
149
|
+
let rIndex = this.breadcrumb_list[this.fullPath].reduce((curr,item,index) => {
|
|
150
|
+
if(item.id == this.myID){
|
|
151
|
+
curr.push(index)
|
|
152
|
+
}
|
|
153
|
+
return curr;
|
|
154
|
+
},[])
|
|
155
|
+
this.breadcrumb_list[this.fullPath].splice(rIndex[0],rIndex.length)
|
|
151
156
|
}
|
|
152
157
|
|
|
153
158
|
}
|
|
@@ -156,4 +161,4 @@ export default {
|
|
|
156
161
|
|
|
157
162
|
<style>
|
|
158
163
|
|
|
159
|
-
</style>
|
|
164
|
+
</style>
|
|
@@ -243,10 +243,10 @@ export default {
|
|
|
243
243
|
display: block;
|
|
244
244
|
}
|
|
245
245
|
&.item_1 {
|
|
246
|
-
background-image: url("~gy-webcode2/img/theme/
|
|
246
|
+
background-image: url("~gy-webcode2/img/theme/pageStyle_2.png");
|
|
247
247
|
}
|
|
248
248
|
&.item_2 {
|
|
249
|
-
background-image: url("~gy-webcode2/img/theme/
|
|
249
|
+
background-image: url("~gy-webcode2/img/theme/pageStyle_1.png");
|
|
250
250
|
}
|
|
251
251
|
&.item_3 {
|
|
252
252
|
background-image: url("~gy-webcode2/img/theme/pageStyle_3.png");
|
package/css/common.scss
CHANGED
|
@@ -1,16 +1,16 @@
|
|
|
1
|
-
@import "
|
|
2
|
-
@import "
|
|
3
|
-
@import "
|
|
4
|
-
@import "
|
|
5
|
-
@import "
|
|
6
|
-
@import "
|
|
7
|
-
@import "
|
|
8
|
-
@import "
|
|
9
|
-
@import "
|
|
10
|
-
@import "
|
|
11
|
-
@import "
|
|
12
|
-
@import "
|
|
13
|
-
@import "
|
|
1
|
+
@import "modules/common";
|
|
2
|
+
@import "modules/elementUI";
|
|
3
|
+
@import "modules/form";
|
|
4
|
+
@import "modules/header";
|
|
5
|
+
@import "modules/sidebar";
|
|
6
|
+
@import "modules/tree";
|
|
7
|
+
@import "modules/button";
|
|
8
|
+
@import "modules/table";
|
|
9
|
+
@import "modules/tabs";
|
|
10
|
+
@import "modules/tags";
|
|
11
|
+
@import "modules/color";
|
|
12
|
+
@import "modules/tree_check";
|
|
13
|
+
@import "layout";
|
|
14
14
|
|
|
15
15
|
|
|
16
16
|
|
package/css/layout.scss
CHANGED
|
@@ -8,10 +8,18 @@
|
|
|
8
8
|
overflow: hidden;
|
|
9
9
|
display: flex;
|
|
10
10
|
flex-direction: column;
|
|
11
|
+
@include theme('background-color','wrapper_bgColor');
|
|
12
|
+
border-radius: $radius_max $radius_max 0 0;
|
|
13
|
+
overflow: hidden;
|
|
11
14
|
.wrapper_body{
|
|
12
15
|
flex: 1;
|
|
13
16
|
height: 0;
|
|
14
17
|
display: flex;
|
|
18
|
+
margin: 0 $spacing $spacing $spacing;
|
|
19
|
+
//background: #F1F6FC;
|
|
20
|
+
border-radius: $radius_max;
|
|
21
|
+
@include theme('background-color','wrapper_bgColor2');
|
|
22
|
+
overflow: hidden;
|
|
15
23
|
&.max{
|
|
16
24
|
left: 40px;
|
|
17
25
|
}
|
|
@@ -19,37 +27,75 @@
|
|
|
19
27
|
.wrapper_main{
|
|
20
28
|
position: relative;
|
|
21
29
|
flex: 1;
|
|
30
|
+
//background: #F1F6FC;
|
|
31
|
+
border-radius: $radius;
|
|
32
|
+
//margin: $spacing $spacing $spacing 0;
|
|
22
33
|
}
|
|
23
34
|
}
|
|
24
|
-
.contentBox
|
|
35
|
+
.contentBox{
|
|
25
36
|
position: absolute;
|
|
26
37
|
left: 0;
|
|
27
|
-
right:
|
|
28
|
-
top:
|
|
38
|
+
right: $spacing;
|
|
39
|
+
top: $spacing;
|
|
40
|
+
bottom: $spacing;
|
|
41
|
+
border-radius: $radius;
|
|
42
|
+
display: flex;
|
|
43
|
+
flex-direction: column;
|
|
44
|
+
background: #fff;
|
|
45
|
+
overflow: hidden;
|
|
46
|
+
|
|
47
|
+
|
|
48
|
+
}
|
|
49
|
+
.componentBody{
|
|
50
|
+
position: absolute;
|
|
51
|
+
left: 0;
|
|
52
|
+
right:0;
|
|
53
|
+
top:0;
|
|
29
54
|
bottom: 0;
|
|
30
|
-
|
|
55
|
+
border-radius: $radius;
|
|
56
|
+
display: flex;
|
|
31
57
|
flex-direction: column;
|
|
58
|
+
overflow: hidden;
|
|
59
|
+
z-index: 5;
|
|
60
|
+
background: #fff;
|
|
61
|
+
}
|
|
62
|
+
.contentBox,.componentBody{
|
|
63
|
+
//position: absolute;
|
|
64
|
+
//left: 0;
|
|
65
|
+
//right: $spacing;
|
|
66
|
+
//top: $spacing;
|
|
67
|
+
//bottom: $spacing;
|
|
68
|
+
//border-radius: $radius;
|
|
69
|
+
//display:flex;
|
|
70
|
+
//flex-direction: column;
|
|
71
|
+
&.homeBg{
|
|
72
|
+
background: #F1F6FC;
|
|
73
|
+
}
|
|
32
74
|
>.content{
|
|
33
|
-
background: #fff;
|
|
75
|
+
//background: #fff;
|
|
34
76
|
position: relative;
|
|
35
|
-
margin: 0 16px 0 16px;
|
|
77
|
+
//margin: 0 16px 0 16px;
|
|
78
|
+
//margin-top: 16px;
|
|
36
79
|
flex: 1;
|
|
37
80
|
overflow: hidden;
|
|
38
|
-
border-radius: 10px;
|
|
81
|
+
//border-radius: 10px;
|
|
82
|
+
margin-bottom: $spacing;
|
|
39
83
|
}
|
|
40
84
|
>.content2{
|
|
41
85
|
flex:1;
|
|
42
86
|
display: flex;
|
|
43
|
-
margin: 0 16px 0 16px;
|
|
87
|
+
//margin: 0 16px 0 16px;
|
|
44
88
|
height: 0;
|
|
89
|
+
margin-bottom: $spacing;
|
|
45
90
|
.left{
|
|
46
91
|
background: #fff;
|
|
47
92
|
// width: 240px;
|
|
48
|
-
|
|
93
|
+
border-right: 1px solid $borderColor2;
|
|
94
|
+
width: 264px;
|
|
49
95
|
position: relative;
|
|
50
96
|
overflow: hidden;
|
|
51
|
-
margin-right: 16px;
|
|
52
|
-
border-radius: 10px;
|
|
97
|
+
//margin-right: 16px;
|
|
98
|
+
//border-radius: 10px;
|
|
53
99
|
}
|
|
54
100
|
.right{
|
|
55
101
|
width: 0;
|
|
@@ -60,11 +106,6 @@
|
|
|
60
106
|
}
|
|
61
107
|
}
|
|
62
108
|
|
|
63
|
-
}
|
|
64
|
-
.componentBody{
|
|
65
|
-
z-index: 5;
|
|
66
|
-
background: #f0f2f5;
|
|
67
|
-
|
|
68
109
|
}
|
|
69
110
|
.contentMargin{
|
|
70
111
|
margin: 16px 16px 0 16px;
|
|
@@ -85,9 +126,17 @@
|
|
|
85
126
|
display: flex;
|
|
86
127
|
justify-content: space-between;
|
|
87
128
|
flex-wrap: wrap;
|
|
129
|
+
|
|
130
|
+
//height: 56px !important;
|
|
131
|
+
min-height: 56px !important;
|
|
132
|
+
//margin-bottom: $spacing_max;
|
|
133
|
+
&.bottomBorderShow{
|
|
134
|
+
border-bottom: 1px solid $borderColor2;
|
|
135
|
+
}
|
|
136
|
+
|
|
88
137
|
.row1{
|
|
89
|
-
padding-left:
|
|
90
|
-
padding-right:
|
|
138
|
+
padding-left: $spacing_max;
|
|
139
|
+
padding-right: $spacing_max;
|
|
91
140
|
// height: 44px;
|
|
92
141
|
align-items: center;
|
|
93
142
|
overflow: hidden;
|
|
@@ -95,18 +144,20 @@
|
|
|
95
144
|
// padding-top: 15px;
|
|
96
145
|
// padding-bottom: 10px;
|
|
97
146
|
// padding-bottom: 12px;
|
|
98
|
-
|
|
147
|
+
|
|
99
148
|
display: flex;
|
|
100
149
|
justify-content: space-between;
|
|
101
150
|
.s1{
|
|
102
151
|
// color: #1890ff;
|
|
103
|
-
|
|
152
|
+
//@include themeColor('color');
|
|
153
|
+
//font-size: 16px;
|
|
154
|
+
color: #262626;
|
|
104
155
|
}
|
|
105
|
-
|
|
156
|
+
|
|
106
157
|
.title{
|
|
107
158
|
display: flex;
|
|
108
159
|
align-items: center;
|
|
109
|
-
color:#
|
|
160
|
+
color:#8c8c8c;
|
|
110
161
|
.iconBox{
|
|
111
162
|
width:30px;
|
|
112
163
|
text-align: center;
|
|
@@ -115,9 +166,9 @@
|
|
|
115
166
|
}
|
|
116
167
|
}
|
|
117
168
|
}
|
|
118
|
-
|
|
169
|
+
|
|
119
170
|
.breadcrumb_iconBox{
|
|
120
|
-
width:
|
|
171
|
+
width:20px;
|
|
121
172
|
text-align: center;
|
|
122
173
|
font-size: 16px;
|
|
123
174
|
font-weight: bold;
|
|
@@ -132,22 +183,21 @@
|
|
|
132
183
|
}
|
|
133
184
|
}
|
|
134
185
|
.pageHeader{
|
|
135
|
-
padding-left:
|
|
136
|
-
padding-right:
|
|
137
|
-
height:
|
|
186
|
+
padding-left: $spacing_max;
|
|
187
|
+
padding-right: $spacing_max;
|
|
188
|
+
// height: 44px;
|
|
189
|
+
align-items: center;
|
|
190
|
+
overflow: hidden;
|
|
191
|
+
position: relative;
|
|
138
192
|
color: #262626;
|
|
139
|
-
|
|
140
|
-
// margin-top: 5px;
|
|
193
|
+
|
|
141
194
|
display: flex;
|
|
142
|
-
// justify-content: space-between;
|
|
143
|
-
// margin-bottom: 8px;
|
|
144
195
|
align-items: center;
|
|
145
|
-
//
|
|
146
|
-
//
|
|
147
|
-
margin-bottom: 5px;
|
|
148
|
-
margin-top: 5px;
|
|
196
|
+
//margin-bottom: 5px;
|
|
197
|
+
//margin-top: 5px;
|
|
149
198
|
>.name{
|
|
150
|
-
font-size: 16px;
|
|
199
|
+
//font-size: 16px;
|
|
200
|
+
//@include themeColor("color",'active')
|
|
151
201
|
}
|
|
152
202
|
.myHover{
|
|
153
203
|
cursor: pointer;
|
|
@@ -163,16 +213,16 @@
|
|
|
163
213
|
|
|
164
214
|
.other{
|
|
165
215
|
display: flex;
|
|
166
|
-
align-items: flex-end;
|
|
216
|
+
//align-items: flex-end;
|
|
167
217
|
justify-content: flex-end;
|
|
168
218
|
margin-right: 16px;
|
|
169
219
|
margin-left: 16px;
|
|
170
220
|
flex: 1;
|
|
171
221
|
// align-items: center;
|
|
172
222
|
.otherContainer{
|
|
173
|
-
min-height: 32px;
|
|
174
|
-
margin-bottom: 5px;
|
|
175
|
-
margin-top: 5px;
|
|
223
|
+
//min-height: 32px;
|
|
224
|
+
//margin-bottom: 5px;
|
|
225
|
+
//margin-top: 5px;
|
|
176
226
|
display: flex;
|
|
177
227
|
align-items: center;
|
|
178
228
|
}
|
|
@@ -221,9 +271,9 @@
|
|
|
221
271
|
align-items: center;
|
|
222
272
|
// margin-right: 8px;
|
|
223
273
|
margin: 0 4px;
|
|
224
|
-
|
|
274
|
+
|
|
225
275
|
}
|
|
226
|
-
|
|
276
|
+
|
|
227
277
|
}
|
|
228
278
|
|
|
229
279
|
.myDrawer{
|
|
@@ -266,8 +316,8 @@
|
|
|
266
316
|
.shadow{
|
|
267
317
|
background: #fff;
|
|
268
318
|
height: 56px;
|
|
269
|
-
border-top: 1px solid
|
|
270
|
-
box-shadow: 0px 0 10px 0px
|
|
319
|
+
border-top: 1px solid $borderColor2;
|
|
320
|
+
box-shadow: 0px 0 10px 0px $borderColor2;
|
|
271
321
|
display: flex;
|
|
272
322
|
align-items: center;
|
|
273
323
|
padding-left: 140px;
|
|
@@ -285,7 +335,7 @@
|
|
|
285
335
|
display: flex;
|
|
286
336
|
opacity: 0;
|
|
287
337
|
transition: all 0.2s ease;
|
|
288
|
-
|
|
338
|
+
|
|
289
339
|
span {
|
|
290
340
|
width: 20px;
|
|
291
341
|
height: 20px;
|
|
@@ -343,21 +393,28 @@
|
|
|
343
393
|
}
|
|
344
394
|
|
|
345
395
|
.routerTabs{
|
|
346
|
-
height:
|
|
347
|
-
background: #dce0e7;
|
|
396
|
+
height: 40px;
|
|
397
|
+
//background: #dce0e7;
|
|
398
|
+
//@include theme('background-color','wrapper_bgColor2');
|
|
348
399
|
display: flex;
|
|
349
|
-
padding: 4px;
|
|
400
|
+
//padding: 4px;
|
|
350
401
|
user-select: none;
|
|
402
|
+
padding-top: 8px;
|
|
351
403
|
|
|
352
404
|
.menuBtn{
|
|
353
405
|
cursor: pointer;
|
|
354
406
|
// color: #fff;
|
|
355
407
|
display: flex;
|
|
356
408
|
align-items: center;
|
|
357
|
-
font-size:
|
|
409
|
+
font-size: 12px;
|
|
358
410
|
// color: #acb5ce;
|
|
359
|
-
border-radius:
|
|
360
|
-
|
|
411
|
+
border-radius: 2px;
|
|
412
|
+
border: 1px solid #D9D9D9;
|
|
413
|
+
|
|
414
|
+
@include theme('border-color','sidebar_color',0.2);
|
|
415
|
+
@include theme('color','sidebar_color');
|
|
416
|
+
@include theme('background-color','sidebar_children_activeBgColor');
|
|
417
|
+
//background: #fff;
|
|
361
418
|
&:hover{
|
|
362
419
|
@include themeColor('color','active');
|
|
363
420
|
}
|
|
@@ -373,30 +430,40 @@
|
|
|
373
430
|
width: auto;
|
|
374
431
|
}
|
|
375
432
|
.item{
|
|
376
|
-
min-width:
|
|
433
|
+
min-width: 100px;
|
|
377
434
|
display: flex;
|
|
378
435
|
padding: 0 10px;
|
|
379
|
-
background: #
|
|
436
|
+
background: #fff;
|
|
380
437
|
align-items: center;
|
|
381
438
|
margin-right: 4px;
|
|
382
|
-
border-radius:
|
|
439
|
+
border-radius: 2px;
|
|
383
440
|
justify-content: space-between;
|
|
384
441
|
cursor: pointer;
|
|
385
|
-
color: #595959;
|
|
386
442
|
height: 100%;
|
|
387
|
-
|
|
443
|
+
border: 1px solid #D9D9D9;
|
|
444
|
+
font-size: 12px;
|
|
445
|
+
@include theme('border-color','sidebar_color',0.2);
|
|
446
|
+
@include theme('color','sidebar_color');
|
|
447
|
+
@include theme('background-color','sidebar_children_activeBgColor');
|
|
388
448
|
.name{
|
|
389
449
|
margin-right: 20px;
|
|
390
450
|
}
|
|
451
|
+
&:hover{
|
|
452
|
+
@include themeColor('color','hover');
|
|
453
|
+
}
|
|
391
454
|
&.active{
|
|
392
|
-
|
|
393
|
-
|
|
394
|
-
|
|
395
|
-
|
|
396
|
-
|
|
397
|
-
|
|
398
|
-
|
|
399
|
-
|
|
455
|
+
|
|
456
|
+
//@include themeColor('background-color','activeBgColor');
|
|
457
|
+
@include themeColor('color','sidebar_menu2_activeColor');
|
|
458
|
+
@include themeColor('border-color','sidebar_menu2_activeColor');
|
|
459
|
+
|
|
460
|
+
|
|
461
|
+
//.name{
|
|
462
|
+
// color: #fff;
|
|
463
|
+
//}
|
|
464
|
+
//.other{
|
|
465
|
+
// color: #fff;
|
|
466
|
+
//}
|
|
400
467
|
}
|
|
401
468
|
.other{
|
|
402
469
|
}
|
|
@@ -431,4 +498,4 @@
|
|
|
431
498
|
@include themeColor("color",'hover')
|
|
432
499
|
}
|
|
433
500
|
}
|
|
434
|
-
}
|
|
501
|
+
}
|
package/css/login.scss
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
.loginBody{
|
|
2
2
|
// background:#00656b url("~gy-webcode2/img/login_bg2.jpg") top center no-repeat;
|
|
3
|
-
background: url("
|
|
3
|
+
background: url("../img/login_bg.png") top center no-repeat;
|
|
4
4
|
background-size: 100% 100%;
|
|
5
5
|
@include themeColor("background-color",'down');
|
|
6
6
|
position: absolute;
|
|
@@ -10,12 +10,12 @@
|
|
|
10
10
|
// height: 100%;
|
|
11
11
|
bottom: 0;
|
|
12
12
|
overflow: auto;
|
|
13
|
-
|
|
13
|
+
|
|
14
14
|
}
|
|
15
15
|
.loginBox{
|
|
16
16
|
width: 740px;
|
|
17
17
|
height: 390px;
|
|
18
|
-
background: #fff url("
|
|
18
|
+
background: #fff url("../img/login_bg2.png") top left no-repeat;
|
|
19
19
|
border-radius: 10px;
|
|
20
20
|
position: absolute;
|
|
21
21
|
left: 0;
|
|
@@ -77,7 +77,7 @@
|
|
|
77
77
|
background: #325bc0;
|
|
78
78
|
}
|
|
79
79
|
}
|
|
80
|
-
|
|
80
|
+
|
|
81
81
|
.inputInfo{
|
|
82
82
|
font-size: 12px;
|
|
83
83
|
overflow: hidden;
|
|
@@ -120,5 +120,5 @@
|
|
|
120
120
|
}
|
|
121
121
|
}
|
|
122
122
|
|
|
123
|
-
|
|
124
|
-
}
|
|
123
|
+
|
|
124
|
+
}
|
package/css/modules/common.scss
CHANGED
|
@@ -7,9 +7,9 @@ img{border:0;padding:0;margin:0;}
|
|
|
7
7
|
input{vertical-align:middle; outline: none;}
|
|
8
8
|
input,select,textarea{font-size:14px;font-family: "微软雅黑";}
|
|
9
9
|
*, :after, :before {
|
|
10
|
-
-webkit-box-sizing: border-box;
|
|
10
|
+
-webkit-box-sizing: border-box;
|
|
11
11
|
-moz-box-sizing: border-box;
|
|
12
|
-
box-sizing: border-box;
|
|
12
|
+
box-sizing: border-box;
|
|
13
13
|
}
|
|
14
14
|
pre{
|
|
15
15
|
white-space: pre-wrap;
|
|
@@ -20,7 +20,7 @@ pre{
|
|
|
20
20
|
body{
|
|
21
21
|
color: #262626;
|
|
22
22
|
line-height: 1;
|
|
23
|
-
background: #
|
|
23
|
+
background: #fff;
|
|
24
24
|
font-family: "Helvetica Neue",Helvetica,"PingFang SC","Hiragino Sans GB","Microsoft YaHei","微软雅黑",Arial,sans-serif !important;
|
|
25
25
|
}
|
|
26
26
|
.clear{clear:both;height:0;overflow:hidden;display:block}
|
|
@@ -149,10 +149,10 @@ a:hover{
|
|
|
149
149
|
.mar_r_#{$i} { margin-right: #{$i}px !important; }
|
|
150
150
|
.mar_b_#{$i} { margin-bottom: #{$i}px !important; }
|
|
151
151
|
.mar_l_#{$i} { margin-left: #{$i}px !important; }
|
|
152
|
-
|
|
152
|
+
|
|
153
153
|
.pad_#{$i} { padding: #{$i}px !important; }
|
|
154
154
|
.mar_#{$i} { margin: #{$i}px !important; }
|
|
155
|
-
|
|
155
|
+
|
|
156
156
|
.fs_#{$i*2} {font-size:#{$i*2}px !important;}
|
|
157
157
|
|
|
158
158
|
.l_#{$i} {left:#{$i}px !important;}
|
package/css/modules/header.scss
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
.wrapper_header{
|
|
2
|
-
height:
|
|
2
|
+
height: 48px;
|
|
3
3
|
display: flex;
|
|
4
4
|
@include theme('background-color','header_bgColor');
|
|
5
5
|
.logo{
|
|
@@ -8,10 +8,14 @@
|
|
|
8
8
|
background-repeat: no-repeat;
|
|
9
9
|
// background-size: 100% auto;
|
|
10
10
|
background-size: contain;
|
|
11
|
-
|
|
12
|
-
|
|
11
|
+
margin-left: 8px;
|
|
12
|
+
//border: 1px solid #fff;
|
|
13
|
+
display: flex;
|
|
14
|
+
align-items: center;
|
|
15
|
+
padding-left: 8px;
|
|
16
|
+
|
|
13
17
|
img{
|
|
14
|
-
height:
|
|
18
|
+
height: 85%;
|
|
15
19
|
}
|
|
16
20
|
}
|
|
17
21
|
.menu{
|
|
@@ -27,14 +31,21 @@
|
|
|
27
31
|
li{
|
|
28
32
|
height: 100%;
|
|
29
33
|
font-size: 14px;
|
|
30
|
-
color: #
|
|
34
|
+
color: #BFBFBF;
|
|
31
35
|
display: flex;
|
|
32
36
|
align-items: center;
|
|
33
|
-
margin: 0 20px;
|
|
37
|
+
//margin: 0 20px;
|
|
38
|
+
min-width: 120px;
|
|
39
|
+
//border: 1px solid #fff;
|
|
34
40
|
cursor: pointer;
|
|
35
41
|
transition: all 0.3s ease;
|
|
36
42
|
user-select: none;
|
|
37
|
-
|
|
43
|
+
padding: 0 20px;
|
|
44
|
+
justify-content: center;
|
|
45
|
+
.icon{
|
|
46
|
+
margin-right: 10px;
|
|
47
|
+
}
|
|
48
|
+
|
|
38
49
|
&:hover{
|
|
39
50
|
color: #fff;
|
|
40
51
|
}
|
|
@@ -82,7 +93,7 @@
|
|
|
82
93
|
border:none;
|
|
83
94
|
right: 8px;
|
|
84
95
|
}
|
|
85
|
-
|
|
96
|
+
|
|
86
97
|
|
|
87
98
|
.signout{
|
|
88
99
|
// margin:0 20px;
|
|
@@ -127,7 +138,7 @@
|
|
|
127
138
|
opacity: 1;
|
|
128
139
|
}
|
|
129
140
|
}
|
|
130
|
-
|
|
141
|
+
|
|
131
142
|
.header_el-popover{
|
|
132
143
|
// display:none;
|
|
133
144
|
visibility: hidden;
|
|
@@ -213,9 +224,9 @@
|
|
|
213
224
|
}
|
|
214
225
|
}
|
|
215
226
|
|
|
216
|
-
|
|
217
227
|
|
|
218
|
-
|
|
228
|
+
|
|
229
|
+
|
|
219
230
|
}
|
|
220
231
|
}
|
|
221
232
|
.noticeBox{
|
|
@@ -224,7 +235,7 @@
|
|
|
224
235
|
// right: 20px;
|
|
225
236
|
// top: 20px;
|
|
226
237
|
// background: #fff;
|
|
227
|
-
|
|
238
|
+
|
|
228
239
|
padding: 0;
|
|
229
240
|
width: 320px;
|
|
230
241
|
height: 490px;
|
|
@@ -340,4 +351,4 @@
|
|
|
340
351
|
}
|
|
341
352
|
}
|
|
342
353
|
}
|
|
343
|
-
}
|
|
354
|
+
}
|