Skip to content

Commit bfbf3cf

Browse files
micantoinemicantoine
committed
Merge branch 'master' into github-master
2 parents c9a04bc + 07fbbd0 commit bfbf3cf

30 files changed

Lines changed: 794 additions & 160 deletions

‎dist/loop.css‎

Lines changed: 296 additions & 58 deletions
Large diffs are not rendered by default.

‎dist/loop.min.css‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎docs/dist/index.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
<!DOCTYPE html><html><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge,chrome=1"><meta name=viewport content="width=device-width,initial-scale=1,user-scalable=no"><meta name=decription content="SCSS companion for Front-end Developer"><meta name=keywords content="scss, sass, css, companion, framework, front-end, developer, loop, oo-loop"><title>Loop - SCSS Companion</title><link rel=apple-touch-icon sizes=180x180 href=/static/assets/apple-touch-icon.png><link rel=icon type=image/png sizes=32x32 href=/static/assets/favicon-32x32.png><link rel=icon type=image/png sizes=16x16 href=/static/assets/favicon-16x16.png><link rel=manifest href=/static/assets/site.webmanifest><link rel=mask-icon href=/static/assets/safari-pinned-tab.svg color=#6cd7f7><meta name=msapplication-TileColor content=#6cd7f7><meta name=theme-color content=#ffffff><link href=/static/css/app.b9d3b200e2c8cc29dfdb7de5ac2b06fa.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.2ae2e69a05c33dfc65f8.js></script><script type=text/javascript src=/static/js/vendor.67fbabd8141a2f0bdedf.js></script><script type=text/javascript src=/static/js/app.9f6c3c202d913845b6d5.js></script></body></html>
1+
<!DOCTYPE html><html><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge,chrome=1"><meta name=viewport content="width=device-width,initial-scale=1,user-scalable=no"><meta name=decription content="SCSS companion for Front-end Developer"><meta name=keywords content="scss, sass, css, companion, framework, front-end, developer, loop, oo-loop"><title>Loop - SCSS Companion</title><link rel=apple-touch-icon sizes=180x180 href=/static/assets/apple-touch-icon.png><link rel=icon type=image/png sizes=32x32 href=/static/assets/favicon-32x32.png><link rel=icon type=image/png sizes=16x16 href=/static/assets/favicon-16x16.png><link rel=manifest href=/static/assets/site.webmanifest><link rel=mask-icon href=/static/assets/safari-pinned-tab.svg color=#6cd7f7><meta name=msapplication-TileColor content=#6cd7f7><meta name=theme-color content=#ffffff><link href=/static/css/app.f80b9137a4a7f1faca7ad820e0ca223f.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.23b1134c36d6346d110c.js></script><script type=text/javascript src=/static/js/vendor.67fbabd8141a2f0bdedf.js></script><script type=text/javascript src=/static/js/app.cf23beaf103b59ecaa3a.js></script></body></html>

‎docs/dist/static/css/app.f80b9137a4a7f1faca7ad820e0ca223f.css‎

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎docs/dist/static/css/app.f80b9137a4a7f1faca7ad820e0ca223f.css.map‎

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎docs/dist/static/js/app.cf23beaf103b59ecaa3a.js‎

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎docs/dist/static/js/manifest.23b1134c36d6346d110c.js‎

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎docs/dist/static/js/vendor.67fbabd8141a2f0bdedf.js‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎docs/src/App.vue‎

Lines changed: 58 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -80,12 +80,20 @@ export default {
8080
labelClass: 'color-secondary',
8181
subMenu: [
8282
{
83-
name: 'Responsive',
84-
route: '#responsive'
83+
name: 'Layout',
84+
route: '#layout'
85+
},
86+
{
87+
name: 'Gap',
88+
route: '#gap'
8589
},
8690
{
87-
name: 'Gaps',
88-
route: '#gaps'
91+
name: 'Order',
92+
route: '#order'
93+
},
94+
{
95+
name: 'Areas',
96+
route: '#areas'
8997
},
9098
]
9199
},
@@ -327,6 +335,7 @@ export default {
327335
'info': #2689ef,
328336
'gray': #999,
329337
'success': #3fc65c,
338+
'white': #fff,
330339
);
331340
$btn-colors: (
332341
'nectarine': #ffbe76,
@@ -366,6 +375,51 @@ export default {
366375
$columns-gutter-sizes-breakpoints-classes:(sm, md, lg);
367376
$use-columns-self-adjustment-breakpoints: true;
368377
378+
$use-grid-order: true;
379+
380+
$grid-template-areas: (
381+
'sample': (
382+
"header header header header"
383+
"main main main sidebar"
384+
"footer footer footer footer"
385+
),
386+
'sample-responsive': (
387+
: (
388+
"header"
389+
"sidebar"
390+
"main"
391+
"footer"
392+
),
393+
sm: (
394+
"header header header header"
395+
"main main main sidebar"
396+
"footer footer footer footer"
397+
),
398+
),
399+
'sample-abc': (
400+
: (
401+
"a"
402+
"b"
403+
"c"
404+
),
405+
sm: (
406+
"a a"
407+
"c b"
408+
"c b"
409+
),
410+
md: (
411+
"a a a"
412+
"b c c"
413+
"b c c"
414+
),
415+
lg: (
416+
"a b b"
417+
"a c c"
418+
"a . ."
419+
),
420+
),
421+
);
422+
369423
@import '~loop/loop';
370424
371425
$layout-padding: 2.4rem;

‎docs/src/components/documentation/grid/code/abc.html‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<section oo-grid="areas sample-abc">
2+
<div oo-grid="a">A</div>
3+
<div oo-grid="b">B</div>
4+
<div oo-grid="c">C</div>
5+
</section>

0 commit comments

Comments
 (0)