]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
Integrate mq4-hover-hover-shim
authorChris Rebert <code@rebertia.com>
Thu, 1 Jan 2015 09:41:56 +0000 (01:41 -0800)
committerChris Rebert <code@rebertia.com>
Thu, 22 Jan 2015 19:37:37 +0000 (11:37 -0800)
Gruntfile.js
js/hover.js [new file with mode: 0644]
package.json

index a6fe95476793a9e9fca8bee4d1bed808810a3fe8..341c36ebda6063d3d11ae1f642e262232666c437 100644 (file)
@@ -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 (file)
index 0000000..50ba777
--- /dev/null
@@ -0,0 +1,4 @@
+$(document).on('mq4hsChange', function (e) {
+  'use strict';
+  $(document.documentElement).toggleClass('bs-true-hover', e.trueHover);
+});
index 37e156ab98da0ae67818b21de3d57f015f715d99..5cf0d04ddf1891b008571a0c1cb094705bc6eda4 100644 (file)
     "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"
   },