Skip to content

Commit bb665de

Browse files
chore(release): release 12.1.0 (#145)
Co-authored-by: huaweidevcloud <devcloudmobile@huawei.com>
1 parent 70ac40c commit bb665de

File tree

220 files changed

+5028
-1158
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

220 files changed

+5028
-1158
lines changed

devui-commons/src/header/header.component.html

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,15 @@
99
}">
1010
<div class="header-left">
1111
<div *ngIf="showSlideButton" class="slide-menu-link" (click)="clickSlideMenu()">
12-
<span></span>
12+
<span>
13+
<svg width="18px" height="14px" viewBox="0 0 18 14" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
14+
<g id="slide-button-outer" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
15+
<g id="slide-button-inner">
16+
<path d="M18,6 L18,8 L0,8 L0,6 L18,6 Z M18,0 L18,2 L0,2 L0,0 L18,0 Z M14,12 L14,14 L0,14 L0,12 L14,12 Z"></path>
17+
</g>
18+
</g>
19+
</svg>
20+
</span>
1321
</div>
1422
<ng-content select="d-header-logo"></ng-content>
1523
<d-search *ngIf="showSearch" [isKeyupSearch]="true" [placeholder]="searchPlaceholder" (searchFn)="onSearch($event)"></d-search>

devui-commons/src/header/header.component.scss

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,13 +71,16 @@
7171
border-right: 1px solid $devui-dividing-line;
7272

7373
span {
74-
background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABIAAAAOAQMAAAAYFN70AAAABlBMVEUAAAAhKDGQazuIAAAAAXRSTlMAQObYZgAAABRJREFUCNdj+P//ABijAdzif8AYAMnZDu+UDPvPAAAAAElFTkSuQmCC)
75-
no-repeat scroll 0 center;
74+
line-height: 40px;
7675
display: block;
7776
width: 18px;
7877
height: 40px;
7978
margin: 0 10px;
8079
cursor: pointer;
80+
81+
#slide-button-inner {
82+
fill: $devui-text;
83+
}
8184
}
8285
}
8386
}
@@ -90,7 +93,7 @@
9093
vertical-align: text-bottom;
9194
border: 0;
9295
height: 20px;
93-
width: 90px;
96+
width: 100px;
9497
margin: 0 12px;
9598
}
9699
}
@@ -176,6 +179,12 @@
176179
}
177180
}
178181

182+
@media (max-width: 380px) {
183+
d-search {
184+
width: 180px;
185+
}
186+
}
187+
179188
:host d-search ::ng-deep input {
180189
border-width: 0;
181190
}

devui-commons/src/header/logo/logo.component.scss

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,4 +28,12 @@
2828
margin-left: 0 !important;
2929
}
3030
}
31+
}
32+
33+
@media (max-width: 360px) {
34+
.header-logo {
35+
.text {
36+
display: none;
37+
}
38+
}
3139
}

devui-commons/src/header/menu/menu.component.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@
8787
}
8888
}
8989

90-
@media (max-width: 1180px) {
90+
@media (max-width: 1360px) {
9191
.header-menu {
9292
flex-direction: column;
9393
}

devui-commons/src/header/version-switch/version-switch.component.scss

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,10 @@
77
.header-version-switch {
88
width: 60px;
99
}
10+
}
11+
12+
@media (max-width: 1360px) {
13+
.header-version-switch {
14+
width: 70px;
15+
}
1016
}

devui/accordion/accordion.component.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
height: 40px;
5252
width: 100%;
5353
padding: 0 12px 0 20px;
54-
font-weight: 400;
54+
font-weight: normal;
5555
line-height: 40px;
5656
color: $devui-text-weak;
5757
background: transparent;

devui/accordion/demo/template/template.component.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
color: $devui-light-text;
1515
text-align: center;
1616
background: $devui-brand;
17-
font-weight: 400;
17+
font-weight: normal;
1818
}
1919

2020
.loading {

devui/alert/alert.component.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<div class="devui-alert devui-alert-{{ type }} {{ cssClass }}" *ngIf="!hide">
2-
<button type="button" class="devui-close" (click)="close()" *ngIf="closeable">
2+
<div class="devui-close" (click)="close()" *ngIf="closeable">
33
<svg
44
width="10px"
55
height="10px"
@@ -16,7 +16,7 @@
1616
</g>
1717
</g>
1818
</svg>
19-
</button>
19+
</div>
2020
<span class="devui-alert-icon" *ngIf="showIcon !== false && type !== 'simple'">
2121
<svg
2222
width="16px"

devui/alert/alert.component.scss

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
@import '../style/theme/color';
33
@import '../style/theme/shadow';
44
@import '../style/theme/corner';
5-
@import '../style/theme/_font';
5+
@import '../style/core/_font';
66

77
:host {
88
display: block;
@@ -12,16 +12,17 @@
1212
color: $devui-text;
1313
font-size: $devui-font-size;
1414
border: 1px solid transparent;
15-
padding: 8px;
15+
padding: 8px 16px;
1616
line-height: 24px;
1717
border-radius: $devui-border-radius;
18-
padding-left: 16px;
1918
word-break: normal;
2019
word-wrap: break-word;
2120

22-
button.devui-close {
21+
.devui-close {
2322
color: $devui-text;
2423
opacity: 1;
24+
line-height: 26px;
25+
height: 24px;
2526

2627
& > svg path {
2728
fill: $devui-light-text;
@@ -39,7 +40,7 @@
3940
border-color: $devui-success-line;
4041
color: $devui-text;
4142

42-
button.devui-close {
43+
.devui-close {
4344
& > svg path {
4445
fill: $devui-success-line;
4546
}
@@ -51,7 +52,7 @@
5152
border-color: $devui-info-line;
5253
color: $devui-text;
5354

54-
button.devui-close {
55+
.devui-close {
5556
& > svg path {
5657
fill: $devui-info-line;
5758
}
@@ -63,7 +64,7 @@
6364
border-color: $devui-warning-line;
6465
color: $devui-text;
6566

66-
button.devui-close {
67+
.devui-close {
6768
& > svg path {
6869
fill: $devui-warning-line;
6970
}
@@ -75,7 +76,7 @@
7576
border-color: $devui-danger-line;
7677
color: $devui-text;
7778

78-
button.devui-close {
79+
.devui-close {
7980
& > svg path {
8081
fill: $devui-danger-line;
8182
}
@@ -86,7 +87,7 @@
8687
border-color: $devui-line;
8788
color: $devui-text;
8889

89-
button.devui-close {
90+
.devui-close {
9091
& > svg path {
9192
fill: $devui-text-weak;
9293
}

devui/alert/alert.spec.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -107,15 +107,15 @@ describe('alert', () => {
107107

108108
describe('alert close', () => {
109109
it('Alert should close', () => {
110-
const closeButton = alertElement.querySelector('button');
111-
closeButton.click();
110+
const closeButton = alertElement.querySelector('.devui-close');
111+
closeButton.dispatchEvent(new Event('click'));
112112
fixture.detectChanges();
113113
expect(alertElement.querySelector('.devui-alert')).toBe(null);
114114
});
115115

116116
it('Alert should activate closeEvent', () => {
117-
const closeButton = alertElement.querySelector('button');
118-
closeButton.click();
117+
const closeButton = alertElement.querySelector('.devui-close');
118+
closeButton.dispatchEvent(new Event('click'));
119119
fixture.detectChanges();
120120
expect(testComponent.clickCount).toBe(1);
121121
});

0 commit comments

Comments
 (0)