Skip to content

Commit b98be82

Browse files
committed
chore: clean up
1 parent 3dcbc7a commit b98be82

File tree

7 files changed

+154
-141
lines changed

7 files changed

+154
-141
lines changed

.gitignore

+5-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
1-
node_modules/
1+
node_modules
22
.DS_Store
33
yarn.lock
4-
dist
4+
dist
5+
flexboxgrid2.css
6+
flexboxgrid2.min.css
7+
!src/flexboxgrid2.css

Gruntfile.js

+4-5
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@ module.exports = function(grunt) {
1212
},
1313
release: {
1414
files: {
15-
"dist/flexboxgrid.css": "src/flexboxgrid.css"
15+
"flexboxgrid2.css": "src/flexboxgrid2.css",
16+
"dist/flexboxgrid2.css": "src/flexboxgrid2.css"
1617
}
1718
}
1819
},
@@ -22,7 +23,7 @@ module.exports = function(grunt) {
2223
"docs/style.css": [
2324
"node_modules/normalize.css/normalize.css",
2425
"docs/src/style.css",
25-
"dist/flexboxgrid.css"
26+
"flexboxgrid2.css"
2627
]
2728
}
2829
},
@@ -35,9 +36,7 @@ module.exports = function(grunt) {
3536
},
3637
release: {
3738
expand: true,
38-
cwd: "dist",
39-
src: ["*.css", "!*.min.css"],
40-
dest: "dist",
39+
src: ["flexboxgrid2.css", "dist/flexboxgrid2.css"],
4140
ext: ".min.css"
4241
}
4342
},

README.md

+14-6
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
# flexboxgrid2
22
[![npm version](https://badge.fury.io/js/flexboxgrid2.svg)](https://badge.fury.io/js/flexboxgrid2)
33

4-
Grid based on the `flex` display property and rem.
4+
Grid based on the `flex` display property.
55

66
### Values
77
- `.container` padding: .5rem,
88
- `.container` width: $breakpoint - 1rem,
99
- `.col-*` padding: .5rem.
1010

1111
### Breakpoints
12-
- `xs`: 0575px
13-
- `sm`: 576px-767px
14-
- `md`: 768px991px
15-
- `lg`: 992px1199px
12+
- `xs`: 0..575px
13+
- `sm`: 576px..767px
14+
- `md`: 768px..991px
15+
- `lg`: 992px..1199px
1616
- `xl`: 1200px+
1717

1818
# Install
@@ -22,10 +22,18 @@ Grid based on the `flex` display property and rem.
2222
### npm
2323
`npm i -S flexboxgrid2`
2424

25+
# Usage
26+
### webpack
27+
```js
28+
import 'flexboxgrid2'
29+
// or
30+
import 'flexboxgrid2/flexboxgrid2.css'
31+
```
32+
2533
### unpkg.com CDN
2634
```html
2735
<link rel="stylesheet" href="//unpkg.com/flexboxgrid2" >
2836
```
2937

3038
# Inspiration
31-
- based on [flexboxgrid](https://github.com/kristoferjoseph/flexboxgrid), but project was abandoned
39+
- based on [flexboxgrid](https://github.com/kristoferjoseph/flexboxgrid), but looks like project was abandoned

docs/index.html

+49-49
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
ss.href = href;
88
ss.media = "only x";
99
ref.parentNode.insertBefore(ss, ref);
10-
ss.onloadcssdefined = function(cb) {
10+
ss.onloadcssdefined = function (cb) {
1111
var defined;
1212
for (var i = 0; i < sheets.length; i++) {
1313
if (sheets[i].href && sheets[i].href.indexOf(href) > -1) {
@@ -17,12 +17,12 @@
1717
if (defined) {
1818
cb();
1919
} else {
20-
setTimeout(function() {
20+
setTimeout(function () {
2121
ss.onloadcssdefined(cb);
2222
});
2323
}
2424
};
25-
ss.onloadcssdefined(function() {
25+
ss.onloadcssdefined(function () {
2626
ss.media = media || "all";
2727
});
2828
return ss;
@@ -33,205 +33,205 @@
3333
col-md-6
3434
col-lg-4
3535
col-xl-2">
36-
&lt;div class="box">Responsive&lt;/div>
36+
&lt;div>Responsive&lt;/div>
3737
&lt;/div>
3838
&lt;/div></code></pre></section><section class="page-section"><h2>Fluid</h2><p>Percent based widths allow fluid resizing of columns and rows.</p><div class="row"><div class="col-xs-12"><div class="box-row"></div></div></div><div class="row"><div class="col-xs-1"><div class="box-row"></div></div><div class="col-xs-11"><div class="box-row"></div></div></div><div class="row"><div class="col-xs-2"><div class="box-row"></div></div><div class="col-xs-10"><div class="box-row"></div></div></div><div class="row"><div class="col-xs-3"><div class="box-row"></div></div><div class="col-xs-9"><div class="box-row"></div></div></div><div class="row"><div class="col-xs-4"><div class="box-row"></div></div><div class="col-xs-8"><div class="box-row"></div></div></div><div class="row"><div class="col-xs-5"><div class="box-row"></div></div><div class="col-xs-7"><div class="box-row"></div></div></div><div class="row"><div class="col-xs-6"><div class="box-row"></div></div><div class="col-xs-6"><div class="box-row"></div></div></div><pre><code>.col-xs-6 {
3939
flex-basis: 50%;
4040
}</code></pre></section><section class="page-section"><h2>Simple Syntax</h2><p>All you need to remember is row, column, content.</p><pre><code>&lt;div class="row">
4141
&lt;div class="col-xs-12">
42-
&lt;div class="box">12&lt;/div>
42+
&lt;div>12&lt;/div>
4343
&lt;/div>
4444
&lt;/div></code></pre></section><section class="page-section"><h2>Offsets</h2><p>Offset a column</p><div class="row"><div class="col-xs-3"><div class="box-row"></div></div><div class="col-xs-offset-3 col-xs-6"><div class="box-row"></div></div></div><div class="row"><div class="col-xs-offset-4 col-xs-6"><div class="box-row"></div></div></div><div class="row"><div class="col-xs-offset-2 col-xs-4"><div class="box-row"></div></div></div><pre><code>&lt;div class="row">
4545
&lt;div class="col-xs-offset-3 col-xs-9">
46-
&lt;div class="box">offset&lt;/div>
46+
&lt;div>offset&lt;/div>
4747
&lt;/div>
4848
&lt;/div></code></pre></section><section class="page-section"><h2>Auto Width</h2><p>Add any number of auto sizing columns to a row. Let the grid figure it out.</p><div class="row"><div class="col-xs"><div class="box-row"></div></div><div class="col-xs"><div class="box-row"></div></div></div><div class="row"><div class="col-xs"><div class="box-row"></div></div><div class="col-xs"><div class="box-row"></div></div><div class="col-xs"><div class="box-row"></div></div></div><pre><code>&lt;div class="row">
4949
&lt;div class="col-xs">
50-
&lt;div class="box">auto&lt;/div>
50+
&lt;div>auto&lt;/div>
5151
&lt;/div>
5252
&lt;/div></code></pre></section><section class="page-section"><h2>Nested Grids</h2><p>Nest grids inside grids inside grids.</p><div class="row"><div class="col-xs-7"><div class="box box-container"><div class="row"><div class="col-xs-9"><div class="box-first box-container"><div class="row"><div class="col-xs-4"><div class="box-nested"></div></div><div class="col-xs-8"><div class="box-nested"></div></div></div></div></div><div class="col-xs-3"><div class="box-first box-container"><div class="row"><div class="col-xs"><div class="box-nested"></div></div></div></div></div></div></div></div><div class="col-xs-5"><div class="box box-container"><div class="row"><div class="col-xs-12"><div class="box-first box-container"><div class="row"><div class="col-xs-6"><div class="box-nested"></div></div><div class="col-xs-6"><div class="box-nested"></div></div></div></div></div></div></div></div></div><pre><code>&lt;div class="row">
5353
&lt;div class="col-xs">
54-
&lt;div class="box">
54+
&lt;div>
5555
&lt;div class="row">
5656
&lt;div class="col-xs">
57-
&lt;div class="box">auto&lt;/div>
57+
&lt;div>auto&lt;/div>
5858
&lt;/div>
5959
&lt;/div>
6060
&lt;/div>
6161
&lt;/div>
6262
&lt;/div></code></pre></section><section class="page-section"><h2>Alignment</h2><p>Add classes to align elements to the start or end of a row as well as the top, bottom, or center of a column</p><h3><code>.start-</code></h3><div class="row"><div class="col-xs-12"><div class="box box-container"><div class="row start-xs"><div class="col-xs-6"><div class="box-nested"></div></div></div></div></div></div><pre><code>&lt;div class="row start-xs">
6363
&lt;div class="col-xs-6">
64-
&lt;div class="box">
64+
&lt;div>
6565
start
6666
&lt;/div>
6767
&lt;/div>
6868
&lt;/div>
6969
</code></pre><h3><code>.center-</code></h3><div class="row"><div class="col-xs-12"><div class="box box-container"><div class="row center-xs"><div class="col-xs-6"><div class="box-nested"></div></div></div></div></div></div><pre><code>&lt;div class="row center-xs">
7070
&lt;div class="col-xs-6">
71-
&lt;div class="box">
71+
&lt;div>
7272
start
7373
&lt;/div>
7474
&lt;/div>
7575
&lt;/div>
7676
</code></pre><h3><code>.end-</code></h3><div class="row"><div class="col-xs-12"><div class="box box-container"><div class="row end-xs"><div class="col-xs-6"><div class="box-nested"></div></div></div></div></div></div><pre><code>&lt;div class="row end-xs">
7777
&lt;div class="col-xs-6">
78-
&lt;div class="box">
78+
&lt;div>
7979
end
8080
&lt;/div>
8181
&lt;/div>
8282
&lt;/div>
8383
</code></pre><p>Here is an example of using the modifiers in conjunction to acheive different alignment at different viewport sizes.</p><div class="row"><div class="col-xs-12"><div class="box box-container"><div class="row center-xs end-sm start-lg"><div class="col-xs-6"><div class="box-nested"></div></div></div></div></div></div><pre><code>&lt;div class="row center-xs end-sm start-lg">
8484
&lt;div class="col-xs-6">
85-
&lt;div class="box">
85+
&lt;div>
8686
All together now
8787
&lt;/div>
8888
&lt;/div>
8989
&lt;/div>
9090
</code></pre><h3><code>.top-</code></h3><div class="row top-xs"><div class="col-xs-6"><div class="box-large"></div></div><div class="col-xs-6"><div class="box"></div></div></div><pre><code>&lt;div class="row top-xs">
9191
&lt;div class="col-xs-6">
92-
&lt;div class="box">
92+
&lt;div>
9393
top
9494
&lt;/div>
9595
&lt;/div>
9696
&lt;/div>
9797
</code></pre><h3><code>.middle-</code></h3><div class="row middle-xs"><div class="col-xs-6"><div class="box-large"></div></div><div class="col-xs-6"><div class="box"></div></div></div><pre><code>&lt;div class="row middle-xs">
9898
&lt;div class="col-xs-6">
99-
&lt;div class="box">
99+
&lt;div>
100100
center
101101
&lt;/div>
102102
&lt;/div>
103103
&lt;/div>
104104
</code></pre><h3><code>.bottom-</code></h3><div class="row bottom-xs"><div class="col-xs-6"><div class="box-large"></div></div><div class="col-xs-6"><div class="box"></div></div></div><pre><code>&lt;div class="row bottom-xs">
105105
&lt;div class="col-xs-6">
106-
&lt;div class="box">
106+
&lt;div>
107107
bottom
108108
&lt;/div>
109109
&lt;/div>
110110
&lt;/div>
111111
</code></pre></section><section class="page-section"><h2>Distribution</h2><p>Add classes to distribute the contents of a row or column.</p><h3><code>.around-</code></h3><div class="row"><div class="col-xs-12"><div class="box box-container"><div class="row around-xs"><div class="col-xs-2"><div class="box-nested"></div></div><div class="col-xs-2"><div class="box-nested"></div></div><div class="col-xs-2"><div class="box-nested"></div></div></div></div></div></div><pre><code>&lt;div class="row around-xs">
112112
&lt;div class="col-xs-2">
113-
&lt;div class="box">
113+
&lt;div>
114114
around
115115
&lt;/div>
116116
&lt;/div>
117117
&lt;div class="col-xs-2">
118-
&lt;div class="box">
118+
&lt;div>
119119
around
120120
&lt;/div>
121121
&lt;/div>
122122
&lt;div class="col-xs-2">
123-
&lt;div class="box">
123+
&lt;div>
124124
around
125125
&lt;/div>
126126
&lt;/div>
127127
&lt;/div>
128128
</code></pre><h3><code>.between-</code></h3><div class="row"><div class="col-xs-12"><div class="box box-container"><div class="row between-xs"><div class="col-xs-2"><div class="box-nested"></div></div><div class="col-xs-2"><div class="box-nested"></div></div><div class="col-xs-2"><div class="box-nested"></div></div></div></div></div></div><pre><code>&lt;div class="row between-xs">
129129
&lt;div class="col-xs-2">
130-
&lt;div class="box">
130+
&lt;div>
131131
between
132132
&lt;/div>
133133
&lt;/div>
134134
&lt;div class="col-xs-2">
135-
&lt;div class="box">
135+
&lt;div>
136136
between
137137
&lt;/div>
138138
&lt;/div>
139139
&lt;div class="col-xs-2">
140-
&lt;div class="box">
140+
&lt;div>
141141
between
142142
&lt;/div>
143143
&lt;/div>
144144
&lt;/div>
145145
</code></pre></section><section class="page-section"><h2>Reordering</h2><p>Add classes to reorder columns.</p><h3><code>.first-</code></h3><p>Forces a column to appear first.</p><div class="row"><div class="col-xs-12"><div class="box box-container"><div class="row"><div class="col-xs-2"><div class="box-first">1</div></div><div class="col-xs-2"><div class="box-first">2</div></div><div class="col-xs-2"><div class="box-first">3</div></div><div class="col-xs-2"><div class="box-first">4</div></div><div class="col-xs-2"><div class="box-first">5</div></div><div class="col-xs-2 first-xs"><div class="box-nested">6</div></div></div></div></div></div><pre><code>&lt;div class="row">
146146
&lt;div class="col-xs-2">
147-
&lt;div class="box">
147+
&lt;div>
148148
1
149149
&lt;/div>
150150
&lt;/div>
151151
&lt;div class="col-xs-2">
152-
&lt;div class="box">
152+
&lt;div>
153153
2
154154
&lt;/div>
155155
&lt;/div>
156156
&lt;div class="col-xs-2 first-xs">
157-
&lt;div class="box">
157+
&lt;div>
158158
3
159159
&lt;/div>
160160
&lt;/div>
161161
&lt;/div>
162162
</code></pre><h3><code>.last-</code></h3><p>Forces a column to appear last.</p><div class="row"><div class="col-xs-12"><div class="box box-container"><div class="row"><div class="col-xs-2 last-xs"><div class="box-nested">1</div></div><div class="col-xs-2"><div class="box-first">2</div></div><div class="col-xs-2"><div class="box-first">3</div></div><div class="col-xs-2"><div class="box-first">4</div></div><div class="col-xs-2"><div class="box-first">5</div></div><div class="col-xs-2"><div class="box-first">6</div></div></div></div></div></div><pre><code>&lt;div class="row">
163163
&lt;div class="col-xs-2 last-xs">
164-
&lt;div class="box">
164+
&lt;div>
165165
1
166166
&lt;/div>
167167
&lt;/div>
168168
&lt;div class="col-xs-2">
169-
&lt;div class="box">
169+
&lt;div>
170170
2
171171
&lt;/div>
172172
&lt;/div>
173173
&lt;div class="col-xs-2">
174-
&lt;div class="box">
174+
&lt;div>
175175
3
176176
&lt;/div>
177177
&lt;/div>
178178
&lt;/div>
179-
</code></pre><h3><code>.initial-order-</code></h3><p>Resets a column to its initial order.</p><div class="row"><div class="col-xs-12"><div class="box box-container"><div class="row"><div class="col-xs-2"><div class="box-first">1</div></div><div class="col-xs-2"><div class="box-first">2</div></div><div class="col-xs-2"><div class="box-first">3</div></div><div class="col-xs-2"><div class="box-first">4</div></div><div class="col-xs-2"><div class="box-first">5</div></div><div class="col-xs-2 first-xs initial-order-sm"><div class="box-nested">6</div></div></div></div></div></div><pre><code>&lt;div class=&quot;row&quot;&gt;
180-
&lt;div class=&quot;col-xs-2&quot;&gt;
181-
&lt;div class=&quot;box&quot;&gt;
179+
</code></pre><h3><code>.initial-order-</code></h3><p>Resets a column to its initial order.</p><div class="row"><div class="col-xs-12"><div class="box box-container"><div class="row"><div class="col-xs-2"><div class="box-first">1</div></div><div class="col-xs-2"><div class="box-first">2</div></div><div class="col-xs-2"><div class="box-first">3</div></div><div class="col-xs-2"><div class="box-first">4</div></div><div class="col-xs-2"><div class="box-first">5</div></div><div class="col-xs-2 first-xs initial-order-sm"><div class="box-nested">6</div></div></div></div></div></div><pre><code>&lt;div class="row"&gt;
180+
&lt;div class="col-xs-2"&gt;
181+
&lt;div&gt;
182182
1
183183
&lt;/div&gt;
184184
&lt;/div&gt;
185-
&lt;div class=&quot;col-xs-2&quot;&gt;
186-
&lt;div class=&quot;box&quot;&gt;
185+
&lt;div class="col-xs-2"&gt;
186+
&lt;div&gt;
187187
2
188188
&lt;/div&gt;
189189
&lt;/div&gt;
190-
&lt;div class=&quot;col-xs-2 first-xs initial-order-sm&quot;&gt;
191-
&lt;div class=&quot;box&quot;&gt;
190+
&lt;div class="col-xs-2 first-xs initial-order-sm"&gt;
191+
&lt;div&gt;
192192
3
193193
&lt;/div&gt;
194194
&lt;/div&gt;
195195
&lt;/div&gt;</code></pre></section><section class="page-section"><h2>Reversing</h2><h3><code>.reverse</code></h3><div class="row"><div class="col-xs-12"><div class="box box-container"><div class="row reverse"><div class="col-xs-2"><div class="box-nested">1</div></div><div class="col-xs-2"><div class="box-nested">2</div></div><div class="col-xs-2"><div class="box-nested">3</div></div><div class="col-xs-2"><div class="box-nested">4</div></div><div class="col-xs-2"><div class="box-nested">5</div></div><div class="col-xs-2"><div class="box-nested">6</div></div></div></div></div></div><pre><code>&lt;div class="row reverse">
196196
&lt;div class="col-xs-2">
197-
&lt;div class="box">
197+
&lt;div>
198198
1
199199
&lt;/div>
200200
&lt;/div>
201201
&lt;div class="col-xs-2">
202-
&lt;div class="box">
202+
&lt;div>
203203
2
204204
&lt;/div>
205205
&lt;/div>
206206
&lt;div class="col-xs-2">
207-
&lt;div class="box">
207+
&lt;div>
208208
3
209209
&lt;/div>
210210
&lt;/div>
211211
&lt;/div>
212-
</code></pre></section><section class="page-section"><h2>Hiding</h2><p>Add one or more breakpoint modifiers to hide columns based on the viewport.</p><h3><code>.hidden-</code></h3><div class="row"><div class="col-xs-12"><div class="box box-container"><div class="row"><div class="col-xs"><div class="box-nested hidden-xs">xs</div></div><div class="col-xs"><div class="box-nested hidden-sm">sm</div></div><div class="col-xs"><div class="box-nested hidden-md">md</div></div><div class="col-xs"><div class="box-nested hidden-lg">lg</div></div><div class="col-xs"><div class="box-nested hidden-xl">xl</div></div></div></div></div></div><pre><code>&lt;div class=&quot;row&quot;&gt;
213-
&lt;div class=&quot;col-xs&quot;&gt;
214-
&lt;div class=&quot;box hidden-xs&quot;&gt;
212+
</code></pre></section><section class="page-section"><h2>Hiding</h2><p>Add one or more breakpoint modifiers to hide columns based on the viewport.</p><h3><code>.hidden-</code></h3><div class="row"><div class="col-xs-12"><div class="box box-container"><div class="row"><div class="col-xs"><div class="box-nested hidden-xs">xs</div></div><div class="col-xs"><div class="box-nested hidden-sm">sm</div></div><div class="col-xs"><div class="box-nested hidden-md">md</div></div><div class="col-xs"><div class="box-nested hidden-lg">lg</div></div><div class="col-xs"><div class="box-nested hidden-xl">xl</div></div></div></div></div></div><pre><code>&lt;div class="row"&gt;
213+
&lt;div class="col-xs"&gt;
214+
&lt;div class="hidden-xs"&gt;
215215
xs
216216
&lt;/div&gt;
217217
&lt;/div&gt;
218-
&lt;div class=&quot;col-xs&quot;&gt;
219-
&lt;div class=&quot;box hidden-sm&quot;&gt;
218+
&lt;div class="col-xs"&gt;
219+
&lt;div class="hidden-sm"&gt;
220220
sm
221221
&lt;/div&gt;
222222
&lt;/div&gt;
223-
&lt;div class=&quot;col-xs&quot;&gt;
224-
&lt;div class=&quot;box hidden-md&quot;&gt;
223+
&lt;div class="col-xs"&gt;
224+
&lt;div class="hidden-md"&gt;
225225
md
226226
&lt;/div&gt;
227227
&lt;/div&gt;
228-
&lt;div class=&quot;col-xs&quot;&gt;
229-
&lt;div class=&quot;box hidden-lg&quot;&gt;
228+
&lt;div class="col-xs"&gt;
229+
&lt;div class="hidden-lg"&gt;
230230
lg
231231
&lt;/div&gt;
232232
&lt;/div&gt;
233-
&lt;div class=&quot;col-xs&quot;&gt;
234-
&lt;div class=&quot;box hidden-xl&quot;&gt;
233+
&lt;div class="col-xs"&gt;
234+
&lt;div class="hidden-xl"&gt;
235235
xl
236236
&lt;/div&gt;
237237
&lt;/div&gt;

0 commit comments

Comments
 (0)