Skip to content

Commit 35a5a30

Browse files
author
Richard da Silva
committed
Rearranged css style order
1 parent 266944a commit 35a5a30

File tree

3 files changed

+19
-39
lines changed

3 files changed

+19
-39
lines changed

packages/components/header/_header.scss

Lines changed: 15 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -168,19 +168,16 @@
168168

169169
.ofh-header__search-toggle {
170170
@include toggle-button();
171-
min-height: ofh-spacing(6);
172-
/* [2] */
171+
min-height: ofh-spacing(6); /* [2] */
173172
padding: ofh-spacing(1) ofh-spacing(2) 0;
174173
position: absolute;
175174
right: 0;
176175
top: 0;
177176

178177
.ofh-icon__search {
179178
fill: $ofh-button-color-default;
180-
height: 21px;
181-
/* [3] */
182-
width: 21px;
183-
/* [3] */
179+
height: 21px; /* [3] */
180+
width: 21px; /* [3] */
184181
}
185182

186183
&:focus {
@@ -241,17 +238,14 @@
241238
&:focus {
242239
@include ofh-focused-input;
243240
}
244-
245241
&::placeholder {
246242
color: $color_ofh-grey-1;
247243
font-size: $ofh-base-font-size;
248244
}
249-
250245
&:-ms-input-placeholder {
251246
color: $color_ofh-grey-1;
252247
font-size: $ofh-base-font-size;
253248
}
254-
255249
&::-webkit-input-placeholder {
256250
color: $color_ofh-grey-1;
257251
font-size: $ofh-base-font-size;
@@ -261,21 +255,17 @@
261255
flex-grow: 2;
262256
-ms-flex-positive: 2;
263257
font-size: inherit;
264-
height: 52px;
265-
/* [4] */
258+
height: 52px; /* [4] */
266259
margin: 0;
267260
outline: none;
268-
width: 100%;
269-
/* [4] */
261+
width: 100%; /* [4] */
270262
z-index: 1;
271263
}
272264

273265
@include mq($from: tablet) {
274266
font-size: $ofh-base-font-size;
275-
height: ofh-spacing(6);
276-
/* [2] */
277-
width: 200px;
278-
/* [2] */
267+
height: ofh-spacing(6); /* [2] */
268+
width: 200px; /* [2] */
279269
}
280270

281271
@include mq($from: desktop) {
@@ -297,8 +287,7 @@
297287
z-index: 1;
298288

299289
&::-moz-focus-inner {
300-
border: 0;
301-
/* [4] */
290+
border: 0; /* [4] */
302291
}
303292

304293
&:hover {
@@ -322,31 +311,24 @@
322311
}
323312

324313
@include mq($until: tablet) {
325-
height: 52px;
326-
/* [2] */
314+
height: 52px; /* [2] */
327315
margin: 0;
328316
padding: ofh-spacing(2) ofh-spacing(2) 0;
329317

330318
.ofh-icon__search {
331-
height: 38px;
332-
/* [3] */
333-
width: 38px;
334-
/* [3] */
319+
height: 38px; /* [3] */
320+
width: 38px; /* [3] */
335321
}
336322
}
337323

338324
@include mq($from: tablet) {
339325
display: block;
340-
height: ofh-spacing(6);
341-
/* [2] */
342-
width: 44px;
343-
/* [2] */
326+
height: ofh-spacing(6); /* [2] */
327+
width: 44px; /* [2] */
344328

345329
.ofh-icon__search {
346-
height: 27px;
347-
/* [3] */
348-
width: 27px;
349-
/* [3] */
330+
height: 27px; /* [3] */
331+
width: 27px; /* [3] */
350332
}
351333
}
352334
}

packages/core/tools/_mixins.scss

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -272,11 +272,10 @@
272272
@mixin toggle-button() {
273273
background-color: $ofh-button-color-white;
274274
border: $ofh-border-width-form-element solid $ofh-button-color-default;
275-
color: $ofh-button-color-default;
276-
font-size: 18px;
277275
border-radius: $ofh-border-radius;
278-
276+
color: $ofh-button-color-default;
279277
cursor: pointer;
278+
font-size: 18px;
280279

281280
&::-moz-focus-inner {
282281
border: 0; // [1] //
@@ -285,8 +284,8 @@
285284
&:hover {
286285
background-color: $ofh-button-color-white;
287286
border: $ofh-border-width-form-element solid $ofh-button-color-hover;
288-
color: $ofh-button-color-hover;
289287
box-shadow: none;
288+
color: $ofh-button-color-hover;
290289
text-decoration: underline;
291290
}
292291

site/components/header/_header.scss

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -287,8 +287,7 @@
287287
@include close-button();
288288

289289
margin-left: ofh-spacing(2);
290-
margin-right: - ofh-spacing(2);
291-
/* [11] */
290+
margin-right: - ofh-spacing(2); /* [11] */
292291
margin-top: ofh-spacing(2);
293292

294293
&:focus {

0 commit comments

Comments
 (0)