From: Mark Otto <otto@github.com>
Date: Wed, 18 Dec 2013 18:22:18 +0000 (-0800)
Subject: Merge branch 'master' into css-source-maps
X-Git-Tag: v3.1.0~145^2~1^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1bc8607bdffe641d58191084b214138a98aba229;p=thirdparty%2Fbootstrap.git

Merge branch 'master' into css-source-maps

Conflicts:
	Gruntfile.js
---

1bc8607bdffe641d58191084b214138a98aba229
diff --cc Gruntfile.js
index efe5918fb1,5ba8abbfb9..ab4b56cd26
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@@ -111,25 -113,12 +113,27 @@@ module.exports = function (grunt) 
      },
  
      less: {
 -      compile: {
 +      compileCore: {
          options: {
 -          strictMath: true
++          strictMath: true,
 +          sourceMap: true,
 +          outputSourceFiles: true,
 +          sourceMapURL: '<%= pkg.name %>.css.map',
 +          sourceMapFilename: 'dist/css/<%= pkg.name %>.css.map'
 +        },
 +        files: {
 +          'dist/css/<%= pkg.name %>.css': 'less/bootstrap.less'
 +        }
 +      },
 +      compileTheme: {
 +        options: {
++          strictMath: true,
 +          sourceMap: true,
 +          outputSourceFiles: true,
 +          sourceMapURL: '<%= pkg.name %>-theme.css.map',
 +          sourceMapFilename: 'dist/css/<%= pkg.name %>-theme.css.map'
          },
          files: {
 -          'dist/css/<%= pkg.name %>.css': 'less/bootstrap.less',
            'dist/css/<%= pkg.name %>-theme.css': 'less/theme.less'
          }
        },