Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 854aa2b

Browse files
scss变量重新订阅,菜单显示优化
1 parent 675fa2a commit 854aa2b

File tree

16 files changed

+155
-363
lines changed

16 files changed

+155
-363
lines changed

‎src/common/style/base.scss‎

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,19 @@
1-
// 基础变量
2-
$g_font_s: 16px;// 一般字体大小
3-
$g_font_c: rgb(100, 100, 100);// 一般字体颜色
4-
$g_vice_font_s1: 14px;// 副标题字体大小1
5-
$g_vice_font_s2: 12px;// 副标题字体大小2s
6-
$g_vice_font_c: #97a8be;// 副标题字体颜色
7-
$g_theme: #6959CD;// ElementUI全局背景颜色
8-
$g_padding_20: 20px;// 一般padding
9-
$g_margin_20:20px;// 一般margin
10-
$g_spacing: 20px;
11-
$g_vice_spacing: 10px;
1+
/* 主题色 */
2+
$primary-color: #6959CD;
3+
4+
/* 布局 */
5+
$layout-nav-height: 50px;
6+
$layout-tag-height: 34px;
7+
$layout-sider-width: 200px;
8+
$layout-sider-hide-width: 60px;
9+
$layout-sider-color: #bfcbd9;
10+
$layout-sider-background: #0e1c26;
11+
$layout-sider-hover-background: rgb(54, 68, 78);
12+
$layout-sider-sub-hover-background: rgb(54, 68, 78);
13+
1214

1315
:export {
14-
sideBarBg: #0e1c26;
15-
theme: $g_theme;
16-
sideBarText: #bfcbd9;
16+
layout-sider-background: $layout-sider-background;
17+
theme: $primary-color;
18+
layout-sider-color: $layout-sider-color;
1719
}

‎src/common/style/element-ui.scss‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
// .el-button{
2323
// padding: 10px 20px;
2424
// // &:hover, &:focus{
25-
// // color: $g_theme;
26-
// // border-color: $g_theme;
25+
// // color: $primary-color;
26+
// // border-color: $primary-color;
2727
// // background-color: rgb(245, 245, 245);
2828
// // transform: all .3s linear;
2929
// // }

‎src/common/style/element-variables.scss‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/** 换肤定义 **/
22

33
/* 改变主题色变量 */
4-
$--color-primary: $g_theme;
4+
$--color-primary: $primary-color;
55

66
/* 改变 icon 字体路径变量,必需 */
77
$--font-path: '~element-ui/lib/theme-chalk/fonts';

‎src/common/style/markdown.scss‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -65,12 +65,12 @@
6565
line-height: 1.8;
6666
}
6767
a {
68-
color: $g_theme;
68+
color: $primary-color;
6969
text-decoration: underline;
7070
opacity: .8;
7171
}
7272
a:hover {
73-
color: $g_theme;
73+
color: $primary-color;
7474
opacity: 1;
7575
}
7676
a:focus {
@@ -87,7 +87,7 @@
8787
border: none;
8888
background: #F6F6F6;
8989
color: #555;
90-
border-left: 2px solid $g_theme;
90+
border-left: 2px solid $primary-color;
9191
}
9292
blockquote ul{
9393
margin: 0px;
@@ -126,14 +126,14 @@
126126
font-family: Courier, sans-serif;
127127
}
128128
code {
129-
// color: $g_theme;
129+
// color: $primary-color;
130130
border-radius: 4px;
131131
font-family: Menlo, Monaco, Consolas, "Courier New", monospace;
132132
padding: 2px 4px;
133133
font-size: 90%;
134134
}
135135
p > code {
136-
color: $g_theme;
136+
color: $primary-color;
137137
font-size: .95em;
138138
border-radius: 3px;
139139
-moz-border-radius: 3px;

‎src/common/style/nprogress.scss‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#nprogress .bar{
2-
background: $g_theme!important;
2+
background: $primary-color!important;
33
}
44
#nprogress .peg{
5-
box-shadow: 0 0 10px $g_theme, 0 0 5px $g_theme!important;
5+
box-shadow: 0 0 10px $primary-color, 0 0 5px $primary-color!important;
66
}

‎src/components/PageCard/index.vue‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
slot="header"
88
class="clearfix"
99
>
10-
<span class="title">{{ title }}</span>
10+
<span class="title":style="`color: ${theme}`">{{ title }}</span>
1111
<i
1212
:title="title"
1313
class="el-icon-info"
@@ -22,7 +22,7 @@
2222
>
2323
<span
2424
class="label"
25-
:style="`width: ${lableWidth}; text-align: ${textAligin}`"
25+
:style="`width: ${lableWidth}; text-align: ${textAligin};`"
2626
>{{ item.label }}</span>
2727
<span class="value">{{ $fn.getDataName({dataList: listTypeInfo[item.list], value: 'value', label: 'key', data: data[item.value]}) || '-' }}</span>
2828
</li>
@@ -31,6 +31,7 @@
3131
</template>
3232

3333
<script>
34+
import { mapGetters } from 'vuex'
3435
export default {
3536
props: {
3637
className: {
@@ -56,6 +57,11 @@ export default {
5657
listTypeInfo: {
5758
type: Object
5859
}
60+
},
61+
computed: {
62+
...mapGetters([
63+
'theme'
64+
])
5965
}
6066
}
6167
</script>
@@ -66,7 +72,7 @@ export default {
6672
.page-card{
6773
.title{
6874
font-size: 16px;
69-
color: $g_theme;
75+
color: $primary-color;
7076
}
7177
.info{
7278
.item{

‎src/lang/en.js‎

Lines changed: 9 additions & 93 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ export default {
33
home: 'home',
44
opsCenter: 'opsCenter',
55
questionMan: 'questionMan',
6-
blogMan: 'blogMan',
6+
columnMan: 'columnMan',
77
articleMan: 'articleMan',
88
liveMan: 'liveMan',
99
activityMan: 'activityMan',
10-
advertising: 'advertising',
10+
advertisingMan: 'advertisingMan',
1111
workflow: 'workflow',
1212
processDesign: 'processDesign',
1313
businessMan: 'businessMan',
@@ -41,101 +41,17 @@ export default {
4141
size: 'Global Size',
4242
lang: 'lang'
4343
},
44-
login: {
45-
title: 'Login Form',
46-
logIn: 'Log in',
47-
username: 'Username',
48-
password: 'Password',
49-
any: 'any',
50-
thirdparty: 'Or connect with',
51-
thirdpartyTips: 'Can not be simulated on local, so please combine you own business simulation! ! !'
52-
},
53-
documentation: {
54-
documentation: 'Documentation',
55-
github: 'Github Repository'
56-
},
57-
permission: {
58-
addRole: 'New Role',
59-
editPermission: 'Edit Permission',
60-
roles: 'Your roles',
61-
switchRoles: 'Switch roles',
62-
tips: 'In some cases it is not suitable to use v-permission, such as element Tab component or el-table-column and other asynchronous rendering dom cases which can only be achieved by manually setting the v-if.',
63-
delete: 'Delete',
64-
confirm: 'Confirm',
65-
cancel: 'Cancel'
66-
},
67-
guide: {
68-
description: 'The guide page is useful for some people who entered the project for the first time. You can briefly introduce the features of the project. Demo is based on ',
69-
button: 'Show Guide'
70-
},
71-
components: {
72-
documentation: 'Documentation',
73-
tinymceTips: 'Rich text editor is a core part of management system, but at the same time is a place with lots of problems. In the process of selecting rich texts, I also walked a lot of detours. The common rich text editors in the market are basically used, and the finally chose Tinymce. See documentation for more detailed rich text editor comparisons and introductions.',
74-
dropzoneTips: 'Because my business has special needs, and has to upload images to qiniu, so instead of a third party, I chose encapsulate it by myself. It is very simple, you can see the detail code in @/components/Dropzone.',
75-
stickyTips: 'when the page is scrolled to the preset position will be sticky on the top.',
76-
backToTopTips1: 'When the page is scrolled to the specified position, the Back to Top button appears in the lower right corner',
77-
backToTopTips2: 'You can customize the style of the button, show / hide, height of appearance, height of the return. If you need a text prompt, you can use element-ui el-tooltip elements externally',
78-
imageUploadTips: 'Since I was using only the vue@1 version, and it is not compatible with mockjs at the moment, I modified it myself, and if you are going to use it, it is better to use official version.'
79-
},
80-
table: {
81-
dynamicTips1: 'Fixed header, sorted by header order',
82-
dynamicTips2: 'Not fixed header, sorted by click order',
83-
dragTips1: 'The default order',
84-
dragTips2: 'The after dragging order',
85-
title: 'Title',
86-
importance: 'Imp',
87-
type: 'Type',
88-
remark: 'Remark',
89-
search: 'Search',
90-
add: 'Add',
91-
export: 'Export',
92-
reviewer: 'reviewer',
93-
id: 'ID',
94-
date: 'Date',
95-
author: 'Author',
96-
readings: 'Readings',
97-
status: 'Status',
98-
actions: 'Actions',
99-
edit: 'Edit',
100-
publish: 'Publish',
101-
draft: 'Draft',
102-
delete: 'Delete',
103-
cancel: 'Cancel',
104-
confirm: 'Confirm'
105-
},
106-
errorLog: {
107-
tips: 'Please click the bug icon in the upper right corner',
108-
description: 'Now the management system are basically the form of the spa, it enhances the user experience, but it also increases the possibility of page problems, a small negligence may lead to the entire page deadlock. Fortunately Vue provides a way to catch handling exceptions, where you can handle errors or report exceptions.',
109-
documentation: 'Document introduction'
110-
},
111-
excel: {
112-
export: 'Export',
113-
selectedExport: 'Export Selected Items',
114-
placeholder: 'Please enter the file name(default excel-list)'
115-
},
116-
zip: {
117-
export: 'Export',
118-
placeholder: 'Please enter the file name(default file)'
119-
},
120-
pdf: {
121-
tips: 'Here we use window.print() to implement the feature of downloading pdf.'
122-
},
123-
theme: {
124-
change: 'Change Theme',
125-
documentation: 'Theme documentation',
126-
tips: 'Tips: It is different from the theme-pick on the navbar is two different skinning methods, each with different application scenarios. Refer to the documentation for details.'
127-
},
12844
tagsView: {
12945
refresh: 'Refresh',
13046
close: 'Close',
13147
closeOthers: 'Close Others',
13248
closeAll: 'Close All'
13349
},
134-
settings: {
135-
title: 'Page style setting',
136-
theme: 'Theme Color',
137-
tagsView: 'Open Tags-View',
138-
fixedHeader: 'Fixed Header',
139-
sidebarLogo: 'Sidebar Logo'
140-
}
50+
user: {
51+
GitHub: 'GitHub',
52+
userInfo: 'userInfo',
53+
updatePassword: 'updatePwd',
54+
loginOut: 'loginOut'
55+
},
56+
checkOutLanguage: 'Switch Language Success'
14157
}

‎src/lang/es.js‎

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

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /