Skip to content

Commit c032506

Browse files
authored
Merge pull request #183 from TaleLin/feature/linCmsUi
新增 Notice 通知组件的展示
2 parents 1e3b4f4 + ff2ddf2 commit c032506

File tree

14 files changed

+960
-103
lines changed

14 files changed

+960
-103
lines changed

package-lock.json

Lines changed: 18 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

Lines changed: 26 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ $--color-primary: #3963bc;
99

1010
$--color-primary: #3963bc;
1111
$--color-success: #00c292 !default;
12-
$--color-warning: #dee2e6 !default;
12+
$--color-warning: #ffcb71 !default;
1313
$--color-danger: #f4516c !default;
1414

1515
$--background-color-base: #F6F7FA !default;
@@ -100,54 +100,54 @@ $--font-path: "~element-ui/lib/theme-chalk/fonts";
100100
}
101101

102102
.el-button--warning {
103-
color: #8c98ae;
103+
color: #FFFFFF;
104104

105105
&.is-plain {
106-
color: #8c98ae;
106+
color: #ffcb71;
107107
background: #fff;
108-
border: 1px solid #8c98ae;
108+
border: 1px solid #ffcb71;
109109

110110
&:hover,
111111
&:focus {
112-
background: #8c98ae;
112+
background: #ffcb71;
113113
color: #fff;
114-
border: 1px solid #8c98ae;
114+
border: 1px solid #ffcb71;
115115
}
116116

117117
&.is-disabled {
118-
color: #8c98ae;
119-
background: #fff;
120-
border: 1px solid #8c98ae;
118+
color: #fff;
119+
background: #FFBE4D;
120+
border: 1px solid #FFBE4D;
121121
opacity: 0.5;
122122

123123
&:hover,
124124
&:focus {
125-
color: #8c98ae;
126-
background: #fff;
127-
border: 1px solid #8c98ae;
125+
color: #fff;
126+
background: #ffcb71;
127+
border: 1px solid #ffcb71;
128128
opacity: 0.5;
129129
}
130130
}
131131
}
132132

133133
&:hover,
134134
&:focus {
135-
color: #8c98ae;
136-
background: #bfcbd7;
137-
border: 1px solid #bfcbd7;
135+
color: #fff;
136+
background: #FFBE4D;
137+
border: 1px solid #FFBE4D;
138138
}
139139

140140
&.is-disabled {
141-
background: #dee2e6;
142-
color: #8c98ae;
143-
border: 1px solid #dee2e6;
141+
background: #ffcb71;
142+
color: #fff;
143+
border: 1px solid #ffcb71;
144144
opacity: 0.5;
145145

146146
&:hover,
147147
&:focus {
148-
background: #dee2e6;
149-
color: #8c98ae;
150-
border: 1px solid #dee2e6;
148+
background: #ffcb71;
149+
color: #fff;
150+
border: 1px solid #ffcb71;
151151
opacity: 0.5;
152152
}
153153
}
@@ -821,3 +821,8 @@ $typeMap: (primary:#3963BC,
821821
}
822822
}
823823
}
824+
825+
/* alert */
826+
.el-alert+.el-alert {
827+
margin-top: 20px;
828+
}

0 commit comments

Comments
 (0)