Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Decanter 161 grid version v04 #187

Merged
merged 13 commits into from
Aug 16, 2018
  •  
  •  
  •  
4 changes: 2 additions & 2 deletions css/decanter-grid.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 16 additions & 4 deletions css/decanter-kss.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion css/decanter-no-markup.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

143 changes: 133 additions & 10 deletions css/decanter.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion js/decanter.min.js

Large diffs are not rendered by default.

61 changes: 61 additions & 0 deletions scss/core/grid/_grid.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
@charset "UTF-8";

//
// Class-based Grid.
//
// Markup: ../../templates/core/grid/grid.twig
//

// The grid.
.grid--container {
@include grid--container;
}

.grid--item {
@include grid--item;
}

// Got classes if you want them.
.grid--3-of-12 {
@include grid--3-of-12;
}

.grid--9-of-12 {
@include grid--9-of-12;
}

.grid--4-of-12 {
@include grid--4-of-12;
}

.grid--8-of-12 {
@include grid--8-of-12;
}

.grid--6-of-12 {
@include grid--6-of-12;
}

.grid--12-of-12 {
@include grid--12-of-12;
}

.grid--2-of-12 {
@include grid--2-of-12;
}

.grid--10-of-12 {
@include grid--10-of-12;
}

.grid--1-of-12 {
@include grid--1-of-12;
}

.grid--5-of-12 {
@include grid--5-of-12;
}

.grid--7-of-12 {
@include grid--7-of-12;
}
8 changes: 8 additions & 0 deletions scss/core/grid/index.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
@charset "UTF-8";

///
/// ROLL UP
///

@import
'grid';
7 changes: 7 additions & 0 deletions scss/core/index.scss
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,12 @@
//
// Style guide: Core.Fonts

// Grid
//
// Markup: ../../templates/core/grid/grid.twig
//
// Style guide: Core.Grid

// Colors
//
// Markup: ../templates/core/colors/colors.twig
Expand All @@ -19,4 +25,5 @@

@import
'fonts/index',
'grid/index',
'base';
4 changes: 2 additions & 2 deletions scss/kss/_class-based-grid.scss
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
@charset "UTF-8";

// Margins to aid in demonstration of markup.
.decanter-grid {
.grid--container {
margin-bottom: 20px;
}

// Colors to distinguish odd vs. even cells.
.decanter-grid--item {
.grid--item {
padding: 10px;
overflow: hidden;
background-color: rgba(black, .125);
Expand Down
20 changes: 20 additions & 0 deletions scss/kss/_colors-demo.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
.colors-demo {
line-height: 1.2;

&--item {
margin-bottom: 1em;

.inner {
padding: .5em;
}
}

&--colorname {
font-size: .8em;
margin-bottom: .16em;
}

&--colorhex {
font-family: monospace;
}
}
Loading