Skip to content

Commit 45461d9

Browse files
vesameskanenvesameskanen
authored
Merge pull request #5674 from HSLdevcom/foundation-css-fixes
rename priamry and secondary colors with theme prefix
2 parents a7fc98c + 19f6ee8 commit 45461d9

Some content is hidden

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

51 files changed

+339
-339
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/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/customize-search.scss‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@
233233
.close-offcanvas {
234234
position: absolute;
235235
background-color: transparent;
236-
color: $primary-color;
236+
color: $theme-primary-color;
237237
right: 1em;
238238
top: 1em;
239239
padding: 0;
@@ -503,7 +503,7 @@
503503
right: 0.7em;
504504
top: 0.7em;
505505
font-size: 1.5em;
506-
color: $primary-color;
506+
color: $theme-primary-color;
507507
pointer-events: none;
508508
}
509509

@@ -629,7 +629,7 @@
629629
.settings-mode-option-label-value {
630630
font-size: $font-size-small;
631631
float: right;
632-
color: $primary-color;
632+
color: $theme-primary-color;
633633
width: 100%;
634634
padding-right: 14.72px;
635635
margin: 14.72px 0;
@@ -686,7 +686,7 @@
686686

687687
.disclaimer-close-button-container {
688688
margin-left: 10px;
689-
background-color: $primary-color;
689+
background-color: $theme-primary-color;
690690
width: fit-content;
691691
height: fit-content;
692692
color: white;

‎app/component/itinerary/itinerary-page.scss‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -398,7 +398,7 @@
398398
.time-navigation-btn {
399399
height: 40px;
400400
width: 100%;
401-
color: $primary-color;
401+
color: $theme-primary-color;
402402
background-color: $white;
403403
text-align: left;
404404
padding-left: 81px;
@@ -456,7 +456,7 @@
456456

457457
button {
458458
font-size: $font-size-xsmall;
459-
color: $primary-color;
459+
color: $theme-primary-color;
460460
}
461461

462462
h3 {
@@ -471,7 +471,7 @@
471471
}
472472

473473
.change-settings {
474-
color: $primary-color;
474+
color: $theme-primary-color;
475475

476476
#change-settings-button {
477477
font-weight: bold;

‎app/component/itinerary/itinerary-summary.scss‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
left: 0;
77
top: 15px;
88
height: 80px;
9-
border-left: 8px solid $primary-color;
9+
border-left: 8px solid $theme-primary-color;
1010
}
1111

1212
.desktop .itinerary-summary-row.passive::before {
@@ -724,7 +724,7 @@
724724
padding: 1em;
725725

726726
.canceled-itineraries-button {
727-
color: $primary-color;
727+
color: $theme-primary-color;
728728
}
729729

730730
.canceled-itineraries-container {
@@ -737,7 +737,7 @@
737737
}
738738

739739
.canceled-itineraries-icon-container {
740-
color: $primary-color;
740+
color: $theme-primary-color;
741741
margin-right: 1em;
742742

743743
.icon {

0 commit comments

Comments
 (0)