Skip to content

Commit b476ef3

Browse files
committed
Auto merge of #2102 - Turbo87:mixins, r=locks
styles: Remove obsolete SASS mixins Most of these SASS mixins are no longer needed because all of our target browsers support these CSS properties by default now. For all others we should eventually use https://github.com/postcss/autoprefixer instead. r? @locks
2 parents 5d3bf43 + 8ace286 commit b476ef3

File tree

5 files changed

+185
-244
lines changed

5 files changed

+185
-244
lines changed

app/styles/_helpers.scss

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

app/styles/app.scss

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
@import "normalize";
2-
@import "helpers";
32

43
$html-bg: #3b6837;
54
$main-color: #383838;
@@ -27,9 +26,9 @@ html, body { margin: 0; }
2726
body {
2827
font-family: "Helvetica Neue","Helvetica",Helvetica,Arial,sans-serif;
2928
font-size: 16px;
30-
@include display-flex;
31-
@include flex-direction(column);
32-
@include align-items(center);
29+
display: flex;
30+
flex-direction: column;
31+
align-items: center;
3332
}
3433

3534
/* .ember-application is added by Ember after initial rendering */
@@ -42,13 +41,13 @@ body > div {
4241
}
4342

4443
#main {
45-
@include display-flex;
46-
@include flex-direction(column);
44+
display: flex;
45+
flex-direction: column;
4746

4847
margin-bottom: 10px;
4948
background-color: $main-bg;
5049
padding: 15px;
51-
@include border-radius(10px);
50+
border-radius: 10px;
5251
box-shadow: 0px 0px 5px 2px #3b6837;
5352
border: 5px solid #62865f;
5453
color: $main-color;
@@ -58,9 +57,9 @@ body > div {
5857
color: white;
5958
position: relative;
6059
height: 100px;
61-
@include display-flex;
62-
@include align-items(center);
63-
@include justify-content(space-between);
60+
display: flex;
61+
align-items: center;
62+
justify-content: space-between;
6463

6564
a {
6665
color: white; text-decoration: none;
@@ -74,7 +73,7 @@ body > div {
7473
}
7574

7675
.menu {
77-
@include flex-grow(2);
76+
flex-grow: 2;
7877
display: none;
7978
}
8079
.menu ul.dropdown {
@@ -108,8 +107,8 @@ body > div {
108107
min-width: 150px;
109108
}
110109
form.search {
111-
@include display-flex;
112-
@include flex-grow(1);
110+
display: flex;
111+
flex-grow: 1;
113112
}
114113
@media only screen and (max-width: 820px) {
115114
form.search { display: none; }
@@ -131,7 +130,7 @@ body > div {
131130
background-repeat: no-repeat;
132131
background-position: 6px 6px;
133132
background-size: 14px 15px;
134-
@include border-radius(15px);
133+
border-radius: 15px;
135134
}
136135

137136
form.search label {
@@ -206,7 +205,7 @@ span.loading {
206205
text-align: center;
207206
margin: 0 0 10px 0;
208207
padding: 10px;
209-
@include border-radius(5px);
208+
border-radius: 5px;
210209

211210
&.shown {
212211
display: block;
@@ -235,8 +234,8 @@ a {
235234
@media only screen and (max-width: 450px) {
236235
margin: 20px;
237236
.sep { display: none; }
238-
@include display-flex;
239-
@include flex-direction(column);
237+
display: flex;
238+
flex-direction: column;
240239

241240
a {
242241
width: 50%;
@@ -287,7 +286,7 @@ ul.dropdown {
287286
list-style: none;
288287
z-index: 10;
289288
overflow: hidden;
290-
@include border-radius(5px);
289+
border-radius: 5px;
291290

292291
li a {
293292
font-size: 90%;

0 commit comments

Comments
 (0)