Skip to content

Commit 0d34412

Browse files
committed
#9, #19 - udpated file structure and added comments to site-styles.scss
1 parent ac136b9 commit 0d34412

19 files changed

Lines changed: 136 additions & 86 deletions

File tree

starter-template/gulp/gulp.config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ module.exports = function () {
99
cssFolder: 'content/styles/'
1010
},
1111
svg: {
12-
sourceFolder: 'scss/sprites/svg/',
12+
sourceFolder: 'scss/assets/icons/',
1313
spriteFolder: 'content/styles/images/',
1414
scssMapFolder: 'scss/core/',
1515
pngFallback: false
Lines changed: 15 additions & 15 deletions
Loading

starter-template/scss/core/_functions.scss

Lines changed: 0 additions & 1 deletion
This file was deleted.

starter-template/scss/core/_mixins.scss

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,67 @@
1515
vertical-align: $align;
1616
}
1717

18+
// Mixin for removing white spaces of inline-block
19+
@mixin remove-whitespace($apply-to: none, $setsize: $base-font-size) {
20+
@if ($apply-to == none) {
21+
font-size: 0;
22+
} @else if ($apply-to == all) {
23+
font-size: 0;
1824

25+
> * {
26+
font-size: $setsize;
27+
}
28+
} @else {
29+
font-size: 0;
30+
31+
#{$apply-to} {
32+
font-size: $setsize;
33+
}
34+
}
35+
}
36+
37+
@mixin clearfix($extend: true) {
38+
@if $extend {
39+
@extend %clearfix;
40+
} @else {
41+
&:after {
42+
clear: both;
43+
content: '';
44+
display: table;
45+
height: 0;
46+
}
47+
}
48+
}
49+
50+
%clearfix {
51+
@include clearfix($extend: false);
52+
}
53+
54+
%hidden {
55+
display: none;
56+
visibility: hidden;
57+
}
58+
59+
%visuallyhidden {
60+
border: 0;
61+
clip: rect(0 0 0 0);
62+
height: 1px;
63+
margin: -1px;
64+
overflow: hidden;
65+
padding: 0;
66+
position: absolute;
67+
width: 1px;
68+
69+
// Extends the .visuallyhidden class to allow the element to be focusable
70+
// when navigated to via the keyboard: h5bp.com/p
71+
72+
&.focusable:active,
73+
&.focusable:focus {
74+
clip: auto;
75+
height: auto;
76+
margin: 0;
77+
overflow: visible;
78+
position: static;
79+
width: auto;
80+
}
81+
}
File renamed without changes.
Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,5 @@
1-
// Global Variables
2-
$disable-warnings: true;
3-
$border-box-sizing: false !default;
4-
51
//module TYPOGRAPHY
62
$base-line-height: 1.5;
73
$base-font-size: 16px;
84

9-
//For naming colors variables, we recommend use http://chir.ag/projects/name-that-color/
10-
11-
//module MAIN COLOR PALETTE
12-
13-
//module COMMON COLORS
14-
15-
//module LINK COLORS
16-
17-
//module SELECTION COLORS
5+
//widths, heights, sizes, timings, settings
File renamed without changes.

starter-template/scss/modules/_slider.scss

Lines changed: 0 additions & 7 deletions
This file was deleted.

starter-template/scss/modules/plugins/_slick.scss renamed to starter-template/scss/plugins/_slick.scss

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -24,21 +24,21 @@ $opacity-not-active: .25;
2424

2525

2626
@function slick-image-url($url) {
27-
@if function-exists(image-url) {
28-
@return image-url($url, false, false);
29-
}
30-
@else {
31-
@return url($slick-loader-path + $url);
32-
}
27+
@if function-exists(image-url) {
28+
@return image-url($url, false, false);
29+
}
30+
@else {
31+
@return url($slick-loader-path + $url);
32+
}
3333
}
3434

3535
@function slick-font-url($url) {
36-
@if function-exists(font-url) {
37-
@return font-url($url);
38-
}
39-
@else {
40-
@return url($slick-font-path + $url);
41-
}
36+
@if function-exists(font-url) {
37+
@return font-url($url);
38+
}
39+
@else {
40+
@return url($slick-font-path + $url);
41+
}
4242
}
4343

4444
/* Slider */
@@ -145,16 +145,16 @@ $opacity-not-active: .25;
145145

146146
/* Icons */
147147
@if $slick-font-family == "slick" {
148-
@font-face {
149-
font-family:"slick";
150-
src: slick-font-url("slick.eot");
151-
src: slick-font-url("slick.eot?#iefix") format("embedded-opentype"),
152-
slick-font-url("slick.woff") format("woff"),
153-
slick-font-url("slick.ttf") format("truetype"),
154-
slick-font-url("slick.svg#slick") format("svg");
155-
font-weight: normal;
156-
font-style: normal;
157-
}
148+
@font-face {
149+
font-family:"slick";
150+
src: slick-font-url("slick.eot");
151+
src: slick-font-url("slick.eot?#iefix") format("embedded-opentype"),
152+
slick-font-url("slick.woff") format("woff"),
153+
slick-font-url("slick.ttf") format("truetype"),
154+
slick-font-url("slick.svg#slick") format("svg");
155+
font-weight: normal;
156+
font-style: normal;
157+
}
158158
}
159159

160160
/* Arrows */
@@ -176,12 +176,12 @@ $opacity-not-active: .25;
176176
border: none;
177177
outline: none;
178178
&:hover, &:focus {
179-
outline: none;
180-
background: transparent;
181-
color: transparent;
182-
&:before {
183-
opacity: $opacity-on-hover;
184-
}
179+
outline: none;
180+
background: transparent;
181+
color: transparent;
182+
&:before {
183+
opacity: $opacity-on-hover;
184+
}
185185
}
186186
&.slick-disabled:before {
187187
opacity: $opacity-not-active;
@@ -261,7 +261,7 @@ $opacity-not-active: .25;
261261
&:hover, &:focus {
262262
outline: none;
263263
&:before {
264-
opacity: $opacity-on-hover;
264+
opacity: $opacity-on-hover;
265265
}
266266
}
267267

0 commit comments

Comments
 (0)