Skip to content

Commit d097ce4

Browse files
NAIARA ABAROANAIARA ABAROA
NAIARA ABAROA
authored and
NAIARA ABAROA
committed
Changes
1 parent a3ef017 commit d097ce4

File tree

1 file changed

+67
-12
lines changed

1 file changed

+67
-12
lines changed

vendor.scss

+67-12
Original file line numberDiff line numberDiff line change
@@ -53,15 +53,59 @@
5353

5454
/* ====================== FLEXBOX ====================== */
5555
@mixin display-box {
56-
@include vendorValueNoMS("display", box);
56+
display: -webkit-box;
57+
display: -moz-box;
5758
display: -ms-flexbox;
59+
display: -webkit-flex;
60+
display: flex;
5861
}
5962

60-
@mixin box-pack($arguments) {
61-
@include vendorNoMS("box-pack", $arguments);
62-
-ms-flex-pack: $arguments;
63+
@mixin flex-wrap($arguments) {
64+
-webkit-flex-wrap: $arguments;
65+
-ms-flex-wrap: $arguments;
66+
flex-wrap: $arguments;
6367
}
6468

69+
@mixin justify-content($arguments){
70+
@if $arguments is flex-start{
71+
-webkit-box-pack: start;
72+
-moz-box-pack: start;
73+
-webkit-justify-content: flex-start;
74+
-ms-flex-pack: start;
75+
justify-content: flex-start;
76+
}
77+
@if $arguments is flex-end{
78+
-webkit-box-pack: end;
79+
-moz-box-pack: end;
80+
-webkit-justify-content: flex-end;
81+
-ms-flex-pack: end;
82+
justify-content: flex-end;
83+
}
84+
@if $arguments is center{
85+
-webkit-box-pack: center;
86+
-moz-box-pack: center;
87+
-webkit-justify-content: center;
88+
-ms-flex-pack: center;
89+
justify-content: center;
90+
}
91+
@if $arguments is space-between{
92+
-webkit-box-pack: justify;
93+
-moz-box-pack: justify;
94+
-webkit-justify-content: space-between;
95+
-ms-flex-pack: justify;
96+
justify-content: space-between;
97+
}
98+
@if $arguments is space-around{
99+
-webkit-box-pack: justify;
100+
-moz-box-pack: justify;
101+
-webkit-justify-content: space-around;
102+
-ms-flex-pack: distribute;
103+
justify-content: space-around;
104+
}
105+
106+
}
107+
108+
65109
@mixin box-align($arguments) {
66110
@include vendor("box-align", $arguments);
67111
-ms-flex-align: $arguments;
@@ -81,21 +125,32 @@
81125
-ms-flex: 0 $arguments auto;
82126
}
83127
}
84-
85-
@mixin box-orient($arguments) {
86-
@include vendorNoMS("box-orient", $arguments);
128+
/*direction of the flex container's main axis*/
129+
@mixin flex-direction($arguments) {
87130
@if $arguments is horizontal {
131+
-webkit-box-direction: normal;
132+
-moz-box-direction: normal;
133+
-webkit-box-orient: horizontal;
134+
-moz-box-orient: horizontal;
135+
-webkit-flex-direction: row;
88136
-ms-flex-direction: row;
137+
flex-direction: row;
89138
}
90139
@else if $arguments is vertical {
140+
-webkit-box-direction: normal;
141+
-moz-box-direction: normal;
142+
-webkit-box-orient: vertical;
143+
-moz-box-orient: vertical;
144+
-webkit-flex-direction: column;
91145
-ms-flex-direction: column;
146+
flex-direction: column;
92147
}
93148
}
94149

95-
@mixin box-direction($arguments) {
96-
@include vendorNoMS("box-direction", $arguments);
97-
-ms-flex-direction: $arguments;
98-
}
150+
// @mixin box-direction($arguments) {
151+
// @include vendorNoMS("box-direction", $arguments);
152+
// -ms-flex-direction: $arguments;
153+
// }
99154

100155
@mixin ordinal-group($arguments) {
101156
@include vendorNoMS("box-ordinal-group", $arguments);
@@ -145,7 +200,7 @@
145200
}
146201

147202
@mixin transition-delay($arguments) {
148-
@include vendor("transition-delay", $arguments);
203+
@include vendor("transition-delay", $arguments);
149204
}
150205

151206
@mixin transition-property($arguments) {

0 commit comments

Comments
 (0)