Skip to content

Commit 7efe41f

Browse files
vesameskanenvesameskanen
authored
Merge pull request #5675 from HSLdevcom/next-css-fixes
rename primary and secondary css variables
2 parents 458e136 + fd9c562 commit 7efe41f

Some content is hidden

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

52 files changed

+348
-348
lines changed

‎app/component/bubble-dialog.scss‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ $bubble-dialog-font-size--fullscreen: 1.5rem;
5757
.bubble-dialog-close {
5858
align-self: start;
5959
background-color: transparent;
60-
color: $primary-color;
60+
color: $theme-primary-color;
6161
height: 1em;
6262
margin: 0.25em;
6363
padding: 0;
@@ -152,7 +152,7 @@ $bubble-dialog-font-size--fullscreen: 1.5rem;
152152
position: relative;
153153

154154
.icon {
155-
color: $primary-color;
155+
color: $theme-primary-color;
156156
height: auto;
157157
width: auto;
158158
}

‎app/component/checkbox.scss‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
display: flex;
33

44
.icon {
5-
color: $primary-color;
5+
color: $theme-primary-color;
66
}
77

88
&.large {
@@ -30,7 +30,7 @@
3030
position: relative;
3131

3232
&.checked {
33-
border: $primary-color 1px solid;
33+
border: $theme-primary-color 1px solid;
3434

3535
&.disabled {
3636
color: $gray;
@@ -51,15 +51,15 @@
5151
left: 0;
5252

5353
&:hover {
54-
border: 1px solid $primary-color;
54+
border: 1px solid $theme-primary-color;
5555
}
5656

5757
&.checked {
58-
border: $primary-color 1px solid;
59-
color: $primary-color;
58+
border: $theme-primary-color 1px solid;
59+
color: $theme-primary-color;
6060

6161
&::before {
62-
color: $primary-color;
62+
color: $theme-primary-color;
6363
font-family: $font-family;
6464
font-size: 1.25em;
6565
font-weight: $font-weight-medium;
@@ -75,7 +75,7 @@
7575
}
7676

7777
span > svg {
78-
color: $primary-color;
78+
color: $theme-primary-color;
7979
}
8080

8181
&.disabled {

‎app/component/date-select.scss‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
flex-basis: 200px;
1818

1919
&:focus-within {
20-
border-color: $primary-color;
20+
border-color: $theme-primary-color;
2121
}
2222

2323
&.route-schedule-date {
@@ -62,7 +62,7 @@
6262
transition: all 0.2s ease-out;
6363

6464
&:hover {
65-
color: $secondary-color;
65+
color: $theme-secondary-color;
6666
}
6767
}
6868
}
@@ -75,7 +75,7 @@
7575
line-height: 1.3em;
7676

7777
&:hover {
78-
color: $secondary-color;
78+
color: $theme-secondary-color;
7979
border-bottom: 2px none !important;
8080
}
8181
}
@@ -101,7 +101,7 @@
101101
justify-content: center;
102102
padding: 0;
103103
flex-shrink: 0;
104-
color: $primary-color;
104+
color: $theme-primary-color;
105105

106106
#route-schedule-date-icon {
107107
margin: auto;
@@ -175,7 +175,7 @@
175175
line-height: 1.3em;
176176

177177
&:hover {
178-
color: $secondary-color;
178+
color: $theme-secondary-color;
179179
border-bottom: 2px none !important;
180180
}
181181
}

‎app/component/disclaimer.scss‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
white-space: normal;
99
margin-bottom: 5px;
1010
margin-top: 5px;
11-
border-left: 4px solid $primary-color;
11+
border-left: 4px solid $theme-primary-color;
1212
box-shadow: 0 2px 4px 0 rgba(51, 51, 51, 0.2);
1313
width: 100%;
1414

@@ -17,7 +17,7 @@
1717

1818
.icon {
1919
&.info {
20-
color: $primary-color;
20+
color: $theme-primary-color;
2121
width: 16px;
2222
height: 16px;
2323
}
@@ -74,7 +74,7 @@
7474
color: #fff;
7575
margin-top: var(--space-xs);
7676
border-radius: var(--radius-radius-pill, 999px);
77-
background: $primary-color;
77+
background: $theme-primary-color;
7878

7979
.icon-container {
8080
padding-left: var(--space-xxs);

‎app/component/disruption.scss‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -176,11 +176,11 @@
176176
white-space: pre-wrap;
177177

178178
.alert-url {
179-
color: $primary-color;
179+
color: $theme-primary-color;
180180
margin-left: 5px;
181181

182182
.external-link {
183-
color: $primary-color;
183+
color: $theme-primary-color;
184184
}
185185
}
186186
}

‎app/component/embedded/embedded-search-generator.scss‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
input[type='checkbox'],
2020
input[type='radio'] {
21-
accent-color: $primary-color;
21+
accent-color: $theme-primary-color;
2222
border: 1px solid #888;
2323
box-sizing: border-box;
2424
width: 24px;

‎app/component/embedded/embedded-search.scss‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@
3030
margin-top: 10px;
3131

3232
.search-button {
33-
background-color: $primary-color;
33+
background-color: $theme-primary-color;
3434
font-family: $button-font-family;
35-
border: 2px solid $primary-color;
35+
border: 2px solid $theme-primary-color;
3636
color: white;
3737
border-radius: 40px;
3838
font-weight: 500;

‎app/component/itinerary/alt-travel-bar.scss‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@
143143

144144
.fake-select-arrow {
145145
font-size: 0.7rem;
146-
color: $primary-color;
146+
color: $theme-primary-color;
147147
margin-top: 1em;
148148
}
149149
}

‎app/component/itinerary/customizesearch/customize-search.scss‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@
196196
.close-offcanvas {
197197
position: absolute;
198198
background-color: transparent;
199-
color: $primary-color;
199+
color: $theme-primary-color;
200200
right: 1em;
201201
top: 1em;
202202
padding: 0;
@@ -306,7 +306,7 @@
306306
span {
307307
font-size: $font-size-small;
308308
font-weight: $font-weight-medium;
309-
color: $primary-color;
309+
color: $theme-primary-color;
310310
}
311311
}
312312
}
@@ -492,7 +492,7 @@
492492
align-items: center;
493493
font-weight: $font-weight-medium;
494494
color: $white;
495-
background-color: $primary-color;
495+
background-color: $theme-primary-color;
496496
}
497497
}
498498
}

‎app/component/itinerary/customizesearch/search-settings-dropdown.scss‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
display: flex;
1717
flex-wrap: wrap;
1818
justify-content: space-between;
19-
color: $primary-color;
19+
color: $theme-primary-color;
2020
margin-bottom: 5px;
2121
border-radius: 5px;
2222
background-color: $background-color-lighter;
@@ -41,7 +41,7 @@
4141
background-color: #fff;
4242

4343
.selected-checkmark {
44-
color: $primary-color;
44+
color: $theme-primary-color;
4545
margin: 9px 15px 0 0;
4646
}
4747

@@ -81,7 +81,7 @@
8181
.settings-dropdown-label-value {
8282
font-size: $font-size-small;
8383
float: right;
84-
color: $primary-color;
84+
color: $theme-primary-color;
8585
width: 100%;
8686
padding-right: 14.72px;
8787
margin: 14.72px 0;
@@ -93,6 +93,6 @@
9393
.icon-container {
9494
float: right;
9595
margin: 0.9em 0 0 0;
96-
color: $primary-color;
96+
color: $theme-primary-color;
9797
}
9898
}

0 commit comments

Comments
 (0)