Skip to content

Commit faa4f22

Browse files
vanoneangGongJS
authored andcommitted
Feature/ui color (#130)
* optimize: ui color * feat: remove font * optimize: lots of ui
1 parent ac97002 commit faa4f22

31 files changed

Lines changed: 288 additions & 324 deletions

File tree

.eslintrc.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ module.exports = {
2828
'import/no-extraneous-dependencies': ['error', { devDependencies: ['script/**/*.js'] }],
2929
'no-restricted-syntax': 0,
3030
'class-methods-use-this': 'off',
31+
'consistent-return': 'off',
3132
},
3233
parserOptions: {
3334
parser: 'babel-eslint',

public/iconfont.css

Lines changed: 10 additions & 6 deletions
Large diffs are not rendered by default.

src/assets/font/HYYiSongW.eot

-2.8 MB
Binary file not shown.

src/assets/font/HYYiSongW.ttf

-2.8 MB
Binary file not shown.

src/assets/img/user/user.png

100755100644
1.71 KB
Loading

src/assets/styles/index.scss

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
@import './realize/font';
21
@import './realize/reset';
32
@import './realize/animation';
43
@import './realize/transition';
@@ -10,7 +9,6 @@
109
line-height: 59px;
1110
color: $parent-title-color;
1211
font-size: 16px;
13-
font-family: PingFangSC-Medium;
1412
font-weight: 500;
1513
text-indent: 40px;
1614
}

src/assets/styles/realize/element-variables.scss

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -445,12 +445,21 @@ thead tr {
445445

446446
.is-active {
447447
color: $theme !important;
448+
&.el-menu-item
449+
.iconfont{
450+
color: $theme !important;
451+
}
448452
}
449453

450454
.el-submenu__icon-arrow {
451455
top: 53%;
452456
}
453457

458+
.el-input__inner{
459+
height: 32px;
460+
line-height: 32px;
461+
}
462+
454463
.app-sidebar .el-menu-item-group .el-menu-item {
455464
padding-left: 60px !important;
456465
}

src/assets/styles/realize/font.scss

Lines changed: 0 additions & 7 deletions
This file was deleted.

src/components/base/date-picker/lin-date-picker.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ export default {
6161
}
6262
</script>
6363

64-
<style>
64+
<style scoped>
6565
.el-popper[x-placement^="bottom"]{
6666
margin-top: 10px;
6767
}

src/components/base/search/lin-search.vue

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,3 @@ export default {
3838
},
3939
}
4040
</script>
41-
42-
<style lang="scss">
43-
44-
</style>

0 commit comments

Comments
 (0)