mirrors/bootstrap
2
0
Fork 0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-17 19:21:23 +03:00
Code Activity

Merge branch 'rtl_via_css_flip' of github.com:twbs/bootstrap into rtl_via_css_flip

Browse Source 
Conflicts:
	Gruntfile.js
	package.json
	test-infra/npm-shrinkwrap.canonical.json
This commit is contained in:
Mark Otto
2014-03-03 21:52:56 -08:00
parent 2ece8dd336 d1c971a134
commit af39290a9d
11 changed files with 602 additions and 21630 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gruntfile.js
+23 -4
View File
@@ -192,7 +192,18 @@ module.exports = function (grunt) {
},
files: {
'dist/css/<%= pkg.name %>.min.css': 'dist/css/<%= pkg.name %>.css',
'dist/css/<%= pkg.name %>-theme.min.css': 'dist/css/<%= pkg.name %>-theme.css'
'dist/css/<%= pkg.name %>.rtl.min.css': 'dist/css/<%= pkg.name %>.rtl.css',
'dist/css/<%= pkg.name %>-theme.min.css': 'dist/css/<%= pkg.name %>-theme.css',
'dist/css/<%= pkg.name %>-theme.rtl.min.css': 'dist/css/<%= pkg.name %>-theme.rtl.css'
}
}
},
cssFlip: {
rtl: {
files: {
'dist/css/<%= pkg.name %>.rtl.css': 'dist/css/<%= pkg.name %>.css',
'dist/css/<%= pkg.name %>-theme.rtl.css': 'dist/css/<%= pkg.name %>-theme.css'
}
}
},
@@ -222,9 +233,13 @@ module.exports = function (grunt) {
files: {
src: [
'dist/css/<%= pkg.name %>.css',
'dist/css/<%= pkg.name %>.rtl.css',
'dist/css/<%= pkg.name %>.min.css',
'dist/css/<%= pkg.name %>.rtl.min.css',
'dist/css/<%= pkg.name %>-theme.css',
'dist/css/<%= pkg.name %>-theme.min.css'
'dist/css/<%= pkg.name %>-theme.rtl.css',
'dist/css/<%= pkg.name %>-theme.min.css',
'dist/css/<%= pkg.name %>-theme.rtl.min.css'
]
}
}
@@ -237,7 +252,9 @@ module.exports = function (grunt) {
dist: {
files: {
'dist/css/<%= pkg.name %>.css': 'dist/css/<%= pkg.name %>.css',
'dist/css/<%= pkg.name %>-theme.css': 'dist/css/<%= pkg.name %>-theme.css'
'dist/css/<%= pkg.name %>.rtl.css': 'dist/css/<%= pkg.name %>.rtl.css',
'dist/css/<%= pkg.name %>-theme.css': 'dist/css/<%= pkg.name %>-theme.css',
'dist/css/<%= pkg.name %>-theme.rtl.css': 'dist/css/<%= pkg.name %>-theme.rtl.css'
}
},
examples: {
@@ -375,6 +392,7 @@ module.exports = function (grunt) {
// These plugins provide necessary tasks.
require('load-grunt-tasks')(grunt, {scope: 'devDependencies'});
grunt.loadTasks('./grunt/tasks/');
// Docs HTML validation task
grunt.registerTask('validate-html', ['jekyll', 'validation']);
@@ -402,7 +420,8 @@ module.exports = function (grunt) {
grunt.registerTask('dist-js', ['concat', 'uglify']);
// CSS distribution task.
grunt.registerTask('dist-css', ['less', 'csscomb', 'cssmin', 'usebanner']);
grunt.registerTask('less-compile', ['less:compileCore', 'less:compileTheme']);
grunt.registerTask('dist-css', ['less-compile', 'cssFlip', 'less:minify', 'cssmin', 'csscomb', 'usebanner']);
// Docs distribution task.
grunt.registerTask('dist-docs', 'copy:docs');