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

Foundation 6 #580

Merged
merged 66 commits into from
Dec 5, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
66 commits
Select commit Hold shift + click to select a range
3bb36cf
Add Foundation 6.0.1 and Motion-UI to list of dependencies
olefredrik Nov 20, 2015
70d8f48
Update the build script and get ready for Foundation 6
olefredrik Nov 20, 2015
f55d5b6
Import new foundation styles
olefredrik Nov 20, 2015
56f37b8
Update version numbers to FP 2.0.0-BETA
olefredrik Nov 20, 2015
26d601e
Fix paths in gruntfile for motion-ui and what-input
olefredrik Nov 20, 2015
d6f6015
Fix syntax error in Gruntfile
olefredrik Nov 20, 2015
39de802
Remove misc errors
olefredrik Nov 20, 2015
257118b
Eureka. It is compiling with no errors
olefredrik Nov 20, 2015
0d77536
Correct paths in scss. Add motion-ui to devDependencies
olefredrik Nov 20, 2015
01a8e2a
Update scripts
olefredrik Nov 20, 2015
2d140a4
Navigation - work in progress
olefredrik Nov 21, 2015
1ec0f4b
Make hamburger menu available only on small screens
olefredrik Nov 21, 2015
91f3dc0
Add accordion menu to offCanvas
olefredrik Nov 21, 2015
925510a
Add credit for offcanvas walker
olefredrik Nov 21, 2015
291c544
Add new Foundation 6 hero graphics
olefredrik Nov 21, 2015
00d7721
Concat what-input and motion-ui
olefredrik Nov 22, 2015
b5a79c7
Remove modernizr
olefredrik Nov 22, 2015
ebeb756
Fix margins in featured image template
olefredrik Nov 22, 2015
0fd8e8a
Update kitchen-sink template with F6 components
olefredrik Nov 22, 2015
2f57362
Import motion ui scss
olefredrik Nov 22, 2015
257a68a
Fix typo in Gruntfile. Now possible to cherry-pick js components
olefredrik Nov 22, 2015
5322d1b
Fix markup errors in kitchen-sink template
olefredrik Nov 22, 2015
0b0e4e7
Update kitchen sink template
olefredrik Nov 22, 2015
64ecf38
Enable sticky footer
olefredrik Nov 22, 2015
698f7ff
Various adjustments
olefredrik Nov 22, 2015
276286e
Style the topbar
olefredrik Nov 22, 2015
49aa466
Remove the string-replace task in Gruntfile
olefredrik Nov 24, 2015
227908b
Fix sticky and magellan in kitchen-sink
olefredrik Nov 24, 2015
d503cee
Add padding to sticky menu in kitchen sink
olefredrik Nov 24, 2015
f58b45d
Modify navigation and walkers
olefredrik Dec 2, 2015
b849aae
Add conditional for off-canvas wrapper in header
olefredrik Dec 2, 2015
6cd637c
Add conditional for off-canvas wrapper in footer
olefredrik Dec 2, 2015
d2c4bc7
Two nav options for mobile
olefredrik Dec 2, 2015
57da4fe
Adjustment array of options for off-canvas
olefredrik Dec 2, 2015
2b13fd8
Navigation work in progress
olefredrik Dec 2, 2015
98d8def
Remove direction filters for off-canvas
olefredrik Dec 2, 2015
b6d1d15
Make the hamburger toggle offCanvas
olefredrik Dec 2, 2015
142e7b6
Remove direction settings on custom mobile nav
olefredrik Dec 2, 2015
4e46aa0
Use only one menu walker for both mobile nav layouts
olefredrik Dec 2, 2015
c5d007c
Rename mobile walker
olefredrik Dec 2, 2015
72d3f77
Update foundation to v6.0.4
olefredrik Dec 2, 2015
0030c52
Restructure assets for styling
olefredrik Dec 2, 2015
acd020d
Visual enhancements on menu and front-template
olefredrik Dec 3, 2015
c2788c4
Minor visual tweaks
olefredrik Dec 3, 2015
733a7b1
Front page styling
olefredrik Dec 3, 2015
5753f8d
Design the front page template
olefredrik Dec 4, 2015
34b53bd
Add section divider
olefredrik Dec 4, 2015
daad020
Minify original foundation.js. Remove the .min.js file
olefredrik Dec 4, 2015
d9695cf
Enqueue the correct foundation js file
olefredrik Dec 4, 2015
39acfbd
Use semantic markup on template pages
olefredrik Dec 4, 2015
3618fb3
Simplify sidebar implementation
olefredrik Dec 4, 2015
68f5270
Enqueue typekit instead of adding it directly in head
olefredrik Dec 4, 2015
0f0e70d
Fix formatting errors in menu-walkers
olefredrik Dec 4, 2015
6db3241
Fix Travis-CI build errors
olefredrik Dec 4, 2015
827d573
Fix layout on post templates
olefredrik Dec 4, 2015
9619409
Remove tab-bar flickering on page refresh
olefredrik Dec 4, 2015
e534d00
Add off-canvas-content wrapper
olefredrik Dec 4, 2015
bdbaadb
Add a Motion UI example to kitchen-sink template
olefredrik Dec 5, 2015
60b2026
Update README
olefredrik Dec 5, 2015
241a70b
Update version numbers
olefredrik Dec 5, 2015
057e547
Scope list styling to off-canvas menu
olefredrik Dec 5, 2015
1ebb313
Add some padding to the mobile topbar menu
olefredrik Dec 5, 2015
bb0f217
Add grid column on mobile for fp-intro on front-page
olefredrik Dec 5, 2015
f6383ea
Remove link on h1 - front page template
olefredrik Dec 5, 2015
d99af82
Add correct version number on foundation.js
olefredrik Dec 5, 2015
cf9fb26
Fix merge conflicts
olefredrik Dec 5, 2015
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
373 changes: 200 additions & 173 deletions Gruntfile.js
Original file line number Diff line number Diff line change
@@ -1,171 +1,198 @@
module.exports = function (grunt) {
// time
require('time-grunt')(grunt);

grunt.initConfig({
pkg: grunt.file.readJSON('package.json'),

// Compress and zip only the files required for deployment to the server. Exclude all dev dependencies.
compress: {
main: {
options: {
archive: 'packaged/<%= pkg.name %>' + grunt.template.today('_yyyy-mm-dd_HH-MM') + '.zip',
mode: 'zip'
},
expand: true,
cwd: '.',
src: [
'**/*',
'!**/node_modules/**',
'!**/components/**',
'!**/scss/**',
'!**/bower.json',
'!**/Gruntfile.js',
'!**/package.json',
'!**/composer.json',
'!**/composer.lock',
'!**/codesniffer.ruleset.xml',
'!**/packaged/*'
],
dest: '<%= pkg.name %>'
},
},
sass: {

options: {
// If you can't get source maps to work, run the following command in your terminal:
// $ sass scss/foundation.scss:css/foundation.css --sourcemap
// (see this link for details: http://thesassway.com/intermediate/using-source-maps-with-sass )
sourceMap: true
},

dist: {
options: {
outputStyle: 'compressed'
},
files: {
'assets/stylesheets/foundation.css': 'assets/scss/foundation.scss'
}
}

},

copy: {

scripts: {
expand: true,
cwd: 'assets/components/foundation/js/vendor/',
src: '**',
flatten: 'true',
dest: 'assets/javascript/vendor/'
},

iconfonts: {
expand: true,
cwd: 'assets/components/fontawesome/fonts',
src: ['**'],
dest: 'assets/fonts/'
}

},

concat: {

options: {
separator: ';'
},

dist: {

src: [

// Foundation core
'assets/components/foundation/js/foundation/foundation.js',

// Pick the components you need in your project
'assets/components/foundation/js/foundation/foundation.abide.js',
'assets/components/foundation/js/foundation/foundation.accordion.js',
'assets/components/foundation/js/foundation/foundation.alert.js',
'assets/components/foundation/js/foundation/foundation.clearing.js',
'assets/components/foundation/js/foundation/foundation.dropdown.js',
'assets/components/foundation/js/foundation/foundation.equalizer.js',
'assets/components/foundation/js/foundation/foundation.interchange.js',
'assets/components/foundation/js/foundation/foundation.joyride.js',
'assets/components/foundation/js/foundation/foundation.magellan.js',
'assets/components/foundation/js/foundation/foundation.offcanvas.js',
'assets/components/foundation/js/foundation/foundation.orbit.js',
'assets/components/foundation/js/foundation/foundation.reveal.js',
'assets/components/foundation/js/foundation/foundation.slider.js',
'assets/components/foundation/js/foundation/foundation.tab.js',
'assets/components/foundation/js/foundation/foundation.tooltip.js',
'assets/components/foundation/js/foundation/foundation.topbar.js',

// Include your own custom scripts (located in the custom folder)
'assets/javascript/custom/*.js'

],

// Finally, concatenate all the files above into one single file
dest: 'assets/javascript/foundation.js'

}

},

uglify: {

dist: {
files: {
// Shrink the file size by removing spaces
'assets/javascript/foundation.js': ['assets/javascript/foundation.js']
}
}

},

watch: {
grunt: {files: ['Gruntfile.js']},

sass: {
files: 'assets/scss/**/*.scss',
tasks: ['sass'],
options: {
livereload: true
}
},

js: {
files: 'assets/javascript/custom/**/*.js',
tasks: ['concat', 'uglify'],
options: {
livereload: true
}
},

all: {
files: '**/*.php',
options: {
livereload: true
}
}

},

postcss: {
// time
require('time-grunt')(grunt);

grunt.initConfig({
pkg: grunt.file.readJSON('package.json'),

// Compress and zip only the files required for deployment to the server. Exclude all dev dependencies.
compress: {
main: {
options: {
archive: 'packaged/<%= pkg.name %>' + grunt.template.today('_yyyy-mm-dd_HH-MM') + '.zip',
mode: 'zip'
},
expand: true,
cwd: '.',
src: [
'**/*',
'!**/node_modules/**',
'!**/components/**',
'!**/scss/**',
'!**/bower.json',
'!**/Gruntfile.js',
'!**/package.json',
'!**/composer.json',
'!**/composer.lock',
'!**/codesniffer.ruleset.xml',
'!**/packaged/*'
],
dest: '<%= pkg.name %>'
},
},
sass: {

options: {
// If you can't get source maps to work, run the following command in your terminal:
// $ sass scss/foundation.scss:css/foundation.css --sourcemap
// (see this link for details: http://thesassway.com/intermediate/using-source-maps-with-sass )
sourceMap: true
},

dist: {
options: {
outputStyle: 'compressed'
},
files: {
'assets/stylesheets/foundation.css': 'assets/scss/foundation.scss'
}
}

},

copy: {

motionUi: {
expand: true,
cwd: 'assets/components/motion-ui/',
src: '**',
flatten: 'true',
dest: 'assets/javascript/vendor/motion-ui/'
},

whatInput: {
expand: true,
cwd: 'assets/components/what-input/',
src: '**',
flatten: 'true',
dest: 'assets/javascript/vendor/what-input/'
},

iconfonts: {
expand: true,
cwd: 'assets/components/fontawesome/fonts',
src: ['**'],
dest: 'assets/fonts/'
}

},

concat: {

options: {
separator: ';'
},

dist: {

src: [

// Foundation core
'assets/components/foundation-sites/js/foundation.core.js',

// Foundation utils
'assets/components/foundation-sites/js/foundation.util.box.js',
'assets/components/foundation-sites/js/foundation.util.keyboard.js',
'assets/components/foundation-sites/js/foundation.util.mediaQuery.js',
'assets/components/foundation-sites/js/foundation.util.motion.js',
'assets/components/foundation-sites/js/foundation.util.nest.js',
'assets/components/foundation-sites/js/foundation.util.timerAndImageLoader.js',
'assets/components/foundation-sites/js/foundation.util.touch.js',
'assets/components/foundation-sites/js/foundation.util.triggers.js',

// Foundation components -> Comment out the components you don't need in your project
'assets/components/foundation-sites/js/foundation.abide.js',
'assets/components/foundation-sites/js/foundation.accordion.js',
'assets/components/foundation-sites/js/foundation.accordionMenu.js',
'assets/components/foundation-sites/js/foundation.drilldown.js',
'assets/components/foundation-sites/js/foundation.dropdown.js',
'assets/components/foundation-sites/js/foundation.dropdownMenu.js',
'assets/components/foundation-sites/js/foundation.equalizer.js',
'assets/components/foundation-sites/js/foundation.interchange.js',
'assets/components/foundation-sites/js/foundation.magellan.js',
'assets/components/foundation-sites/js/foundation.offcanvas.js',
'assets/components/foundation-sites/js/foundation.orbit.js',
'assets/components/foundation-sites/js/foundation.responsiveMenu.js',
'assets/components/foundation-sites/js/foundation.responsiveToggle.js',
'assets/components/foundation-sites/js/foundation.reveal.js',
'assets/components/foundation-sites/js/foundation.slider.js',
'assets/components/foundation-sites/js/foundation.sticky.js',
'assets/components/foundation-sites/js/foundation.tabs.js',
'assets/components/foundation-sites/js/foundation.toggler.js',
'assets/components/foundation-sites/js/foundation.tooltip.js',

// Motion UI
'assets/components/motion-ui/motion-ui.js',

// What-input
'assets/components/what-input/what-input.js',

// Include your own custom scripts (located in the custom folder)
'assets/javascript/custom/*.js'

],

// Finally, concatenate all the files above into one single file
dest: 'assets/javascript/foundation.js'

}

},

uglify: {

dist: {
files: {
// Shrink the file size by removing spaces
'assets/javascript/foundation.js': ['assets/javascript/foundation.js']
}
}

},

watch: {
grunt: {files: ['Gruntfile.js']},

sass: {
files: 'assets/scss/**/*.scss',
tasks: ['sass'],
options: {
livereload: true
}
},

js: {
files: 'assets/javascript/custom/**/*.js',
tasks: ['concat', 'uglify'],
options: {
livereload: true
}
},

all: {
files: '**/*.php',
options: {
livereload: true
}
}

},

postcss: {
options: {
map: true,
processors: [
require('pixrem')(), // add fallbacks for rem units
require('pixrem')(), // add fallbacks for rem units
require('autoprefixer')({browsers: 'last 2 versions'}), // add vendor prefixes
require('cssnano')() // minify the result
require('cssnano')() // minify the result
]
},
dist: {
src: 'assets/stylesheets/foundation.css'
}
},
},

browserSync: {
browserSync: {
dev: {
bsFiles: {
src : [
Expand All @@ -181,20 +208,20 @@ module.exports = function (grunt) {
}
}
}
});

grunt.loadNpmTasks('grunt-sass');
grunt.loadNpmTasks('grunt-postcss');
grunt.loadNpmTasks('grunt-contrib-watch');
grunt.loadNpmTasks('grunt-contrib-concat');
grunt.loadNpmTasks('grunt-contrib-copy');
grunt.loadNpmTasks('grunt-contrib-uglify');
grunt.loadNpmTasks('grunt-string-replace');
grunt.loadNpmTasks('grunt-contrib-compress');
grunt.loadNpmTasks('grunt-browser-sync');

grunt.registerTask('package', ['compress:main']);
grunt.registerTask('build', ['copy', 'sass', 'postcss', 'concat', 'uglify']);
grunt.registerTask('browser-sync', ['browserSync', 'watch']);
grunt.registerTask('default', ['watch']);
});

grunt.loadNpmTasks('grunt-sass');
grunt.loadNpmTasks('grunt-postcss');
grunt.loadNpmTasks('grunt-contrib-watch');
grunt.loadNpmTasks('grunt-contrib-concat');
grunt.loadNpmTasks('grunt-contrib-copy');
grunt.loadNpmTasks('grunt-contrib-uglify');
grunt.loadNpmTasks('grunt-string-replace');
grunt.loadNpmTasks('grunt-contrib-compress');
grunt.loadNpmTasks('grunt-browser-sync');

grunt.registerTask('package', ['compress:main']);
grunt.registerTask('build', ['copy', 'sass', 'postcss', 'concat', 'uglify']);
grunt.registerTask('browser-sync', ['browserSync', 'watch']);
grunt.registerTask('default', ['watch']);
};
Loading