Skip to content

Commit e7f57d9

Browse files
committed
added more containers and removed the ugly shadow
1 parent 4e813f6 commit e7f57d9

File tree

14 files changed

+112
-89
lines changed

14 files changed

+112
-89
lines changed

sass/buttons.scss

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
height: 45px;
66
color: #fff;
77
cursor: pointer;
8+
text-transform: uppercase;
9+
font-weight: bold;
810
}
911

1012
.btn-primary {

sass/forms.scss

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,10 @@ textarea {
7676
content: '';
7777
}
7878

79+
.caret-icon:before {
80+
content: '';
81+
}
82+
7983
label {
8084
cursor: pointer;
8185

sass/gradient.scss

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -3,33 +3,12 @@
33

44
.gradient-green {
55
@include linear-gradient($green, $blue);
6-
box-shadow: 0px 4px 7px 0px rgba(18, 194, 211, 0.48);
7-
transition: all .2s;
8-
9-
&:hover {
10-
box-shadow: 0px 7px 20px 0px rgba(18, 194, 211, 0.5);
11-
transition: all .2s;
12-
}
136
}
147

158
.gradient-orange {
169
@include linear-gradient($yellow, $orange);
17-
box-shadow: 0px 4px 7px 0px rgba(255, 50, 39, 0.48);
18-
transition: all .2s;
19-
20-
&:hover {
21-
box-shadow: 0px 7px 20px 0px rgba(255, 50, 39, 0.5);
22-
transition: all .2s;
23-
}
2410
}
2511

2612
.gradient-purple {
2713
@include linear-gradient($dark-blue, $purple);
28-
box-shadow: 0px 4px 7px 0px rgba(170, 49, 255, 0.48);
29-
transition: all .2s;
30-
31-
&:hover {
32-
box-shadow: 0px 7px 13px 0px rgba(170, 49, 255, 0.5);
33-
transition: all .2s;
34-
}
3514
}

sass/grid.scss

Lines changed: 24 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,29 @@
11
@import "variables";
22

3-
.container-full {
3+
.full-container {
44
margin: 0 auto;
55
width: 100%;
66
}
77

8+
.flex-container {
9+
display: flex;
10+
align-items: center;
11+
justify-content: space-between;
12+
}
13+
14+
.small-container {
15+
margin: 0 auto;
16+
max-width: 960px;
17+
width: 90%;
18+
19+
@media #{$medium-and-up} {
20+
width: 90%;
21+
}
22+
@media #{$large-and-up} {
23+
width: 100%;
24+
}
25+
}
26+
827
.container {
928
margin: 0 auto;
1029
max-width: 1280px;
@@ -16,11 +35,11 @@
1635
@media #{$large-and-up} {
1736
width: 70%;
1837
}
38+
}
1939

20-
.row {
21-
margin-left: (-1 * $gutter-width / 2);
22-
margin-right: (-1 * $gutter-width / 2);
23-
}
40+
.row {
41+
margin-left: (-1 * $gutter-width / 2);
42+
margin-right: (-1 * $gutter-width / 2);
2443
}
2544

2645
@mixin reset-offset {

sass/main.scss

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,10 @@
77
@import "cards";
88
@import "buttons";
99
@import "media";
10+
@import url('https://fonts.googleapis.com/css?family=Roboto:300,300i,400,400i,500,500i,700,700i');
1011

1112
body {
13+
font-family: 'Roboto', sans-serif;
1214
padding: 0;
1315
margin: 0;
14-
}
16+
}

sass/mixins.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
// Direction has been omitted and happens to be a color-stop
3737
@if is-direction($direction) == false {
3838
$color-stops: $direction, $color-stops;
39-
$direction: 180deg;
39+
$direction: 80deg;
4040
}
4141

4242
background: nth(nth($color-stops, 1), 1);

source/app/index.html

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<!-- endbuild -->
1616

1717
<!-- build:css styles/main.css -->
18-
<link rel="stylesheet" href="styles/main.css">
18+
<link rel="stylesheet" href="/styles/main.css">
1919
<!-- endbuild -->
2020

2121
<!-- build:js scripts/vendor/modernizr.js -->
@@ -187,7 +187,6 @@ <h3 class="title">Checkboxes & radio buttons</h3>
187187
<input type="checkbox" class="black-checkbox"/>
188188
<span></span>
189189
</label>
190-
191190
<label>
192191
<input type="radio" name="yow" class="black-checkbox"/>
193192
<span></span>
@@ -203,7 +202,6 @@ <h3 class="title">Checkboxes & radio buttons</h3>
203202
<input type="checkbox" class="green-checkbox"/>
204203
<span></span>
205204
</label>
206-
207205
<label>
208206
<input type="radio" name="yow" class="green-checkbox"/>
209207
<span></span>
@@ -219,7 +217,6 @@ <h3 class="title">Checkboxes & radio buttons</h3>
219217
<input type="checkbox" class="orange-checkbox"/>
220218
<span></span>
221219
</label>
222-
223220
<label>
224221
<input type="radio" name="meow" class="orange-checkbox"/>
225222
<span></span>
@@ -235,7 +232,6 @@ <h3 class="title">Checkboxes & radio buttons</h3>
235232
<input type="checkbox" class="purple-checkbox"/>
236233
<span></span>
237234
</label>
238-
239235
<label>
240236
<input type="radio" name="haw" class="purple-checkbox"/>
241237
<span></span>

source/app/styles/buttons.scss

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
height: 45px;
66
color: #fff;
77
cursor: pointer;
8+
text-transform: uppercase;
9+
font-weight: bold;
810
}
911

1012
.btn-primary {

source/app/styles/forms.scss

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,10 @@ textarea {
7676
content: '';
7777
}
7878

79+
.caret-icon:before {
80+
content: '';
81+
}
82+
7983
label {
8084
cursor: pointer;
8185

source/app/styles/gradient.scss

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -3,33 +3,12 @@
33

44
.gradient-green {
55
@include linear-gradient($green, $blue);
6-
box-shadow: 0px 4px 7px 0px rgba(18, 194, 211, 0.48);
7-
transition: all .2s;
8-
9-
&:hover {
10-
box-shadow: 0px 7px 20px 0px rgba(18, 194, 211, 0.5);
11-
transition: all .2s;
12-
}
136
}
147

158
.gradient-orange {
169
@include linear-gradient($yellow, $orange);
17-
box-shadow: 0px 4px 7px 0px rgba(255, 50, 39, 0.48);
18-
transition: all .2s;
19-
20-
&:hover {
21-
box-shadow: 0px 7px 20px 0px rgba(255, 50, 39, 0.5);
22-
transition: all .2s;
23-
}
2410
}
2511

2612
.gradient-purple {
2713
@include linear-gradient($dark-blue, $purple);
28-
box-shadow: 0px 4px 7px 0px rgba(170, 49, 255, 0.48);
29-
transition: all .2s;
30-
31-
&:hover {
32-
box-shadow: 0px 7px 13px 0px rgba(170, 49, 255, 0.5);
33-
transition: all .2s;
34-
}
3514
}

source/app/styles/grid.scss

Lines changed: 24 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,29 @@
11
@import "variables";
22

3-
.container-full {
3+
.full-container {
44
margin: 0 auto;
55
width: 100%;
66
}
77

8+
.flex-container {
9+
display: flex;
10+
align-items: center;
11+
justify-content: space-between;
12+
}
13+
14+
.small-container {
15+
margin: 0 auto;
16+
max-width: 960px;
17+
width: 90%;
18+
19+
@media #{$medium-and-up} {
20+
width: 90%;
21+
}
22+
@media #{$large-and-up} {
23+
width: 100%;
24+
}
25+
}
26+
827
.container {
928
margin: 0 auto;
1029
max-width: 1280px;
@@ -16,11 +35,11 @@
1635
@media #{$large-and-up} {
1736
width: 70%;
1837
}
38+
}
1939

20-
.row {
21-
margin-left: (-1 * $gutter-width / 2);
22-
margin-right: (-1 * $gutter-width / 2);
23-
}
40+
.row {
41+
margin-left: (-1 * $gutter-width / 2);
42+
margin-right: (-1 * $gutter-width / 2);
2443
}
2544

2645
@mixin reset-offset {

source/app/styles/mixins.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
// Direction has been omitted and happens to be a color-stop
3737
@if is-direction($direction) == false {
3838
$color-stops: $direction, $color-stops;
39-
$direction: 180deg;
39+
$direction: 80deg;
4040
}
4141

4242
background: nth(nth($color-stops, 1), 1);

0 commit comments

Comments
 (0)