Skip to content

Commit

Permalink
Homesite17 (#50)
Browse files Browse the repository at this point in the history
* move bourbon, neat, neat omega from variables to utilities (now that settings are called at runtime)

* !fixup neat (duh)

* !fixup base/heading 3

* Add flex overrides
  • Loading branch information
sherakama authored and kgcreative committed Jun 20, 2017
1 parent 6b9bddf commit d99b789
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 6 deletions.
2 changes: 1 addition & 1 deletion core/base/_typography.scss
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ $typography__h3:() !default;

h3 {
/*!*/
@include properties($typography__h2--default, $typography__h2);
@include properties($typography__h3--default, $typography__h3);
}

// ---------------------------------------------------------------------------------------------------------------------
Expand Down
5 changes: 4 additions & 1 deletion core/utilities/_decanter-utilities.scss
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,10 @@
////

@import
'functions/decanter-functions'
'bourbon'
, 'neat'
, 'neat-omega'
, 'functions/decanter-functions'
, 'mixins/decanter-mixins'
, 'variables/decanter-variables'
, 'placeholders/decanter-placeholders'
Expand Down
16 changes: 15 additions & 1 deletion core/utilities/mixins/layout/_flex-items-per-row.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
@charset "UTF-8";
// Creates a grid of items, optionally configure flexbox arguments
// Depends on Decanter

@mixin flex-items-per-row
(
Expand Down Expand Up @@ -33,6 +32,21 @@
@if $center-grid == true {
@include nth-omega(#{$items}n);
@include omega('&:last-of-type');

@supports (display: flex) {
// resets omega if display: flex is supported. We don't need it.
$_gutter: _retrieve-neat-setting($neat-grid, gutter);
&:nth-of-type(#{$items}n),
&:last-of-type,
&:last-child,
& {
margin-left: $_gutter / 2;
margin-right: $_gutter / 2;
}
&:nth-of-type(#{$items}n+1) {
clear: initial;
}
}
}
margin-bottom: $_gutter;
}
Expand Down
3 changes: 0 additions & 3 deletions core/utilities/variables/_decanter-variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,11 @@
// Bourbon with decanter custom settings.
@import
'variables-bourbon'
, 'bourbon'
;

// Neat with decanter custom settings.
@import
'variables-neat'
, 'neat'
, 'neat-omega'
;

// Base settings.
Expand Down

0 comments on commit d99b789

Please sign in to comment.