Skip to content

Commit a1d1e03

Browse files
committed
seting up for backmerging
1 parent 0f0ffe5 commit a1d1e03

1 file changed

Lines changed: 33 additions & 29 deletions

File tree

src/index.scss

Lines changed: 33 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -11,30 +11,34 @@ tablet has fixed widths and font sizes
1111
mobile has scaling widths and font sizes
1212
*/
1313

14-
@mixin tablet {
15-
@media(min-width: #{$tablet-width}) { @content; }
14+
@mixin tablet{
15+
@media(min-width: #{$tablet-width}){ @content; }
1616
}
1717

18-
@mixin desktop {
19-
@media(min-width: #{$desktop-width}) { @content }
18+
@mixin desktop{
19+
@media(min-width: #{$desktop-width}){ @content }
2020
}
2121

22-
.mobile-hide {
22+
@mixin mobile{
23+
24+
}
25+
26+
.mobile-hide{
2327
display: none;
2428
@include desktop{
2529
display: flex;
2630
}
2731
}
2832

29-
.desktop-hide {
33+
.desktop-hide{
3034
display: flex;
3135

3236
@include desktop{
3337
display: none;
3438
}
3539
}
3640

37-
.navigation {
41+
.navigation{
3842
display: inline-block;
3943
width: 100%;
4044
/*
@@ -48,45 +52,45 @@ mobile has scaling widths and font sizes
4852
color: $white;
4953
background-color: $blue;
5054

51-
@include desktop {
55+
@include desktop{
5256
margin: 0;
5357
font-size: 12px;
5458
font-weight: 400;
5559
color: $blue;
5660
background-color: $white;
5761
}
5862

59-
ul {
63+
ul{
6064
list-style-type: none;
6165
float: right;
6266
margin: 0;
6367
padding: 0;
6468
}
6569

66-
li {
70+
li{
6771
padding: 25px 15px;
6872
text-align: center;
6973
text-decoration: none;
70-
@include desktop {
74+
@include desktop{
7175
padding: 25px 25px;
7276
}
7377
}
7478

75-
a {
79+
a{
7680
color: $white;
7781
border-bottom-style: solid;
7882
border-color: transparentize($white, 1);
79-
@include desktop {
83+
@include desktop{
8084
color: $blue;
8185
}
8286
}
8387

84-
a:hover {
88+
a:hover{
8589
border-color: transparentize($white, 1);
8690
transition: border-color 0.2s;
8791
}
8892

89-
a:active {
93+
a:active{
9094
border-color: transparentize($white, 0);
9195
transition: border-color 0.2s;
9296
}
@@ -118,7 +122,7 @@ html, body, #root, #app, .full-height{
118122
}
119123

120124
.desktop-banner{
121-
@include desktop {
125+
@include desktop{
122126
display: block;
123127
width: 100%;
124128
padding: 12px 0px;
@@ -151,7 +155,7 @@ html, body, #root, #app, .full-height{
151155
font-weight: 400;
152156
}
153157

154-
@include desktop {
158+
@include desktop{
155159
display: none;
156160
}
157161
}
@@ -162,12 +166,12 @@ html, body, #root, #app, .full-height{
162166
height: unquote("max(68px, 35px + 10vh)");
163167
margin-left: 15px;
164168

165-
@include tablet {
169+
@include tablet{
166170
height: 150px;
167171
margin-left: 40px;
168172
}
169173

170-
@include desktop {
174+
@include desktop{
171175
height: 175px;
172176
margin-left: 50px;
173177
}
@@ -177,7 +181,7 @@ html, body, #root, #app, .full-height{
177181
flex-direction: column;
178182
text-align: center;
179183

180-
@include desktop {
184+
@include desktop{
181185
flex-direction: row;
182186
max-width: 1100px;
183187
width: 100%;
@@ -196,9 +200,9 @@ html, body, #root, #app, .full-height{
196200
/* slightly smaller hero img for shorter screens */
197201
min-width: 80%;
198202

199-
@include tablet {width: unquote("min(50vh, 90%)");}
203+
@include tablet{width: unquote("min(50vh, 90%)");}
200204

201-
@include desktop {width: 100%;}
205+
@include desktop{width: 100%;}
202206
}
203207

204208
/*
@@ -211,7 +215,7 @@ html, body, #root, #app, .full-height{
211215
font-weight: 700;
212216
color: $blue;
213217

214-
@include tablet {
218+
@include tablet{
215219
height: 65px;
216220
font-size: 60px;
217221
}
@@ -223,7 +227,7 @@ html, body, #root, #app, .full-height{
223227
font-weight: 700;
224228
color: $blue;
225229

226-
@include tablet {
230+
@include tablet{
227231
height: 37px;
228232
font-size: 28.0px;
229233
}
@@ -235,7 +239,7 @@ html, body, #root, #app, .full-height{
235239
font-weight: 500;
236240
color: $blue;
237241

238-
@include tablet {
242+
@include tablet{
239243
height: 20px;
240244
font-size: 14px;
241245
}
@@ -251,7 +255,7 @@ html, body, #root, #app, .full-height{
251255
border-width: 1px;
252256
border-color: $blue;
253257

254-
@include tablet {
258+
@include tablet{
255259
height: 40px;
256260
width: 375px;
257261
margin-top: 10px;
@@ -273,7 +277,7 @@ html, body, #root, #app, .full-height{
273277
font-size: 3.25vw;
274278
font-weight: 500;
275279

276-
@include tablet {
280+
@include tablet{
277281
height: 30px;
278282
font-size: 14px;
279283
}
@@ -298,7 +302,7 @@ html, body, #root, #app, .full-height{
298302
background-position: 1.5vw;
299303
background-size: 5vw;
300304

301-
@include tablet {
305+
@include tablet{
302306
height: 30px;
303307
width: 30px;
304308
margin-right: 5px;
@@ -307,7 +311,7 @@ html, body, #root, #app, .full-height{
307311
background-size: 18px;
308312
}
309313

310-
@include desktop {
314+
@include desktop{
311315
/* arrow moves slightly to the right on hover */
312316
:hover{
313317
background-position: 5.25px;

0 commit comments

Comments
 (0)