diff --git a/css/ebi-global-includes/_ebi_foundation_overides.scss b/css/ebi-global-includes/_ebi_foundation_overides.scss index 52a8bb18af809bf7d38661275ee55dc6fda3e3e7..e8669815b1c89914e8108b57bbafcd1d2864975d 100644 --- a/css/ebi-global-includes/_ebi_foundation_overides.scss +++ b/css/ebi-global-includes/_ebi_foundation_overides.scss @@ -10,7 +10,7 @@ // manually add back the foreground mixin // https://github.com/ebiwd/EBI-Framework/issues/84 -// @import 'libraries/foundation-6/scss/util/util/math'; +// @import 'node_modules/foundation-sites/scss/util/util/math'; /// Checks the lightness of `$color`, and if it passes the `$threshold` of lightness, it returns the `$yes` color. Otherwise, it returns the `$no` color. Use this function to dynamically output a foreground color based on a given background color. /// diff --git a/css/foundation/_settings-common.scss b/css/foundation/_settings-common.scss index 3653624d3139d2c608d1f9aa7e5e64ecd148278a..b4eea727bf5684baba4536481204279d6ccd7e17 100644 --- a/css/foundation/_settings-common.scss +++ b/css/foundation/_settings-common.scss @@ -57,10 +57,10 @@ // and update the @import. // Sass utilities -@import 'libraries/foundation-6/scss/util/util'; +@import 'node_modules/foundation-sites/scss/util/util'; // Global variables and styles -@import 'libraries/foundation-6/scss/global'; +@import 'node_modules/foundation-sites/scss/global'; @import 'css/ebi-global-includes/ebi_theme_settings'; // override foundation with EBI styling @import 'css/ebi-global-includes/badge'; // custom badge class @import 'css/ebi-global-includes/pagination'; // custom badge class @@ -69,51 +69,51 @@ // Include Foundation dependencies in the build // Via: https://github.com/zurb/foundation-sites/issues/9467#issuecomment-267598540 -@import "libraries/foundation-6/_vendor/normalize-scss/sass/normalize"; -@import 'libraries/foundation-6/_vendor/sassy-lists/stylesheets/helpers/missing-dependencies'; -@import 'libraries/foundation-6/_vendor/sassy-lists/stylesheets/helpers/true'; -@import 'libraries/foundation-6/_vendor/sassy-lists/stylesheets/functions/purge'; -@import 'libraries/foundation-6/_vendor/sassy-lists/stylesheets/functions/remove'; -@import 'libraries/foundation-6/_vendor/sassy-lists/stylesheets/functions/replace'; -@import 'libraries/foundation-6/_vendor/sassy-lists/stylesheets/functions/to-list'; +@import 'node_modules/foundation-sites/_vendor/normalize-scss/sass/normalize'; +@import 'node_modules/foundation-sites/_vendor/sassy-lists/stylesheets/helpers/missing-dependencies'; +@import 'node_modules/foundation-sites/_vendor/sassy-lists/stylesheets/helpers/true'; +@import 'node_modules/foundation-sites/_vendor/sassy-lists/stylesheets/functions/purge'; +@import 'node_modules/foundation-sites/_vendor/sassy-lists/stylesheets/functions/remove'; +@import 'node_modules/foundation-sites/_vendor/sassy-lists/stylesheets/functions/replace'; +@import 'node_modules/foundation-sites/_vendor/sassy-lists/stylesheets/functions/to-list'; // Components -@import 'libraries/foundation-6/scss/grid/grid'; -@import 'libraries/foundation-6/scss/typography/typography'; -@import 'libraries/foundation-6/scss/forms/forms'; -@import 'libraries/foundation-6/scss/components/visibility'; -@import 'libraries/foundation-6/scss/components/float'; -@import 'libraries/foundation-6/scss/components/button'; -@import 'libraries/foundation-6/scss/components/button-group'; -@import 'libraries/foundation-6/scss/components/accordion-menu'; -@import 'libraries/foundation-6/scss/components/accordion'; -// @import 'libraries/foundation-6/scss/components/badge'; // EBI override to remove sizing spec -@import 'libraries/foundation-6/scss/components/breadcrumbs'; -@import 'libraries/foundation-6/scss/components/callout'; -@import 'libraries/foundation-6/scss/components/close-button'; -@import 'libraries/foundation-6/scss/components/drilldown'; -@import 'libraries/foundation-6/scss/components/dropdown-menu'; -@import 'libraries/foundation-6/scss/components/dropdown'; -@import 'libraries/foundation-6/scss/components/flex'; -@import 'libraries/foundation-6/scss/components/responsive-embed'; -@import 'libraries/foundation-6/scss/components/label'; -@import 'libraries/foundation-6/scss/components/media-object'; -@import 'libraries/foundation-6/scss/components/menu'; -@import 'libraries/foundation-6/scss/components/menu-icon'; -@import 'libraries/foundation-6/scss/components/off-canvas'; -@import 'libraries/foundation-6/scss/components/orbit'; -// @import 'libraries/foundation-6/scss/components/pagination'; // EBI override -@import 'libraries/foundation-6/scss/components/progress-bar'; -@import 'libraries/foundation-6/scss/components/reveal'; -@import 'libraries/foundation-6/scss/components/slider'; -@import 'libraries/foundation-6/scss/components/sticky'; -@import 'libraries/foundation-6/scss/components/switch'; -@import 'libraries/foundation-6/scss/components/table'; -@import 'libraries/foundation-6/scss/components/tabs'; -@import 'libraries/foundation-6/scss/components/title-bar'; -@import 'libraries/foundation-6/scss/components/top-bar'; -@import 'libraries/foundation-6/scss/components/thumbnail'; -@import 'libraries/foundation-6/scss/components/tooltip'; +@import 'node_modules/foundation-sites/scss/grid/grid'; +@import 'node_modules/foundation-sites/scss/typography/typography'; +@import 'node_modules/foundation-sites/scss/forms/forms'; +@import 'node_modules/foundation-sites/scss/components/visibility'; +@import 'node_modules/foundation-sites/scss/components/float'; +@import 'node_modules/foundation-sites/scss/components/button'; +@import 'node_modules/foundation-sites/scss/components/button-group'; +@import 'node_modules/foundation-sites/scss/components/accordion-menu'; +@import 'node_modules/foundation-sites/scss/components/accordion'; +// @import 'node_modules/foundation-sites/scss/components/badge'; // EBI override to remove sizing spec +@import 'node_modules/foundation-sites/scss/components/breadcrumbs'; +@import 'node_modules/foundation-sites/scss/components/callout'; +@import 'node_modules/foundation-sites/scss/components/close-button'; +@import 'node_modules/foundation-sites/scss/components/drilldown'; +@import 'node_modules/foundation-sites/scss/components/dropdown-menu'; +@import 'node_modules/foundation-sites/scss/components/dropdown'; +@import 'node_modules/foundation-sites/scss/components/flex'; +@import 'node_modules/foundation-sites/scss/components/responsive-embed'; +@import 'node_modules/foundation-sites/scss/components/label'; +@import 'node_modules/foundation-sites/scss/components/media-object'; +@import 'node_modules/foundation-sites/scss/components/menu'; +@import 'node_modules/foundation-sites/scss/components/menu-icon'; +@import 'node_modules/foundation-sites/scss/components/off-canvas'; +@import 'node_modules/foundation-sites/scss/components/orbit'; +// @import 'node_modules/foundation-sites/scss/components/pagination'; // EBI override +@import 'node_modules/foundation-sites/scss/components/progress-bar'; +@import 'node_modules/foundation-sites/scss/components/reveal'; +@import 'node_modules/foundation-sites/scss/components/slider'; +@import 'node_modules/foundation-sites/scss/components/sticky'; +@import 'node_modules/foundation-sites/scss/components/switch'; +@import 'node_modules/foundation-sites/scss/components/table'; +@import 'node_modules/foundation-sites/scss/components/tabs'; +@import 'node_modules/foundation-sites/scss/components/title-bar'; +@import 'node_modules/foundation-sites/scss/components/top-bar'; +@import 'node_modules/foundation-sites/scss/components/thumbnail'; +@import 'node_modules/foundation-sites/scss/components/tooltip'; @import 'libraries/motion-ui/src/motion-ui'; // 1. Global diff --git a/package.json b/package.json index fec17cf96c3d3091c2fa4d417b6fe12579f5d2d5..92b6f5da3915b145b0b753c15f143388dd21877d 100644 --- a/package.json +++ b/package.json @@ -26,7 +26,7 @@ "choices-scss": "node-sass ./libraries/Choices/assets/styles/scss/choices.scss ./libraries/Choices/assets/styles/css/choices.css && csso ./libraries/Choices/assets/styles/css/choices.css --output ./libraries/Choices/assets/styles/css/choices.min.css", "ebi-js": "concat-cli -f js/ebi-global-includes/script/*.js -o js/script.js", "js": "npm run foundation-js && npm run ebi-js", - "foundation-js": "cpx './libraries/foundation-6/dist/js/*.js' ./libraries/foundation-6/js", + "foundation-js": "cpx './node_modules/foundation-sites/js/*.js' ./libraries/foundation-6/js", "//@30": [ "-- Our buildscript: With this line we concat all libraries to be installed at once --" ], @@ -35,7 +35,7 @@ "-- All our libraries, not intended to be run indiviudually --" ], "tablesorter": "wget https://github.com/Mottie/tablesorter/archive/master.zip -d ./libraries/tablesorter.zip && extract-zip ./libraries/tablesorter.zip ./libraries/ && del ./libraries/tablesorter && mve ./libraries/tablesorter-master ./libraries/tablesorter && del ./libraries/tablesorter.zip", - "foundation-update": "wget https://github.com/zurb/foundation-sites/archive/v6.4.2.zip -d ./libraries/foundation-6.zip && del ./libraries/foundation-6 && extract-zip ./libraries/foundation-6.zip ./libraries/foundation-6/ && del ./libraries/foundation-6.zip && echo \"Copying foundation JS files one level up as they've moved...\" && ncp ./libraries/foundation-6/foundation-sites-6.4.2/ ./libraries/foundation-6/ && del ./libraries/foundation-6/foundation-sites-develop/ && echo \"Latest version of foundation downloaded, you'll need to run 'npm run scss' and 'npm run js' to build\"", + "foundation-update": "npm install foundation-sites && echo \"Latest version of foundation downloaded, you'll need to run 'npm run scss' and 'npm run js' to build\"", "motion-ui-update": "wget https://github.com/zurb/motion-ui/archive/v1.2.2.zip -d ./libraries/motion-ui.zip && del ./libraries/motion-ui && extract-zip ./libraries/motion-ui.zip ./libraries/motion-ui/ && del ./libraries/motion-ui.zip && echo \"Copying Motion UI files one level up as they've moved...\" && ncp ./libraries/motion-ui/motion-ui-1.2.2/ ./libraries/motion-ui/ && del ./libraries/motion-ui/motion-ui-master/ && echo \"Latest version of Motion UI downloaded, you'll need to run 'npm run scss' to build\"", "message_finished": "echo \"All done\"" }, @@ -53,6 +53,7 @@ "csso": "^2.1.1", "del-cli": "^0.2.0", "extract-zip": "1.6.0", + "foundation-sites": "^6.4.2", "mve": "^0.1.2", "ncp": "^2.0.0", "node-sass": "^3.4.2",