From 1878b8fca2f8931328398ac095662f94be132047 Mon Sep 17 00:00:00 2001 From: Fabian Date: Mon, 26 Aug 2019 12:54:17 +0200 Subject: [PATCH] Add basic grid --- package.json | 4 +- src/base.scss | 3 +- src/base/_global.scss | 1 - src/base/_grid.scss | 462 ++++++++++++++++++++++++++++++++++++++++++ src/base/_header.scss | 20 -- 5 files changed, 466 insertions(+), 24 deletions(-) create mode 100644 src/base/_grid.scss diff --git a/package.json b/package.json index f8a7610..b37ed7c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@hibas123/theme", - "version": "1.2.4", + "version": "1.2.5", "description": "", "main": " ", "files": [ @@ -21,4 +21,4 @@ "dependencies": { "sass": "^1.22.7" } -} +} \ No newline at end of file diff --git a/src/base.scss b/src/base.scss index b920f34..5688064 100644 --- a/src/base.scss +++ b/src/base.scss @@ -33,4 +33,5 @@ $on-error: var(--on-error) !default; @import "./base/_input.scss"; @import "./base/_list.scss"; @import "./base/_header.scss"; -@import "./base/_card.scss"; \ No newline at end of file +@import "./base/_card.scss"; +@import "./base/_grid.scss"; \ No newline at end of file diff --git a/src/base/_global.scss b/src/base/_global.scss index be957f8..98b963f 100644 --- a/src/base/_global.scss +++ b/src/base/_global.scss @@ -23,7 +23,6 @@ body { max-width: 50rem; } - h1 { font-size: 2rem; } diff --git a/src/base/_grid.scss b/src/base/_grid.scss new file mode 100644 index 0000000..aa671ac --- /dev/null +++ b/src/base/_grid.scss @@ -0,0 +1,462 @@ +// .container { +// margin: 0 auto; +// padding: 0 calc(1.5 * 1rem); +// } + + +.row { + box-sizing: border-box; + display: flex; + flex: 0 1 auto; + flex-flow: row wrap; +} + +.col-sm, +[class^='col-sm-'], +[class^='col-sm-offset-'], +.row[class*='cols-sm-']>* { + box-sizing: border-box; + flex: 0 0 auto; + padding: 0 calc(var(--universal-padding) / 2); +} + +.col-sm, +.row.cols-sm>* { + max-width: 100%; + flex-grow: 1; + flex-basis: 0; +} + +.col-sm-1, +.row.cols-sm-1>* { + max-width: 8.33333%; + flex-basis: 8.33333%; +} + +.col-sm-offset-0 { + margin-left: 0; +} + +.col-sm-2, +.row.cols-sm-2>* { + max-width: 16.66667%; + flex-basis: 16.66667%; +} + +.col-sm-offset-1 { + margin-left: 8.33333%; +} + +.col-sm-3, +.row.cols-sm-3>* { + max-width: 25%; + flex-basis: 25%; +} + +.col-sm-offset-2 { + margin-left: 16.66667%; +} + +.col-sm-4, +.row.cols-sm-4>* { + max-width: 33.33333%; + flex-basis: 33.33333%; +} + +.col-sm-offset-3 { + margin-left: 25%; +} + +.col-sm-5, +.row.cols-sm-5>* { + max-width: 41.66667%; + flex-basis: 41.66667%; +} + +.col-sm-offset-4 { + margin-left: 33.33333%; +} + +.col-sm-6, +.row.cols-sm-6>* { + max-width: 50%; + flex-basis: 50%; +} + +.col-sm-offset-5 { + margin-left: 41.66667%; +} + +.col-sm-7, +.row.cols-sm-7>* { + max-width: 58.33333%; + flex-basis: 58.33333%; +} + +.col-sm-offset-6 { + margin-left: 50%; +} + +.col-sm-8, +.row.cols-sm-8>* { + max-width: 66.66667%; + flex-basis: 66.66667%; +} + +.col-sm-offset-7 { + margin-left: 58.33333%; +} + +.col-sm-9, +.row.cols-sm-9>* { + max-width: 75%; + flex-basis: 75%; +} + +.col-sm-offset-8 { + margin-left: 66.66667%; +} + +.col-sm-10, +.row.cols-sm-10>* { + max-width: 83.33333%; + flex-basis: 83.33333%; +} + +.col-sm-offset-9 { + margin-left: 75%; +} + +.col-sm-11, +.row.cols-sm-11>* { + max-width: 91.66667%; + flex-basis: 91.66667%; +} + +.col-sm-offset-10 { + margin-left: 83.33333%; +} + +.col-sm-12, +.row.cols-sm-12>* { + max-width: 100%; + flex-basis: 100%; +} + +.col-sm-offset-11 { + margin-left: 91.66667%; +} + +.col-sm-normal { + order: initial; +} + +.col-sm-first { + order: -999; +} + +.col-sm-last { + order: 999; +} + +@media screen and (min-width: 768px) { + + .col-md, + [class^='col-md-'], + [class^='col-md-offset-'], + .row[class*='cols-md-']>* { + box-sizing: border-box; + flex: 0 0 auto; + padding: 0 calc(var(--universal-padding) / 2); + } + + .col-md, + .row.cols-md>* { + max-width: 100%; + flex-grow: 1; + flex-basis: 0; + } + + .col-md-1, + .row.cols-md-1>* { + max-width: 8.33333%; + flex-basis: 8.33333%; + } + + .col-md-offset-0 { + margin-left: 0; + } + + .col-md-2, + .row.cols-md-2>* { + max-width: 16.66667%; + flex-basis: 16.66667%; + } + + .col-md-offset-1 { + margin-left: 8.33333%; + } + + .col-md-3, + .row.cols-md-3>* { + max-width: 25%; + flex-basis: 25%; + } + + .col-md-offset-2 { + margin-left: 16.66667%; + } + + .col-md-4, + .row.cols-md-4>* { + max-width: 33.33333%; + flex-basis: 33.33333%; + } + + .col-md-offset-3 { + margin-left: 25%; + } + + .col-md-5, + .row.cols-md-5>* { + max-width: 41.66667%; + flex-basis: 41.66667%; + } + + .col-md-offset-4 { + margin-left: 33.33333%; + } + + .col-md-6, + .row.cols-md-6>* { + max-width: 50%; + flex-basis: 50%; + } + + .col-md-offset-5 { + margin-left: 41.66667%; + } + + .col-md-7, + .row.cols-md-7>* { + max-width: 58.33333%; + flex-basis: 58.33333%; + } + + .col-md-offset-6 { + margin-left: 50%; + } + + .col-md-8, + .row.cols-md-8>* { + max-width: 66.66667%; + flex-basis: 66.66667%; + } + + .col-md-offset-7 { + margin-left: 58.33333%; + } + + .col-md-9, + .row.cols-md-9>* { + max-width: 75%; + flex-basis: 75%; + } + + .col-md-offset-8 { + margin-left: 66.66667%; + } + + .col-md-10, + .row.cols-md-10>* { + max-width: 83.33333%; + flex-basis: 83.33333%; + } + + .col-md-offset-9 { + margin-left: 75%; + } + + .col-md-11, + .row.cols-md-11>* { + max-width: 91.66667%; + flex-basis: 91.66667%; + } + + .col-md-offset-10 { + margin-left: 83.33333%; + } + + .col-md-12, + .row.cols-md-12>* { + max-width: 100%; + flex-basis: 100%; + } + + .col-md-offset-11 { + margin-left: 91.66667%; + } + + .col-md-normal { + order: initial; + } + + .col-md-first { + order: -999; + } + + .col-md-last { + order: 999; + } +} + +@media screen and (min-width: 1280px) { + + .col-lg, + [class^='col-lg-'], + [class^='col-lg-offset-'], + .row[class*='cols-lg-']>* { + box-sizing: border-box; + flex: 0 0 auto; + padding: 0 calc(var(1rem) / 2); + } + + .col-lg, + .row.cols-lg>* { + max-width: 100%; + flex-grow: 1; + flex-basis: 0; + } + + .col-lg-1, + .row.cols-lg-1>* { + max-width: 8.33333%; + flex-basis: 8.33333%; + } + + .col-lg-offset-0 { + margin-left: 0; + } + + .col-lg-2, + .row.cols-lg-2>* { + max-width: 16.66667%; + flex-basis: 16.66667%; + } + + .col-lg-offset-1 { + margin-left: 8.33333%; + } + + .col-lg-3, + .row.cols-lg-3>* { + max-width: 25%; + flex-basis: 25%; + } + + .col-lg-offset-2 { + margin-left: 16.66667%; + } + + .col-lg-4, + .row.cols-lg-4>* { + max-width: 33.33333%; + flex-basis: 33.33333%; + } + + .col-lg-offset-3 { + margin-left: 25%; + } + + .col-lg-5, + .row.cols-lg-5>* { + max-width: 41.66667%; + flex-basis: 41.66667%; + } + + .col-lg-offset-4 { + margin-left: 33.33333%; + } + + .col-lg-6, + .row.cols-lg-6>* { + max-width: 50%; + flex-basis: 50%; + } + + .col-lg-offset-5 { + margin-left: 41.66667%; + } + + .col-lg-7, + .row.cols-lg-7>* { + max-width: 58.33333%; + flex-basis: 58.33333%; + } + + .col-lg-offset-6 { + margin-left: 50%; + } + + .col-lg-8, + .row.cols-lg-8>* { + max-width: 66.66667%; + flex-basis: 66.66667%; + } + + .col-lg-offset-7 { + margin-left: 58.33333%; + } + + .col-lg-9, + .row.cols-lg-9>* { + max-width: 75%; + flex-basis: 75%; + } + + .col-lg-offset-8 { + margin-left: 66.66667%; + } + + .col-lg-10, + .row.cols-lg-10>* { + max-width: 83.33333%; + flex-basis: 83.33333%; + } + + .col-lg-offset-9 { + margin-left: 75%; + } + + .col-lg-11, + .row.cols-lg-11>* { + max-width: 91.66667%; + flex-basis: 91.66667%; + } + + .col-lg-offset-10 { + margin-left: 83.33333%; + } + + .col-lg-12, + .row.cols-lg-12>* { + max-width: 100%; + flex-basis: 100%; + } + + .col-lg-offset-11 { + margin-left: 91.66667%; + } + + .col-lg-normal { + order: initial; + } + + .col-lg-first { + order: -999; + } + + .col-lg-last { + order: 999; + } +} \ No newline at end of file diff --git a/src/base/_header.scss b/src/base/_header.scss index fb4c1a5..5fd48af 100644 --- a/src/base/_header.scss +++ b/src/base/_header.scss @@ -33,24 +33,4 @@ height: 2rem; width: auto; } - - // .header-title { - // overflow: hidden; - // text-overflow: ellipsis; - // white-space: nowrap; - // flex-grow: 1; - // margin: 0 1rem; - // } - - // .header-icon-button { - // display: block; - // margin-top: auto; - // margin-bottom: auto; - // min-width: 1rem; - - // >svg { - // height: 1rem; - // width: 1rem; - // } - // } } \ No newline at end of file