Skip to content

Commit 78b5f78

Browse files
Revert "Max-width images, default links, added and corrected comments"
This reverts commit efd637d.
1 parent efd637d commit 78b5f78

File tree

4 files changed

+50
-71
lines changed

4 files changed

+50
-71
lines changed

sass/base/defaults.scss

Lines changed: 1 addition & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,3 @@
1-
/*
2-
Default site settings
3-
Setting the font-size to 62.5% so we can easily calculate with REM
4-
1REM = 10px (relative pixels)
5-
*/
6-
71
html {
82
background: $color01;
93
font-size: 62.5%;
@@ -13,24 +7,9 @@ html {
137
body {
148
font-size: $font-size-default;
159
line-height: $line-height-default;
16-
}
10+
}
1711

1812
html, button, input, select, textarea {
1913
font-family: $font-pri;
2014
font-weight: normal;
21-
}
22-
23-
/* Max width of images 100% */
24-
img, embed, object {
25-
max-width: 100%;
26-
}
27-
28-
/* Default Links */
29-
a {
30-
text-decoration: underline;
31-
color: $theme01;
32-
}
33-
a:hover {
34-
color: $theme03;
35-
text-decoration: none;
3615
}

sass/base/mixins.scss

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
/*========== MIXINS ==========*/
22

33
/*
4-
Text-overflow: ellipsis
4+
* Text-overflow: ellipsis
55
*/
66
@mixin ellipsis(){
77
overflow: hidden; white-space: nowrap; text-overflow: ellipsis;
88
}
99

1010
/*
11-
Ul-reset
12-
Set margin, padding and list-style to zero/none
11+
* Ul-reset
12+
* Set margin, padding and list-style to zero/none
1313
*/
1414
@mixin ulreset() {
1515
margin: 0; padding: 0; list-style: none;
@@ -38,7 +38,7 @@
3838
* Generic transform
3939
*/
4040
@mixin transform($transforms) {
41-
transform: $transforms;
41+
transform: $transforms;
4242
}
4343
/*
4444
* Rotate
@@ -51,7 +51,7 @@
5151
* Scale
5252
*/
5353
@mixin scale($scale) {
54-
@include transform(scale($scale));
54+
@include transform(scale($scale));
5555
}
5656

5757
/*
@@ -65,14 +65,14 @@
6565
* translateX
6666
*/
6767
@mixin translateX ($x) {
68-
@include transform(translateX($x));
68+
@include transform(translateX($x));
6969
}
7070

7171
/*
7272
* translateY
7373
*/
7474
@mixin translateY ($y) {
75-
@include transform(translateY($y));
75+
@include transform(translateY($y));
7676
}
7777

7878
/*

sass/base/utility_spacers.scss

Lines changed: 39 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
/* Padding */
1+
/*
2+
Padding
3+
*/
24

35
.p { padding: $padding-default; }
46
.pt { padding-top: $padding-default; }
@@ -24,7 +26,9 @@
2426
.pl-0 { padding-left: 0; }
2527
.pr-0 { padding-right: 0; }
2628

27-
/* Margin */
29+
/*
30+
Margin
31+
*/
2832
.m { margin: $margin-default; }
2933
.mt { margin-top: $margin-default; }
3034
.mb { margin-bottom: $margin-default; }
@@ -51,7 +55,9 @@
5155

5256
@media only screen and (min-width: $b1) {
5357

54-
/* Padding */
58+
/*
59+
Padding
60+
*/
5561
.p-b1 { padding: $padding-default; }
5662
.pt-b1 { padding-top: $padding-default; }
5763
.pb-b1 { padding-bottom: $padding-default; }
@@ -76,7 +82,9 @@
7682
.pl-b1-0 { padding-left: 0; }
7783
.pr-b1-0 { padding-right: 0; }
7884

79-
/* Margin */
85+
/*
86+
Margin
87+
*/
8088
.m-b1 { margin: $margin-default; }
8189
.mt-b1 { margin-top: $margin-default; }
8290
.mb-b1 { margin-bottom: $margin-default; }
@@ -104,7 +112,9 @@
104112

105113
@media only screen and (min-width: $b2) {
106114

107-
/* Padding */
115+
/*
116+
Padding
117+
*/
108118
.p-b2 { padding: $padding-default; }
109119
.pt-b2 { padding-top: $padding-default; }
110120
.pb-b2 { padding-bottom: $padding-default; }
@@ -129,7 +139,9 @@
129139
.pl-b2-0 { padding-left: 0; }
130140
.pr-b2-0 { padding-right: 0; }
131141

132-
/* Margin */
142+
/*
143+
Margin
144+
*/
133145
.m-b2 { margin: $margin-default; }
134146
.mt-b2 { margin-top: $margin-default; }
135147
.mb-b2 { margin-bottom: $margin-default; }
@@ -157,7 +169,9 @@
157169

158170
@media only screen and (min-width: $b3) {
159171

160-
/* Padding */
172+
/*
173+
Padding
174+
*/
161175
.p-b3 { padding: $padding-default; }
162176
.pt-b3 { padding-top: $padding-default; }
163177
.pb-b3 { padding-bottom: $padding-default; }
@@ -182,7 +196,9 @@
182196
.pl-b3-0 { padding-left: 0; }
183197
.pr-b3-0 { padding-right: 0; }
184198

185-
/* Margin */
199+
/*
200+
Margin
201+
*/
186202
.m-b3 { margin: $margin-default; }
187203

188204
.mt-b3 { margin-top: $margin-default; }
@@ -209,7 +225,9 @@
209225

210226
@media only screen and (min-width: $b4) {
211227

212-
/* Padding */
228+
/*
229+
Padding
230+
*/
213231
.p-b4 { padding: $padding-default; }
214232

215233
.pt-b4 { padding-top: $padding-default; }
@@ -235,7 +253,9 @@
235253
.pl-b4-0 { padding-left: 0; }
236254
.pr-b4-0 { padding-right: 0; }
237255

238-
/* Margin */
256+
/*
257+
Margin
258+
*/
239259
.m-b4 { margin: $margin-default; }
240260

241261
.mt-b4 { margin-top: $margin-default; }
@@ -265,7 +285,9 @@
265285

266286
@media only screen and (min-width: $b5) {
267287

268-
/* Padding */
288+
/*
289+
Padding
290+
*/
269291
.p-b5 { padding: $padding-default; }
270292
.pt-b5 { padding-top: $padding-default; }
271293
.pb-b5 { padding-bottom: $padding-default; }
@@ -290,7 +312,9 @@
290312
.pl-b5-0 { padding-left: 0; }
291313
.pr-b5-0 { padding-right: 0; }
292314

293-
/* Margin */
315+
/*
316+
Margin
317+
*/
294318
.m-b5 { margin: $margin-default; }
295319

296320
.mt-b5 { margin-top: $margin-default; }
@@ -319,7 +343,9 @@
319343

320344
@media only screen and (min-width: $b6) {
321345

322-
/* Padding */
346+
/*
347+
Padding
348+
*/
323349
.p-b6 { padding: $padding-default; }
324350
.pt-b6 { padding-top: $padding-default; }
325351
.pb-b6 { padding-bottom: $padding-default; }
@@ -344,30 +370,4 @@
344370
.pl-b6-0 { padding-left: 0; }
345371
.pr-b6-0 { padding-right: 0; }
346372

347-
/* Margin */
348-
.m-b6 { margin: $margin-default; }
349-
350-
.mt-b6 { margin-top: $margin-default; }
351-
.mb-b6 { margin-bottom: $margin-default; }
352-
.ml-b6 { margin-left: $margin-default; }
353-
.mr-b6 { margin-right: $margin-default; }
354-
355-
.m-b6-2x { margin: $margin-default*2; }
356-
.mt-b6-2x { margin-top: $margin-default*2; }
357-
.mb-b6-2x { margin-bottom: $margin-default*2; }
358-
.ml-b6-2x { margin-left: $margin-default*2; }
359-
.mr-b6-2x { margin-right: $margin-default*2; }
360-
361-
.m-b6-3x { margin: $margin-default*3; }
362-
.mt-b6-3x { margin-top: $margin-default*3; }
363-
.mb-b6-3x { margin-bottom: $margin-default*3; }
364-
.ml-b6-3x { margin-left: $margin-default*3; }
365-
.mr-b6-3x { margin-right: $margin-default*3; }
366-
367-
.m-b6-0 { margin: 0; }
368-
.mt-b6-0 { margin-top: 0; }
369-
.mb-b6-0 { margin-bottom: 0; }
370-
.ml-b6-0 { margin-left: 0; }
371-
.mr-b6-0 { margin-right: 0; }
372-
373373
}

sass/base/variables.scss

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
/* Variables
2-
Add or replace variables in your OWN variables file
2+
* Add or replace variables in your OWN variables file
33
*/
44

55
/*
6-
Base colors
7-
Color 01 and 02 reservered for white and black
6+
* Base colors
7+
* Color 01 and 02 reservered for white and black
88
*/
99
$color01: #fff;
1010
$color02: #000;

0 commit comments

Comments
 (0)