Skip to content
This repository has been archived by the owner on Sep 16, 2019. It is now read-only.

Feature/update dependencies #174

Merged
merged 2 commits into from
Dec 16, 2014
Merged

Feature/update dependencies #174

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f439a40
Updated dependencies
olefredrik Dec 16, 2014
af49871
Updated functions scss
olefredrik Dec 16, 2014
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
6 changes: 3 additions & 3 deletions bower_components/foundation/scss/foundation/_functions.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ $rem-base: 16px !default;
$modules: () !default;
@mixin exports($name) {
// Import from global scope
$modules: $modules;
$modules: $modules !global;
// Check if a module is already on the list
$module_index: index($modules, $name);
@if (($module_index == null) or ($module_index == false)) {
$modules: append($modules, $name);
$modules: append($modules, $name) !global;
@content;
}
}
Expand Down Expand Up @@ -143,4 +143,4 @@ $modules: () !default;
// Deprecated: We'll drop support for this in 5.1.0, use rem-calc()
@function em-calc($values){
@return rem-calc($values);
}
}
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "foundationpress",
"version": "5.5.0",
"devDependencies": {
"node-sass": "~0.7.0",
"node-sass" : "~1.2.3",
"grunt": "~0.4.1",
"grunt-contrib-watch": "~0.5.3",
"grunt-sass": "~0.17.0",
Expand Down