Skip to content

Commit 49d5d5b

Browse files
committed
styles: Inline obsolete flexbox mixins
These CSS property are supported by all of our target browsers by now see https://caniuse.com/#feat=flexbox
1 parent 6e8c953 commit 49d5d5b

File tree

5 files changed

+161
-202
lines changed

5 files changed

+161
-202
lines changed

app/styles/_helpers.scss

Lines changed: 0 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -23,44 +23,3 @@
2323
-ms-transform: translateY(-50%);
2424
transform: translateY(-50%);
2525
}
26-
27-
@mixin display-flex {
28-
display: -ms-flexbox; /* TWEENER - IE 10 */
29-
display: -webkit-flex; /* NEW - Chrome */
30-
display: flex; /* NEW, Spec - Opera 12.1, Firefox 20+ */
31-
}
32-
33-
@mixin flex-direction($which) {
34-
-webkit-flex-direction: $which;
35-
flex-direction: $which;
36-
}
37-
38-
@mixin justify-content($how) {
39-
-webkit-justify-content: $how;
40-
justify-content: $how;
41-
}
42-
43-
@mixin flex-grow($amt) {
44-
-webkit-flex-grow: $amt;
45-
flex-grow: $amt;
46-
}
47-
48-
@mixin align-items($how) {
49-
-webkit-align-items: $how;
50-
align-items: $how;
51-
}
52-
53-
@mixin align-self($how) {
54-
-webkit-align-self: $how;
55-
align-self: $how;
56-
}
57-
58-
@mixin flex-wrap($how) {
59-
-webkit-flex-wrap: $how;
60-
flex-wrap: $how;
61-
}
62-
63-
@mixin flex($stuff) {
64-
-webkit-flex: $stuff;
65-
flex: $stuff;
66-
}

app/styles/app.scss

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ html, body { margin: 0; }
2727
body {
2828
font-family: "Helvetica Neue","Helvetica",Helvetica,Arial,sans-serif;
2929
font-size: 16px;
30-
@include display-flex;
31-
@include flex-direction(column);
32-
@include align-items(center);
30+
display: flex;
31+
flex-direction: column;
32+
align-items: center;
3333
}
3434

3535
/* .ember-application is added by Ember after initial rendering */
@@ -42,8 +42,8 @@ body > div {
4242
}
4343

4444
#main {
45-
@include display-flex;
46-
@include flex-direction(column);
45+
display: flex;
46+
flex-direction: column;
4747

4848
margin-bottom: 10px;
4949
background-color: $main-bg;
@@ -58,9 +58,9 @@ body > div {
5858
color: white;
5959
position: relative;
6060
height: 100px;
61-
@include display-flex;
62-
@include align-items(center);
63-
@include justify-content(space-between);
61+
display: flex;
62+
align-items: center;
63+
justify-content: space-between;
6464

6565
a {
6666
color: white; text-decoration: none;
@@ -74,7 +74,7 @@ body > div {
7474
}
7575

7676
.menu {
77-
@include flex-grow(2);
77+
flex-grow: 2;
7878
display: none;
7979
}
8080
.menu ul.dropdown {
@@ -108,8 +108,8 @@ body > div {
108108
min-width: 150px;
109109
}
110110
form.search {
111-
@include display-flex;
112-
@include flex-grow(1);
111+
display: flex;
112+
flex-grow: 1;
113113
}
114114
@media only screen and (max-width: 820px) {
115115
form.search { display: none; }
@@ -235,8 +235,8 @@ a {
235235
@media only screen and (max-width: 450px) {
236236
margin: 20px;
237237
.sep { display: none; }
238-
@include display-flex;
239-
@include flex-direction(column);
238+
display: flex;
239+
flex-direction: column;
240240

241241
a {
242242
width: 50%;

0 commit comments

Comments
 (0)