From eaaaa005207a7918fdc442939b6756c9ac53eec1 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Thu, 1 Jan 2015 01:41:56 -0800 Subject: [PATCH] Integrate mq4-hover-hover-shim --- Gruntfile.js | 15 ++++++++++++++- js/hover.js | 4 ++++ package.json | 2 ++ 3 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 js/hover.js diff --git a/Gruntfile.js b/Gruntfile.js index a6fe954767..341c36ebda 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -19,6 +19,7 @@ module.exports = function (grunt) { var path = require('path'); var glob = require('glob'); var npmShrinkwrap = require('npm-shrinkwrap'); + var mq4HoverShim = require('mq4-hover-hover-shim'); var generateCommonJSModule = require('./grunt/bs-commonjs-generator.js'); var configBridge = grunt.file.readJSON('./grunt/configBridge.json', { encoding: 'utf8' }); @@ -107,6 +108,8 @@ module.exports = function (grunt) { }, bootstrap: { src: [ + 'js/hover.js', + mq4HoverShim.featureDetector.umdGlobal, 'js/transition.js', 'js/alert.js', 'js/button.js', @@ -153,6 +156,16 @@ module.exports = function (grunt) { } }, + postcss: { + options: { + map: true, + processors: [mq4HoverShim.postprocessorFor({hoverSelectorPrefix: '.bs-true-hover '})] + }, + core: { + src: 'dist/css/<%= pkg.name %>.css' + } + }, + autoprefixer: { options: { browsers: [ @@ -392,7 +405,7 @@ module.exports = function (grunt) { })(process.env.TWBS_SASS || 'libsass'); grunt.registerTask('sass-compile', ['sass:core', 'sass:docs']); - grunt.registerTask('dist-css', ['sass-compile', 'autoprefixer:core', 'usebanner', 'csscomb:dist', 'cssmin:core', 'cssmin:docs']); + grunt.registerTask('dist-css', ['sass-compile', 'postcss:core', 'autoprefixer:core', 'usebanner', 'csscomb:dist', 'cssmin:core', 'cssmin:docs']); // Full distribution task. grunt.registerTask('dist', ['clean:dist', 'dist-css', 'dist-js']); diff --git a/js/hover.js b/js/hover.js new file mode 100644 index 0000000000..50ba777681 --- /dev/null +++ b/js/hover.js @@ -0,0 +1,4 @@ +$(document).on('mq4hsChange', function (e) { + 'use strict'; + $(document.documentElement).toggleClass('bs-true-hover', e.trueHover); +}); diff --git a/package.json b/package.json index 37e156ab98..5cf0d04ddf 100644 --- a/package.json +++ b/package.json @@ -54,12 +54,14 @@ "grunt-html-validation": "~0.1.18", "grunt-jekyll": "~0.4.2", "grunt-jscs": "~1.2.0", + "grunt-postcss": "^0.3.0", "grunt-sass": "~0.17.0", "grunt-saucelabs": "~8.5.0", "grunt-scss-lint": "^0.3.4", "grunt-sed": "~0.1.1", "load-grunt-tasks": "~2.0.0", "markdown-it": "^3.0.4", + "mq4-hover-hover-shim": "0.0.4", "npm-shrinkwrap": "^200.0.0", "time-grunt": "~1.0.0" },