Skip to content
This repository has been archived by the owner on Jul 14, 2023. It is now read-only.

Commit

Permalink
Inherit undefined media grid properties from global neat-grid
Browse files Browse the repository at this point in the history
  • Loading branch information
whmii committed Feb 14, 2017
1 parent 6d0c04a commit f2f3db6
Show file tree
Hide file tree
Showing 4 changed files with 26 additions and 10 deletions.
1 change: 1 addition & 0 deletions core/_neat.scss
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
@import "neat/functions/neat-column-width";
@import "neat/functions/neat-column-ratio";
@import "neat/functions/neat-float-direction";
@import "neat/functions/neat-merge-defaults";
@import "neat/functions/neat-opposite-direction";
@import "neat/functions/neat-parse-columns";
@import "neat/functions/neat-parse-media";
Expand Down
23 changes: 23 additions & 0 deletions core/neat/functions/_neat-merge-defaults.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
@charset "UTF-8";
/// Apply Neat's default properties to undefined values within a map.
///
/// @argument {map} $grid
///
/// @return {map}
///
/// @example scss
/// _retrieve-neat-setting($neat-grid)
///
/// @access private

@function _neat-merge-defaults($grid) {
$_merged-grid: map-merge((
columns: 12,
gutter: 20px,
media: null,
color: rgba(#00d4ff, 0.25),
direction: ltr,
), $grid);

@return $_merged-grid;
}
10 changes: 1 addition & 9 deletions core/neat/functions/_retrieve-neat-settings.scss
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,6 @@
/// @access private

@function _retrieve-neat-setting($grid, $setting) {
$_neat-grid-defaults: map-merge((
columns: 12,
gutter: 20px,
media: null,
color: rgba(#00d4ff, 0.25),
direction: ltr,
), $neat-grid);

$_grid-settings: map-merge($_neat-grid-defaults, $grid);
$_grid-settings: map-merge(_neat-merge-defaults($neat-grid), $grid);
@return map-get($_grid-settings, $setting);
}
2 changes: 1 addition & 1 deletion core/neat/mixins/_grid-media.scss
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@

@media #{$_query} {
$_default-neat-grid: $neat-grid;
$neat-grid: $grid !global;
$neat-grid: map-merge($neat-grid, $grid) !global;
@content;
$neat-grid: $_default-neat-grid !global;
}
Expand Down

0 comments on commit f2f3db6

Please sign in to comment.