2
0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-17 19:21:23 +03:00
This commit is contained in:
Mark Otto
2014-05-12 19:47:53 -07:00
parent 96bdc56fde
commit f5513fd30e
18 changed files with 16 additions and 7551 deletions
+1 -10
View File
@@ -182,7 +182,6 @@ module.exports = function (grunt) {
}, },
files: { files: {
'dist/css/<%= pkg.name %>.min.css': 'dist/css/<%= pkg.name %>.css', 'dist/css/<%= pkg.name %>.min.css': 'dist/css/<%= pkg.name %>.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.min.css': 'dist/css/<%= pkg.name %>-theme.css'
} }
} }
@@ -215,14 +214,6 @@ module.exports = function (grunt) {
} }
}, },
cssflip: {
rtl: {
files: {
'dist/css/<%= pkg.name %>-rtl.css': 'dist/css/<%= pkg.name %>.css'
}
}
},
csslint: { csslint: {
options: { options: {
csslintrc: 'less/.csslintrc' csslintrc: 'less/.csslintrc'
@@ -435,7 +426,7 @@ module.exports = function (grunt) {
// CSS distribution task. // CSS distribution task.
grunt.registerTask('less-compile', ['less:compileCore', 'less:compileTheme']); grunt.registerTask('less-compile', ['less:compileCore', 'less:compileTheme']);
grunt.registerTask('dist-css', ['less-compile', 'autoprefixer', 'cssflip', 'usebanner', 'csscomb', 'less:minify', 'cssmin']); grunt.registerTask('dist-css', ['less-compile', 'autoprefixer', 'usebanner', 'csscomb', 'less:minify', 'cssmin']);
// Docs distribution task. // Docs distribution task.
grunt.registerTask('dist-docs', 'copy:docs'); grunt.registerTask('dist-docs', 'copy:docs');
+1 -1
View File
@@ -1,6 +1,6 @@
# Dependencies # Dependencies
markdown: rdiscount markdown: rdiscount
pygments: true highlighter: pygments
# Permalinks # Permalinks
permalink: pretty permalink: pretty
-7518
View File
File diff suppressed because it is too large Load Diff
File diff suppressed because one or more lines are too long
+1
View File
@@ -3369,6 +3369,7 @@ tbody.collapse.in {
[data-toggle="buttons"] > .btn > input[type="checkbox"] { [data-toggle="buttons"] > .btn > input[type="checkbox"] {
position: absolute; position: absolute;
z-index: -1; z-index: -1;
filter: alpha(opacity=0);
opacity: 0; opacity: 0;
} }
.input-group { .input-group {
+1 -1
View File
File diff suppressed because one or more lines are too long
+1 -1
View File
File diff suppressed because one or more lines are too long
+1 -1
View File
@@ -1990,7 +1990,7 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap\'s JavaScript re
.trigger($.Event(affixType.replace('affix', 'affixed'))) .trigger($.Event(affixType.replace('affix', 'affixed')))
if (affix == 'bottom') { if (affix == 'bottom') {
this.$element.offset({ top: position.top }) this.$element.offset({ top: scrollHeight - this.$element.height() - offsetBottom })
} }
} }
+1 -1
View File
File diff suppressed because one or more lines are too long
+2
View File
@@ -1111,6 +1111,8 @@ h1[id] {
padding: 0; padding: 0;
margin-top: 0; margin-top: 0;
margin-bottom: 0; margin-bottom: 0;
word-break: normal;
word-wrap: nowrap;
white-space: nowrap; white-space: nowrap;
background-color: transparent; background-color: transparent;
border: 0; border: 0;
+1 -1
View File
File diff suppressed because one or more lines are too long
+1 -1
View File
File diff suppressed because one or more lines are too long
+2 -2
View File
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
+1 -1
View File
File diff suppressed because one or more lines are too long
+1 -1
View File
File diff suppressed because one or more lines are too long
+1 -1
View File
File diff suppressed because one or more lines are too long
-1
View File
@@ -49,7 +49,6 @@
"grunt-contrib-uglify": "~0.4.0", "grunt-contrib-uglify": "~0.4.0",
"grunt-contrib-watch": "~0.6.1", "grunt-contrib-watch": "~0.6.1",
"grunt-csscomb": "~2.0.1", "grunt-csscomb": "~2.0.1",
"grunt-css-flip": "~0.2.2",
"grunt-exec": "~0.4.5", "grunt-exec": "~0.4.5",
"grunt-html-validation": "~0.1.15", "grunt-html-validation": "~0.1.15",
"grunt-jekyll": "~0.4.1", "grunt-jekyll": "~0.4.1",