Skip to content

Commit 2021ad8

Browse files
committed
fix: Remove old files
1 parent c85102b commit 2021ad8

File tree

4 files changed

+70
-317
lines changed

4 files changed

+70
-317
lines changed

dist/flexit.min.css

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/flexit.min.css.map

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

scss/grid.scss

+68-117
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
/* --------------------------------------------------------
22
Flex Grid System
33
4-
version: 0.03
4+
version: 0.06
55
author: Karan Sharma
6+
email: karan.sharma@zerodha.com
67
----------------------------------------------------------*/
78

89
$gutter: 10px;
@@ -12,134 +13,123 @@ $breakpoint-desktop: 780px;
1213

1314
/* Grid
1415
----------------------------------------------------------*/
16+
1517
.container {
1618
position: relative;
1719
width: 100%;
1820
max-width: 960px;
1921
margin: 0 auto;
20-
padding: 0 $gutter;
22+
padding: $gutter * 2;
2123
box-sizing: border-box;
2224
}
2325

2426
.row {
2527
box-sizing: border-box;
26-
display:flex;
28+
display: flex;
2729
flex: 0 1 auto;
2830
flex-flow: row wrap;
29-
// margin: 0 $gutter;
31+
margin: 0 $gutter;
32+
&.nogutter {
33+
margin-left: 0;
34+
margin-right: 0;
35+
& > .columns {
36+
padding-left: 0;
37+
padding-right: 0;
38+
}
39+
}
3040
}
3141

3242
// Columns
3343

34-
.columns, .column {
44+
.columns {
3545
box-sizing: border-box;
36-
flex-grow: 1;
37-
flex-shrink: 1;
38-
flex-basis: 1;
39-
margin: $gutter 0 $gutter 4%;
40-
}
41-
42-
.column:first-child,
43-
.columns:first-child {
44-
margin-left: 0;
46+
flex: 0 1 auto;
47+
padding: 0 $gutter;
4548
}
46-
47-
.one {
48-
max-width: 4.66666666667%;
49+
.one{
50+
flex-basis: 8.33333333%;
4951
}
50-
5152
.two {
52-
max-width: 13.3333333333%;
53+
flex-basis: 16.66666667%;
5354
}
54-
5555
.three {
56-
max-width: 22%;
56+
flex-basis: 25%;
5757
}
58-
5958
.four {
60-
max-width: 30.6666666667%;
59+
flex-basis: 33.3333333333%;
6160
}
62-
6361
.five {
64-
max-width: 39.3333333333%;
62+
flex-basis: 41.66666667%;
6563
}
66-
6764
.six {
68-
max-width: 48%;
65+
flex-basis: 50%;
6966
}
70-
7167
.seven {
72-
max-width: 56.6666666667%;
68+
flex-basis: 58.33333333%;
7369
}
74-
7570
.eight {
76-
max-width: 65.3333333333%;
71+
flex-basis: 66.66666667%;
7772
}
78-
7973
.nine {
80-
max-width: 74.0%;;
74+
flex-basis: 75%;
8175
}
82-
8376
.ten {
84-
max-width: 82.6666666667%;
77+
flex-basis: 83.33333333%;
8578
}
86-
8779
.eleven {
88-
max-width: 91.3333333333%;
80+
flex-basis: 91.66666667%;
8981
}
90-
9182
.twelve {
92-
max-width: 100%;
93-
margin-left: 0;
83+
flex-basis: 100%;
9484
}
9585

9686
// Offsets
9787

98-
.column-offset-0 {
88+
.col-offset-0 {
9989
margin-left: 0;
10090
}
10191

102-
.column-offset-1 {
92+
.col-offset-1 {
10393
margin-left: 8.33333333%;
10494
}
10595

106-
.column-offset-2 {
96+
.col-offset-2 {
10797
margin-left: 16.66666667%;
10898
}
10999

110-
.column-offset-3 {
100+
.col-offset-3 {
111101
margin-left: 25%;
112102
}
113103

114-
.column-offset-4 {
104+
.col-offset-4 {
115105
margin-left: 33.33333333%;
116106
}
117107

118-
.column-offset-5 {
108+
.col-offset-5 {
119109
margin-left: 41.66666667%;
120110
}
121111

122-
.column-offset-6 {
112+
.col-offset-6 {
123113
margin-left: 50%;
124114
}
125115

126-
.column-offset-7 {
116+
.col-offset-7 {
127117
margin-left: 58.33333333%;
128118
}
129119

130-
.column-offset-8 {
120+
.col-offset-8 {
131121
margin-left: 66.66666667%;
132122
}
133123

134-
.column-offset-9 {
124+
.col-offset-9 {
135125
margin-left: 75%;
136126
}
137127

138-
.column-offset-10 {
128+
.col-offset-10 {
139129
margin-left: 83.33333333%;
140130
}
141131

142-
.column-offset-11 {
132+
.col-offset-11 {
143133
margin-left: 91.66666667%;
144134
}
145135

@@ -151,99 +141,60 @@ $breakpoint-desktop: 780px;
151141
justify-content: space-between;
152142
}
153143

154-
.evenly {
155-
justify-content: space-evenly;
156-
}
157-
158-
.around {
159-
justify-content: space-around;
160-
}
161-
162-
.center {
163-
justify-content: center;
164-
text-align: center;
165-
}
166-
167-
.start {
168-
justify-content: flex-start;
169-
}
170-
171144
.end {
172145
justify-content: flex-end;
173146
}
174147

175-
.top {
176-
align-items: flex-start;
177-
}
178-
179-
.bottom {
180-
align-items: flex-end;
181-
}
182-
183-
.middle {
184-
align-items: center;
185-
}
186-
187-
.first {
188-
order: -1;
189-
}
190-
191-
.last {
192-
order: 1;
193-
}
194-
195-
.vertical {
196-
flex-flow: column wrap;
148+
.around {
149+
justify-content: space-around;
197150
}
198151

199152
.row-align-center {
200153
align-items: center;
201154
}
202155

203156
.space-right {
204-
margin-right: $gutter;
157+
margin-right: $gutter;
205158
}
206159

207160
.space-left {
208-
margin-left: $gutter;
161+
margin-left: $gutter;
209162
}
210163

211164
.space-bottom {
212-
margin-bottom: $gutter;
165+
margin-bottom: $gutter;
213166
}
214167

215168
.space-top {
216-
margin-top: $gutter;
169+
margin-top: $gutter;
217170
}
218171

219-
220-
221172
/*
222173
##Device = Low Resolution Tablets, Mobiles (Landscape)
223174
##Screen = B/w $breakpoint-tablet to $breakpoint-desktop
224175
*/
225176

226-
@media screen and (max-width: 768px) {
227-
.container {
228-
overflow: auto;
177+
@media (min-width: $breakpoint-mobile) and (max-width: $breakpoint-desktop) {
178+
.columns {
179+
flex: 1 1 auto;
229180
}
230-
.columns, .column {
231-
min-width: 100%;
232-
margin: $gutter 0;
233-
}
234-
.column-offset-0,
235-
.column-offset-1,
236-
.column-offset-2,
237-
.column-offset-3,
238-
.column-offset-4,
239-
.column-offset-5,
240-
.column-offset-6,
241-
.column-offset-7,
242-
.column-offset-8,
243-
.column-offset-9,
244-
.column-offset-10,
245-
.column-offset-11,
246-
{
181+
.offset-0, .offset-1, .offset-2 {
247182
margin: unset;
248183
}
184+
249185
}
186+
187+
/*
188+
##Device = Most of the Smartphones Mobiles (Portrait)
189+
##Screen = B/w $breakpoint-mobile to $breakpoint-tablet-1px
190+
*/
191+
192+
// @media (min-width: $breakpoint-mobile) and (max-width: calc($breakpoint-tablet-1px)) {
193+
194+
// .columns {
195+
// box-sizing: border-box;
196+
// flex: 0 0 auto;
197+
// }
198+
199+
// }
200+

0 commit comments

Comments
 (0)