Skip to content

Commit 0d4971f

Browse files
committed
feat(windows): add input border color variable to theme
replaced hardcoded values to use this references #5565
1 parent 85c1637 commit 0d4971f

File tree

5 files changed

+25
-8
lines changed

5 files changed

+25
-8
lines changed

ionic/components/alert/alert.wp.scss

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,13 @@ $alert-wp-message-font-size: 13px !default;
2121
$alert-wp-message-padding: 0 20px 10px 20px !default;
2222
$alert-wp-message-text-color: #000 !default;
2323

24-
$alert-wp-input-border-color: #dedede !default;
24+
$alert-wp-input-border-color: $input-wp-border-color !default;
2525
$alert-wp-input-text-color: #000000 !default;
2626
$alert-wp-input-highlight-color: map-get($colors-wp, primary) !default;
2727
$alert-wp-input-margin-top: 5px !default;
2828
$alert-wp-input-margin-bottom: 5px !default;
29+
$alert-wp-input-padding-vertical: 0 !default;
30+
$alert-wp-input-padding-horizontal: 8px !default;
2931

3032
$alert-wp-button-padding: 5px !default;
3133
$alert-wp-button-text-color: #000 !default;
@@ -36,7 +38,9 @@ $alert-wp-button-margin-right: 1% !default;
3638
$alert-wp-button-font-weight: 300 !default;
3739

3840
$alert-wp-checkbox-background-color: map-get($colors-wp, primary) !default;
41+
$alert-wp-checkbox-border-color: $input-wp-border-color !default;
3942
$alert-wp-radio-background-color: map-get($colors-wp, primary) !default;
43+
$alert-wp-radio-border-color: $input-wp-border-color !default;
4044

4145
$alert-wp-buttons-padding: 8px 20px 20px 20px !default;
4246
$alert-wp-buttons-justify-content: flex-end !default;
@@ -90,13 +94,14 @@ $alert-wp-buttons-justify-content: flex-end !default;
9094
// --------------------------------------------------
9195

9296
.alert-input {
93-
border-bottom: 1px solid $alert-wp-input-border-color;
97+
border: 2px solid $alert-wp-input-border-color;
9498
color: $alert-wp-input-text-color;
9599
margin: $alert-wp-input-margin-top 0 $alert-wp-input-margin-bottom 0;
100+
padding: $alert-wp-input-padding-vertical $alert-wp-input-padding-horizontal;
101+
line-height: 3rem;
96102

97103
&:focus {
98-
border-bottom: 2px solid $alert-wp-input-highlight-color;
99-
margin-bottom: $alert-wp-input-margin-bottom - 1;
104+
border-color: $alert-wp-input-highlight-color;
100105
}
101106
}
102107

@@ -144,7 +149,7 @@ $alert-wp-buttons-justify-content: flex-end !default;
144149
margin: 0;
145150
border-width: 2px;
146151
border-style: solid;
147-
border-color: darken($list-wp-border-color, 40%);
152+
border-color: $alert-wp-radio-border-color;
148153
border-radius: 50%;
149154

150155
&:after {
@@ -194,7 +199,7 @@ $alert-wp-buttons-justify-content: flex-end !default;
194199
border-radius: 2px;
195200
border-width: 2px;
196201
border-style: solid;
197-
border-color: #818181;
202+
border-color: $alert-wp-checkbox-border-color;
198203
background-color: transparent;
199204
}
200205

ionic/components/item/item.wp.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ $item-wp-paragraph-text-color: #666 !default;
1111
$item-wp-font-size: 1.6rem !default;
1212
$item-wp-avatar-size: 4rem !default;
1313
$item-wp-thumbnail-size: 8rem !default;
14-
$item-wp-note-color: darken($list-wp-border-color, 10%) !default;
14+
$item-wp-note-color: $input-wp-border-color !default;
1515

1616
$item-wp-divider-bg: #fff !default;
1717
$item-wp-divider-color: #222 !default;

ionic/components/searchbar/searchbar.wp.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
$searchbar-wp-padding: 0 !default;
88
$searchbar-wp-background-color: transparent !default;
99
$searchbar-wp-border-width: 2px !default;
10-
$searchbar-wp-border-color: #818181 !default;
10+
$searchbar-wp-border-color: $input-wp-border-color !default;
1111
$searchbar-wp-border-color-focused: map-get($colors-wp, primary) !default;
1212

1313
$searchbar-wp-input-search-icon-color: #858585 !default;

ionic/themes/dark.wp.scss

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,11 +60,18 @@ $item-wp-padding-icon-bottom: 10px !default;
6060
$item-wp-divider-bg: #151515 !default;
6161
$item-wp-divider-color: map-get($colors-wp, light) !default;
6262

63+
6364
// Windows Toggle
6465
// ---------------------------------------------------
6566
$toggle-wp-handle-background-color-off: map-get($colors-wp, light) !default;
6667

6768

69+
// Windows Input
70+
// --------------------------------------------------
71+
72+
$input-wp-border-color: map-get($colors-wp, light) !default;
73+
74+
6875
// Ripple Color
6976
// --------------------------------------------------
7077

ionic/themes/default.wp.scss

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,11 @@ $item-wp-padding-icon-top: 11px !default;
4949
$item-wp-padding-icon-bottom: 10px !default;
5050

5151

52+
// Windows Input
53+
// --------------------------------------------------
54+
55+
$input-wp-border-color: #818181 !default;
56+
5257

5358
// Windows Body
5459
// --------------------------------------------------

0 commit comments

Comments
 (0)