Skip to content

Commit 29ff7f1

Browse files
committed
feat(windows): UI fixes
references #5565
1 parent 3d12e69 commit 29ff7f1

File tree

8 files changed

+17
-11
lines changed

8 files changed

+17
-11
lines changed

ionic/components/alert/alert.wp.scss

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ $alert-wp-button-font-weight: 300 !default;
4848

4949
$alert-wp-checkbox-background: map-get($colors-wp, primary) !default;
5050
$alert-wp-checkbox-border-color: $input-wp-border-color !default;
51+
$alert-wp-checkbox-border-radius: 0 !default;
5152
$alert-wp-radio-background: map-get($colors-wp, primary) !default;
5253
$alert-wp-radio-border-color: $input-wp-border-color !default;
5354

@@ -218,7 +219,7 @@ ion-alert {
218219
left: 13px;
219220
width: 16px;
220221
height: 16px;
221-
border-radius: 2px;
222+
border-radius: $alert-wp-checkbox-border-radius;
222223
border-width: 2px;
223224
border-style: solid;
224225
border-color: $alert-wp-checkbox-border-color;

ionic/components/card/card.wp.scss

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,8 @@ $card-wp-avatar-size: 4rem !default;
2121
$card-wp-thumbnail-size: 8rem !default;
2222

2323
$card-wp-background-color: $list-wp-background-color !default;
24-
$card-wp-border: 2px solid rgba(0,0,0,0.2) !default;
25-
$card-wp-box-shadow: none !default;
26-
$card-wp-border-radius: 4px !default;
24+
$card-wp-box-shadow: 0px 1px 1px 1px rgba(0, 0, 0, 0.2) !default;
25+
$card-wp-border-radius: 1px !default;
2726
$card-wp-font-size: 1.4rem !default;
2827
$card-wp-line-height: 1.5 !default;
2928

@@ -45,7 +44,6 @@ ion-card {
4544
background: $card-wp-background-color;
4645
border-radius: $card-wp-border-radius;
4746
box-shadow: $card-wp-box-shadow;
48-
border: $card-wp-border;
4947

5048
ion-list {
5149
margin-bottom: 0;

ionic/components/searchbar/searchbar.wp.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ ion-searchbar {
150150

151151
@each $color-name, $color-value in $colors-wp {
152152

153-
ion-searchbar[#{$color-name}] .searchbar-focused {
153+
ion-searchbar[#{$color-name}].searchbar-focused {
154154
border-color: $color-value;
155155
}
156156

ionic/components/searchbar/test/toolbar/main.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@ <h5 padding-left padding-top> Search - Default Toolbar </h5>
1010

1111
<h5 padding-left padding-top> Search - Primary Toolbar </h5>
1212
<ion-toolbar primary>
13-
<ion-searchbar [(ngModel)]="primaryToolbarSearch" class="e2ePrimaryToolbarSearchbar"></ion-searchbar>
13+
<ion-searchbar dark [(ngModel)]="primaryToolbarSearch" class="e2ePrimaryToolbarSearchbar"></ion-searchbar>
1414
</ion-toolbar>
1515

1616
<h5 padding-left padding-top> Search - Danger Toolbar </h5>
1717
<ion-toolbar danger>
18-
<ion-searchbar [(ngModel)]="dangerToolbarSearch" class="e2eDangerToolbarSearchbar"></ion-searchbar>
18+
<ion-searchbar dark [(ngModel)]="dangerToolbarSearch" class="e2eDangerToolbarSearchbar"></ion-searchbar>
1919
</ion-toolbar>
2020

2121
<h5 padding-left padding-top> Search - Light Toolbar </h5>

ionic/components/segment/segment.wp.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ $segment-button-wp-icon-size: 2.6rem !default;
1616
$segment-button-wp-icon-line-height: $segment-button-wp-line-height !default;
1717
$segment-button-wp-background-color: transparent !default;
1818

19-
$segment-button-wp-opacity: 0.7 !default;
19+
$segment-button-wp-opacity: 0.5 !default;
2020
$segment-button-wp-opacity-activated: 1.0 !default;
2121

2222
$segment-button-wp-buttons-justify-content: flex-start !default;

ionic/components/tabs/tabs.wp.scss

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,11 @@ tabbar {
3535
&[aria-selected=true] {
3636
opacity: 1.0;
3737
color: $tab-button-wp-active-color;
38+
border-bottom: 2px solid $tab-button-wp-active-color;
39+
}
40+
41+
&.activated {
42+
background: rgba(0,0,0,0.1);
3843
}
3944
}
4045

@@ -45,7 +50,7 @@ tabbar {
4550

4651
.tab-button-icon {
4752
font-size: $tabbar-wp-item-icon-size;
48-
min-width: $tabbar-wp-item-icon-size + 5;
53+
min-width: $tabbar-wp-item-icon-size;
4954
}
5055

5156
[tabbarIcons=bottom] .tab-button {
@@ -83,6 +88,7 @@ tabbar {
8388
.tab-button:hover:not(.disable-hover),
8489
.tab-button[aria-selected=true] {
8590
color: color-inverse($color-value);
91+
border-color: color-inverse($color-value);
8692
}
8793
}
8894

ionic/components/tabs/test/basic/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ class Tab3 {
174174
</ion-content>
175175
</ion-menu>
176176
177-
<ion-tabs #content primary>
177+
<ion-tabs #content>
178178
<ion-tab tabTitle="Plain List" tabIcon="star" [root]="root1"></ion-tab>
179179
<ion-tab tabTitle="Schedule" tabIcon="globe" [root]="root2"></ion-tab>
180180
<ion-tab tabTitle="Stopwatch" tabIcon="stopwatch" [root]="root3"></ion-tab>

ionic/components/toolbar/toolbar.wp.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ ion-navbar-section {
5555
flex: 1;
5656
order: map-get($toolbar-order-wp, content);
5757
max-width: 100%;
58+
min-width: 0;
5859
}
5960

6061
.toolbar-title {

0 commit comments

Comments
 (0)