Feature #4363: Use foundation-sites instead of foundation

This commit is contained in:
Daniel Molina committed 2016-03-02 16:00:38 +01:00
1 parent 16e0f7cabe
commit 7220983d6b
6 files changed
+661 -2797

No files matched your search

+2 -2
View File
@@ -20,7 +20,7 @@ module.exports = function(grunt) {
sass: {
options: {
includePaths: ['bower_components/foundation/scss']
includePaths: ['bower_components/foundation-sites/scss']
},
dist: {
options: {
@@ -38,7 +38,7 @@ module.exports = function(grunt) {
},
sass: {
files: 'scss/**/*.scss',
files: 'scss/*.scss',
tasks: ['sass']
},
+1 -1
View File
@@ -16,7 +16,7 @@
define(function(require) {
require('jquery');
require('foundation.dropdown');
require('foundation');
var DASHBOARD_TAB_ID = require('tabs/dashboard-tab/tabId');
var SETTINGS_TAB_ID = require('tabs/settings-tab/tabId');
+85 -86
View File
@@ -30,33 +30,28 @@ require.config({
'jgrowl': '../bower_components/jgrowl/jquery.jgrowl',
/* Foundation */
'foundation.core': '../bower_components/foundation/js/foundation/foundation',
'foundation.abide': '../bower_components/foundation/js/foundation/foundation.abide',
'foundation.accordion': '../bower_components/foundation/js/foundation/foundation.accordion',
'foundation.alert': '../bower_components/foundation/js/foundation/foundation.alert',
'foundation.clearing': '../bower_components/foundation/js/foundation/foundation.clearing',
'foundation.dropdown': '../bower_components/foundation/js/foundation/foundation.dropdown',
'foundation.equalizer': '../bower_components/foundation/js/foundation/foundation.equalizer',
'foundation.interchange': '../bower_components/foundation/js/foundation/foundation.interchange',
'foundation.joyride': '../bower_components/foundation/js/foundation/foundation.joyride',
'foundation.magellan': '../bower_components/foundation/js/foundation/foundation.magellan',
'foundation.offcanvas': '../bower_components/foundation/js/foundation/foundation.offcanvas',
'foundation.orbit': '../bower_components/foundation/js/foundation/foundation.orbit',
'foundation.reveal': '../bower_components/foundation/js/foundation/foundation.reveal',
'foundation.slider': '../bower_components/foundation/js/foundation/foundation.slider',
'foundation.tab': '../bower_components/foundation/js/foundation/foundation.tab',
'foundation.tooltip': '../bower_components/foundation/js/foundation/foundation.tooltip',
'foundation.topbar': '../bower_components/foundation/js/foundation/foundation.topbar',
'foundation': '../bower_components/foundation-sites/dist/foundation',
//'foundation.core': '../bower_components/foundation/js/foundation/foundation',
//'foundation.abide': '../bower_components/foundation/js/foundation/foundation.abide',
//'foundation.accordion': '../bower_components/foundation/js/foundation/foundation.accordion',
//'foundation.alert': '../bower_components/foundation/js/foundation/foundation.alert',
//'foundation.clearing': '../bower_components/foundation/js/foundation/foundation.clearing',
//'foundation.dropdown': '../bower_components/foundation/js/foundation/foundation.dropdown',
//'foundation.equalizer': '../bower_components/foundation/js/foundation/foundation.equalizer',
//'foundation.interchange': '../bower_components/foundation/js/foundation/foundation.interchange',
//'foundation.joyride': '../bower_components/foundation/js/foundation/foundation.joyride',
//'foundation.magellan': '../bower_components/foundation/js/foundation/foundation.magellan',
//'foundation.offcanvas': '../bower_components/foundation/js/foundation/foundation.offcanvas',
//'foundation.orbit': '../bower_components/foundation/js/foundation/foundation.orbit',
//'foundation.reveal': '../bower_components/foundation/js/foundation/foundation.reveal',
//'foundation.slider': '../bower_components/foundation/js/foundation/foundation.slider',
//'foundation.tab': '../bower_components/foundation/js/foundation/foundation.tab',
//'foundation.tooltip': '../bower_components/foundation/js/foundation/foundation.tooltip',
//'foundation.topbar': '../bower_components/foundation/js/foundation/foundation.topbar',
/* Handlebars */
'hbs': '../bower_components/require-handlebars-plugin/hbs',
/* Vendor Scripts */
'jquery.cookie': '../bower_components/foundation/js/vendor/jquery.cookie',
'fastclick': '../bower_components/foundation/js/vendor/fastclick',
'modernizr': '../bower_components/foundation/js/vendor/modernizr',
'placeholder': '../bower_components/foundation/js/vendor/placeholder',
/* Resumable */
'resumable': '../bower_components/resumablejs/resumable',
@@ -118,6 +113,7 @@ require.config({
/* Tabs */
'app': {
deps: [
'foundation',
'tabs/provision-tab',
'tabs/dashboard-tab',
'tabs/system-tab',
@@ -165,72 +161,75 @@ require.config({
},
/* Foundation */
'foundation.core': {
deps: ['jquery', 'modernizr'],
exports: 'Foundation'
},
'foundation.abide': {
deps: ['foundation.core']
},
'foundation.accordion': {
deps: ['foundation.core']
},
'foundation.alert': {
deps: ['foundation.core']
},
'foundation.clearing': {
deps: ['foundation.core']
},
'foundation.dropdown': {
deps: ['foundation.core']
},
'foundation.equalizer': {
deps: ['foundation.core']
},
'foundation.interchange': {
deps: ['foundation.core']
},
'foundation.joyride': {
deps: ['foundation.core', 'jquery.cookie']
},
'foundation.magellan': {
deps: ['foundation.core']
},
'foundation.offcanvas': {
deps: ['foundation.core']
},
'foundation.orbit': {
deps: ['foundation.core']
},
'foundation.reveal': {
deps: ['foundation.core']
},
'foundation.slider': {
deps: ['foundation.core']
},
'foundation.tab': {
deps: ['foundation.core']
},
'foundation.tooltip': {
deps: ['foundation.core']
},
'foundation.topbar': {
deps: ['foundation.core']
'foundation': {
deps: ['jquery']
},
//'foundation.core': {
// deps: ['jquery', 'modernizr'],
// exports: 'Foundation'
//},
//'foundation.abide': {
// deps: ['foundation.core']
//},
//'foundation.accordion': {
// deps: ['foundation.core']
//},
//'foundation.alert': {
// deps: ['foundation.core']
//},
//'foundation.clearing': {
// deps: ['foundation.core']
//},
//'foundation.dropdown': {
// deps: ['foundation.core']
//},
//'foundation.equalizer': {
// deps: ['foundation.core']
//},
//'foundation.interchange': {
// deps: ['foundation.core']
//},
//'foundation.joyride': {
// deps: ['foundation.core', 'jquery.cookie']
//},
//'foundation.magellan': {
// deps: ['foundation.core']
//},
//'foundation.offcanvas': {
// deps: ['foundation.core']
//},
//'foundation.orbit': {
// deps: ['foundation.core']
//},
//'foundation.reveal': {
// deps: ['foundation.core']
//},
//'foundation.slider': {
// deps: ['foundation.core']
//},
//'foundation.tab': {
// deps: ['foundation.core']
//},
//'foundation.tooltip': {
// deps: ['foundation.core']
//},
//'foundation.topbar': {
// deps: ['foundation.core']
//},
/* Vendor Scripts */
'jquery.cookie': {
deps: ['jquery']
},
'fastclick': {
exports: 'FastClick'
},
'modernizr': {
exports: 'Modernizr'
},
'placeholder': {
exports: 'Placeholders'
},
//'jquery.cookie': {
// deps: ['jquery']
//},
//'fastclick': {
// exports: 'FastClick'
//},
//'modernizr': {
// exports: 'Modernizr'
//},
//'placeholder': {
// exports: 'Placeholders'
//},
/* Flot Graphs */
'flot': {
+4 -7
View File
@@ -9,7 +9,6 @@
"css/login.css"
],
"dependencies": {
"jquery": "2.1.4",
"flot": "0.8.3",
"jgrowl": "1.4.2",
"fontawesome": "4.3.0",
@@ -21,9 +20,10 @@
"require-handlebars-plugin": "0.11.2",
"almond": "0.3.1",
"datatables": "1.10.7",
"foundation": "5.5.2",
"vis": "4.12.0",
"requirejs": "2.1.22"
"requirejs": "2.1.22",
"foundation-sites": "^6.2.0",
"jquery": "^2.2.1",
},
"version": "4.14",
"authors": [
@@ -41,8 +41,5 @@
"bower_components",
"test",
"tests"
],
"resolutions": {
"foundation": "5.5.1"
}
]
}
File diff suppressed because it is too large. Load diff
File diff suppressed because it is too large. Load diff