Skip to content

Commit 99f9953

Browse files
committed
[update]修改部分组件样式
1 parent b8b25d2 commit 99f9953

File tree

8 files changed

+95
-7
lines changed

8 files changed

+95
-7
lines changed

src/common/_utils/style/theme/theme.json

+6-6
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@
3030
"btnHoverColor": "#EA7568",
3131
"btnActiveColor": "#CC211C",
3232

33-
"successColor": "#2BA250",
33+
"successColor": "#3DAB1B",
3434
"infoColor": "#3499E5",
35-
"warningColor": "#F0BD3E",
35+
"warningColor": "#E2CA34",
3636
"dangerColor": "#DC5849",
3737
"shadowBase": "rgba(0, 0, 0, 0.35)",
3838
"shadowTooltip": "rgba(0, 0, 0, 0.35)",
@@ -145,9 +145,9 @@
145145
"l100": "#FFFFFF",
146146
"btnHoverColor": "#F6241D",
147147
"btnActiveColor": "#D7000E",
148-
"successColor": "#51BEFC",
148+
"successColor": "#00BC00",
149149
"infoColor": "#0081E2",
150-
"warningColor": "#FAAD14",
150+
"warningColor": "#F2B200",
151151
"dangerColor": "#FF4D4F",
152152
"shadowBase": "rgba(0, 0, 0, 0.14)",
153153
"shadowTooltip": "rgba(0, 0, 0, 0.14)",
@@ -252,9 +252,9 @@
252252
"hoverColor": "#e5666f",
253253
"hoverBg": "rgba(255, 255, 255, 0.04)",
254254
"clickColor": "#dc333f",
255-
"successColor": "#2BA250",
255+
"successColor": "#3DAB1B",
256256
"infoColor": "#3499E5",
257-
"warningColor": "#F0BD3E",
257+
"warningColor": "#E2CA34",
258258
"dangerColor": "#DC5849",
259259
"iconColorHover": "rgba(255, 255, 255, 0.75)",
260260
"headingColor": "rgba(255, 255, 255, 0.85)",

src/common/message/style/message.scss

+1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
@include b(message) {
55
&-notice-content {
66
background: $message-background;
7+
color: $text-color-active;
78
}
89

910
&-error .#{$iconfont-css-prefix} {

src/common/modal/style/modal.scss

+36
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,32 @@
33
@import '../../_utils/style/theme/theme.scss';
44

55
@include b (modal) {
6+
$modal-prefix: &;
7+
68
@include e(content, '-') {
79
background-color: $modal-content-bg;
10+
11+
#{$modal-prefix}-header {
12+
padding: 14px 24px;
13+
border-color: $border-color-secondary;
14+
#{$modal-prefix}-title {
15+
line-height: 24px;
16+
}
17+
}
18+
#{$modal-prefix}-footer {
19+
padding: 10px 24px;
20+
border-color: $border-color-secondary;
21+
}
822
}
923

1024
@include e(close, '-') {
1125
color: $text-color-secondary;
26+
&-x {
27+
line-height: 52px;
28+
height: 52px;
29+
width: 64px;
30+
}
31+
1232
}
1333

1434
@include e(confirm, '-') {
@@ -19,5 +39,21 @@
1939
&-confirm &-body > .#{$iconfont-css-prefix} {
2040
color: $warning-color;
2141
}
42+
&-body &-title {
43+
line-height: 24px;
44+
}
45+
&-body {
46+
.#{$iconfont-css-prefix} {
47+
margin-right: 12px;
48+
font-size: 24px;
49+
50+
+ #{$modal-prefix}-title + #{$modal-prefix}-content {
51+
margin-left: 36px;
52+
}
53+
}
54+
}
55+
#{$modal-prefix}-body {
56+
padding: 20px 24px;
57+
}
2258
}
2359
}

src/common/notification/style/notification.scss

+9
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,17 @@
33

44
@include b(notification) {
55
&-notice {
6+
$notice-prefix: &;
67
background: $message-background;
8+
padding: 20px 24px 24px;
79

810
&-message {
911
color: $heading-color;
1012
}
1113

1214
@at-root {
1315
.#{$iconfont-css-prefix}#{&}-icon {
16+
margin-left: 0;
1417
&-warning {
1518
color: $warning-color;
1619
}
@@ -26,5 +29,11 @@
2629
color: $text-color;
2730
}
2831
}
32+
33+
&-with-icon {
34+
#{$notice-prefix}-message, #{$notice-prefix}-description {
35+
margin-left: 36px;
36+
}
37+
}
2938
}
3039
}

src/common/table/style/table.scss

+36
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77

88
&-thead > tr > th {
99
background: $table-header-bg;
10+
position: relative;
1011
// .#{$iconfont-css-prefix}-filter,
1112
// #{$table-prefix}-filter-icon {
1213
// color: $table-header-icon-color;
@@ -116,6 +117,41 @@
116117
}
117118
}
118119
}
120+
&:not(&-bordered) {
121+
#{$table-prefix}-thead > tr > th::after {
122+
content: "";
123+
position: absolute;
124+
top: 50%;
125+
right: 0;
126+
width: 1px;
127+
height: 14px;
128+
background-color: $border-color-secondary;
129+
transform: translateY(-50%);
130+
}
131+
}
132+
133+
&-thead > tr > th,
134+
&-tbody > tr > td {
135+
padding: 13px 24px;
136+
}
137+
138+
&-middle {
139+
> #{$table-prefix}-content > #{$table-prefix}-body > table {
140+
> #{$table-prefix}-thead > tr > th,
141+
> #{$table-prefix}-tbody > tr > td {
142+
padding: 9px 24px;
143+
}
144+
}
145+
}
146+
147+
&-small {
148+
> #{$table-prefix}-content > #{$table-prefix}-body > table {
149+
> #{$table-prefix}-thead > tr > th,
150+
> #{$table-prefix}-tbody > tr > td {
151+
padding: 5px 24px;
152+
}
153+
}
154+
}
119155

120156
// &-selection {
121157
// .#{$iconfont-css-prefix}-down {

src/common/tooltip/style/tooltip.scss

+3
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,7 @@
22
@import '../../_utils/style/theme/theme.scss';
33

44
@include b (tooltip) {
5+
&-inner {
6+
padding: 6px 12px;
7+
}
58
}

src/mapboxgl/web-map/LayerGroup.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
/>
2121
<span class="add-ellipsis">{{ item.title }}</span>
2222
<div
23-
:class="['icon-buttons', showIconsItem === item.id ? 'icon-buttons-visible' : 'icon-buttons-hidden']"
23+
:class="['icon-buttons', showIconsItem === item.id ? 'icon-buttons-visible' : 'icon-buttons-hidden', item.type === 'group' ? 'icon-buttons-in-group' : '']"
2424
>
2525
<div v-if="layerOperations.zoomToLayer" class="sm-component-layer-list__zoom">
2626
<i

src/mapboxgl/web-map/control/layer-list/style/layer-list.scss

+3
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,9 @@
7070
margin-right: 9px;
7171
}
7272
& div:last-child {
73+
margin-right: 0px;
74+
}
75+
&.icon-buttons-in-group div{
7376
margin-right: 12px;
7477
}
7578
& i:hover {

0 commit comments

Comments
 (0)