Skip to content

Commit be73f4d

Browse files
style: Descriptions样式调整
1 parent 03d5e13 commit be73f4d

File tree

9 files changed

+30
-20
lines changed

9 files changed

+30
-20
lines changed

src/components/Descriptions/src/Descriptions.vue

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,10 @@ export default defineComponent({
6161
delete obj[key]
6262
}
6363
}
64-
return obj
64+
return {
65+
labelClassName: `${prefixCls}-label`,
66+
...obj
67+
}
6568
}
6669
6770
// 折叠
@@ -155,9 +158,7 @@ export default defineComponent({
155158
}
156159
}
157160
158-
.@{prefix-cls}-content {
159-
:deep(.@{elNamespace}-descriptions__cell) {
160-
width: 0;
161-
}
161+
:deep(.@{prefix-cls}-label) {
162+
width: 150px;
162163
}
163164
</style>

src/components/Dialog/src/Dialog.vue

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,18 +113,22 @@ const dialogStyle = computed(() => {
113113
114114
.@{elNamespace}-dialog {
115115
margin: 0 !important;
116+
116117
&__header {
118+
height: 54px;
119+
padding: 0;
117120
margin-right: 0 !important;
118121
border-bottom: 1px solid var(--el-border-color);
119-
padding: 0;
120-
height: 54px;
121122
}
123+
122124
&__body {
123125
padding: 15px !important;
124126
}
127+
125128
&__footer {
126129
border-top: 1px solid var(--el-border-color);
127130
}
131+
128132
&__headerbtn {
129133
top: 0;
130134
}

src/components/InputPassword/src/InputPassword.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ const getPasswordStrength = computed(() => {
8686
background-color: transparent;
8787
border-color: var(--el-color-white);
8888
border-style: solid;
89-
border-width: 0 5px 0 5px;
89+
border-width: 0 5px;
9090
content: '';
9191
}
9292

src/components/Menu/src/Menu.vue

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,7 @@ export default defineComponent({
155155
.is-active {
156156
& > .@{elNamespace}-sub-menu__title {
157157
color: var(--left-menu-text-active-color) !important;
158+
// background-color: var(--left-menu-bg-color) !important;
158159
}
159160
}
160161
@@ -168,7 +169,6 @@ export default defineComponent({
168169
}
169170
170171
// 设置选中时的高亮背景和高亮颜色
171-
.@{elNamespace}-sub-menu.is-active,
172172
.@{elNamespace}-menu-item.is-active {
173173
color: var(--left-menu-text-active-color) !important;
174174
background-color: var(--left-menu-bg-active-color) !important;
@@ -235,7 +235,7 @@ export default defineComponent({
235235
.@{elNamespace}-menu-item.is-active {
236236
position: relative;
237237
238-
&:after {
238+
&::after {
239239
display: none !important;
240240
}
241241
}
@@ -270,6 +270,7 @@ export default defineComponent({
270270
.is-active {
271271
& > .el-sub-menu__title {
272272
color: var(--left-menu-text-active-color) !important;
273+
// background-color: var(--left-menu-bg-color) !important;
273274
}
274275
}
275276

src/components/Qrcode/src/Qrcode.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,7 @@ const disabledClick = () => {
242242
243243
.@{prefix-cls} {
244244
&--disabled {
245-
background: rgba(255, 255, 255, 0.95);
245+
background: rgb(255 255 255 / 95%);
246246
247247
& > div {
248248
transform: translate(-50%, -50%);

src/components/Setting/src/components/LayoutRadioPicker.vue

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ const layout = computed(() => appStore.getLayout)
6767
border: 2px solid #e5e7eb;
6868
border-radius: 4px;
6969
70-
&:before {
70+
&::before {
7171
position: absolute;
7272
top: 0;
7373
left: 0;
@@ -79,14 +79,14 @@ const layout = computed(() => appStore.getLayout)
7979
content: '';
8080
}
8181
82-
&:after {
82+
&::after {
8383
position: absolute;
8484
top: 0;
8585
left: 0;
8686
width: 100%;
8787
height: 25%;
8888
background-color: #fff;
89-
border-radius: 4px 4px 0 4px;
89+
border-radius: 4px 4px 0;
9090
content: '';
9191
}
9292
}
@@ -95,7 +95,7 @@ const layout = computed(() => appStore.getLayout)
9595
border: 2px solid #e5e7eb;
9696
border-radius: 4px;
9797
98-
&:before {
98+
&::before {
9999
position: absolute;
100100
top: 0;
101101
left: 0;
@@ -107,7 +107,7 @@ const layout = computed(() => appStore.getLayout)
107107
content: '';
108108
}
109109
110-
&:after {
110+
&::after {
111111
position: absolute;
112112
top: 0;
113113
left: 0;
@@ -123,7 +123,7 @@ const layout = computed(() => appStore.getLayout)
123123
border: 2px solid #e5e7eb;
124124
border-radius: 4px;
125125
126-
&:before {
126+
&::before {
127127
position: absolute;
128128
top: 0;
129129
left: 0;
@@ -140,7 +140,7 @@ const layout = computed(() => appStore.getLayout)
140140
border: 2px solid #e5e7eb;
141141
border-radius: 4px;
142142
143-
&:before {
143+
&::before {
144144
position: absolute;
145145
top: 0;
146146
left: 0;
@@ -152,7 +152,7 @@ const layout = computed(() => appStore.getLayout)
152152
content: '';
153153
}
154154
155-
&:after {
155+
&::after {
156156
position: absolute;
157157
top: 0;
158158
left: 0;

src/components/UserInfo/src/components/LockDialog.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ const handleLock = async () => {
9494

9595
<style lang="less" scoped>
9696
:global(.v-lock-dialog) {
97-
@media (max-width: 767px) {
97+
@media (width <= 767px) {
9898
max-width: calc(100vw - 16px);
9999
}
100100
}

src/components/UserInfo/src/components/LockPage.vue

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -205,6 +205,7 @@ function handleShowForm(show = false) {
205205
font-size: 90px;
206206
}
207207
}
208+
208209
@media screen and (min-width: @screen-lg) {
209210
span:not(.meridiem) {
210211
font-size: 220px;
@@ -216,6 +217,7 @@ function handleShowForm(show = false) {
216217
font-size: 260px;
217218
}
218219
}
220+
219221
@media screen and (min-width: @screen-2xl) {
220222
span:not(.meridiem) {
221223
font-size: 320px;

stylelint.config.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -215,6 +215,8 @@ module.exports = {
215215
extends: ['stylelint-config-recommended', 'stylelint-config-html'],
216216
rules: {
217217
'keyframes-name-pattern': null,
218+
'selector-class-pattern': null,
219+
'no-duplicate-selectors': null,
218220
'selector-pseudo-class-no-unknown': [
219221
true,
220222
{

0 commit comments

Comments
 (0)