Skip to content

Merge with master #35

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.

Sign up for GitHub

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

Merged
merged 7 commits into from
Jul 24, 2017
Merged

Merge with master #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
fa06b63
New formula for generating the grid. Added gutter-map to variables, n…
Jul 19, 2017
3edc575
2.5.0
Jul 19, 2017
6a68d3c
Fix for B1 and B2
Jul 19, 2017
73b511d
Merge pull request #31 from CastleCSS/Grid-classes-not-generated-afte…
dariusrosendahl Jul 20, 2017
d175381
Added gutter none / small / large per breakpoint
Jul 20, 2017
a2554bb
Merge pull request #33 from CastleCSS/feature/no-small-large-gutter-p…
dariusrosendahl Jul 20, 2017
2c9f325
Merge pull request #34 from CastleCSS/develop
dariusrosendahl Jul 24, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package-lock.json
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "castlecss-core",
"version": "2.4.0",
"version": "2.5.0",
"description": "CastleCSS a SCSS framework with modular building blocks for the web",
"main": "index.js",
"scripts": {
Expand Down
265 changes: 110 additions & 155 deletions sass/layout/grid.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,9 @@

}

/* Grid widths */
/* Grid widths
12 column grid for $b0
*/

@for $i from 1 through 12 {
$width: ($i/12) * 100%;
Expand All @@ -173,204 +175,157 @@

.b0_push_none { margin-left: 0; }

// $b1
@media only screen and (min-width: $b1) {

@for $i from 1 through 12 {
$width: ($i/12) * 100%;

@if $i < 10 {
.b1_0#{ $i } { width: $width; }

.b1_push_0#{ $i } { margin-left: $width; }
} @else {

.b1_#{ $i } { width: $width; }

.b1_push_#{ $i } { margin-left: $width; }
}
}
@for $i from 13 through 24 {
$width: ($i/12) * 100%;
}

.g {
margin-left: -$grid-gutter-b1;

> * {
padding-left: $grid-gutter-b1;
}
}
/* 12 column grid for $b1 and $b2 */
@for $b from 1 through 2 {
$breakpoint : map-get($breakpoint-map, $b);
$gutter : map-get($gutter-map, $b);

.b1_push_none { margin-left: 0; }

}


// $b2
@media only screen and (min-width: $b2) {

@for $i from 1 through 12 {
$width: ($i/12) * 100%;
@media only screen and (min-width: $breakpoint) {

@for $i from 1 through 12 {
$width: ($i/12) * 100%;

@if $i < 10 {
.b2_0#{ $i } { width: $width; }
@if $i < 10 {
.b#{$b}_0#{ $i } { width: $width; }

.b2_push_0#{ $i } { margin-left: $width; }
} @else {
.b#{$b}_push_0#{ $i } { margin-left: $width; }
} @else {

.b2_#{ $i } { width: $width; }
.b#{$b}_#{ $i } { width: $width; }

.b2_push_#{ $i } { margin-left: $width; }
}
@for $i from 13 through 24 {
$width: ($i/12) * 100%;
.b#{$b}_push_#{ $i } { margin-left: $width; }
}
@for $i from 13 through 24 {
$width: ($i/12) * 100%;
}
}
}

.g {
margin-left: -$grid-gutter-b2;

> * {
padding-left: $grid-gutter-b2;
.g {
margin-left: -#{$gutter};

> * {
padding-left: $gutter;
}
}
}

.b2_push_none { margin-left: 0; }
.b#{$b}_push_none { margin-left: 0; }

}
/* No Gutter */
&.gutter-b#{$b}-none {
margin-left: 0;

// $b3
@media only screen and (min-width: $b3) {
> * {
padding-left: 0;
}
}

@for $i from 1 through 24 {
$width: ($i/24) * 100%;
/* Smaller gutter */
&.gutter-b#{$b}-small {
margin-left: -$grid-gutter / 2;

@if $i < 10 {
.b3_0#{ $i } { width: $width; }
> * {
padding-left: $grid-gutter / 2;
}
}

.b3_push_0#{ $i } { margin-left: $width; }
} @else {
.b3_#{ $i } { width: $width; }
/* Larger gutter */
&.gutter-b#{$b}-large {
margin-left: -$grid-gutter * 2;

.b3_push_#{ $i } { margin-left: $width; }
}
@for $i from 13 through 48 {
$width: ($i/24) * 100%;
> * {
padding-left: $grid-gutter * 2;
}
}
}

.g {
margin-left: -$grid-gutter-b3;

> * {
padding-left: $grid-gutter-b3;
/* Normal gutter */
&.gutter-b#{$b}-normal {
margin-left: -$grid-gutter;

> * {
padding-left: $grid-gutter;
}
}
}
}

.b3_x5 { width: 20%; }
.b3_x7 { width: 14.28571428571429%; }

.b3_push_none { margin-left: 0; }
/* 24 column grid for $b3 and higher */
@for $b from 3 through $amount-breakpoints {
$breakpoint : map-get($breakpoint-map, $b);
$gutter : map-get($gutter-map, $b);

}
@media only screen and (min-width: $breakpoint) {

// $b4
@media only screen and (min-width: $b4) {
@for $i from 1 through 24 {
$width: ($i/24) * 100%;

@for $i from 1 through 24 {
$width: ($i/24) * 100%;
@if $i < 10 {

@if $i < 10 {
.b4_0#{ $i } { width: $width; }
.b#{$b}_0#{ $i } { width: $width; }

.b4_push_0#{ $i } { margin-left: $width; }
} @else {
.b#{$b}_push_0#{ $i } { margin-left: $width; }

} @else {

.b4_#{ $i } { width: $width; }
.b#{$b}_#{ $i } { width: $width; }

.b4_push_#{ $i } { margin-left: $width; }
}
}
.b#{$b}_push_#{ $i } { margin-left: $width; }
}

.g {
margin-left: -$grid-gutter-b4;

> * {
padding-left: $grid-gutter-b4;
@for $i from 13 through 48 {
$width: ($i/24) * 100%;
}
}
}

.b4_x5 { width: 20%; }
.b4_x7 { width: 14.28571428571429%; }
.g {
margin-left: -#{$gutter};

> * {
padding-left: $gutter;

.b4_push_none { margin-left: 0; }
}
}

.b#{$b}_x5 { width: 20%; }
.b#{$b}_x7 { width: 14.28571428571429%; }

}
.b#{$b}_push_none { margin-left: 0; }

// $b5
@media only screen and (min-width: $b5) {
/* No gutter */
&.gutter-b#{$b}-none {
margin-left: 0;

@for $i from 1 through 24 {
$width: ($i/24) * 100%;
> * {
padding-left: 0;
}
}

@if $i < 10 {
.b5_0#{ $i } { width: $width; }
/* Smaller gutter */
&.gutter-b#{$b}-small {
margin-left: -$grid-gutter / 2;

.b5_push_0#{ $i } { margin-left: $width; }
} @else {
> * {
padding-left: $grid-gutter / 2;
}
}

.b5_#{ $i } { width: $width; }
/* Larger gutter */
&.gutter-b#{$b}-large {
margin-left: -$grid-gutter * 2;

.b5_push_#{ $i } { margin-left: $width; }
> * {
padding-left: $grid-gutter * 2;
}
}
}

.g {
margin-left: -$grid-gutter-b5;

> * {
padding-left: $grid-gutter-b5;
}
}

.b5_x5 { width: 20%; }
.b5_x7 { width: 14.28571428571429%; }

.b5_push_none { margin-left: 0; }

}
// $b6
@media only screen and (min-width: $b6) {

@for $i from 1 through 24 {
$width: ($i/24) * 100%;

@if $i < 10 {
.b6_0#{ $i } { width: $width; }

.b6_push_0#{ $i } { margin-left: $width; }
} @else {
/* Normal gutter */
&.gutter-b#{$b}-normal {
margin-left: -$grid-gutter;

.b6_#{ $i } { width: $width; }

.b6_push_#{ $i } { margin-left: $width; }
> * {
padding-left: $grid-gutter;
}
}
}

.g {
margin-left: -$grid-gutter-b6;

> * {
padding-left: $grid-gutter-b6;
}
}

.b6_x5 { width: 20%; }
.b6_x7 { width: 14.28571428571429%; }

.b6_push_none { margin-left: 0; }


}
13 changes: 13 additions & 0 deletions sass/variables.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,19 @@ $grid-gutter-b4: 16px;
$grid-gutter-b5: 16px;
$grid-gutter-b6: 16px;

/*
Gutter map
Must be the same amount of gutters and $gutter-map as above
*/
$gutter-map: (
1: $grid-gutter-b1,
2: $grid-gutter-b2,
3: $grid-gutter-b3,
4: $grid-gutter-b4,
5: $grid-gutter-b5,
6: $grid-gutter-b6,
);

/*
Default margin and padding
*/
Expand Down