Commit a63c066e authored by Mark Otto's avatar Mark Otto

rearrange a few things; drop compiled theme file

parent cdbd104c
...@@ -159,18 +159,6 @@ module.exports = function (grunt) { ...@@ -159,18 +159,6 @@ module.exports = function (grunt) {
'dist/css/<%= pkg.name %>.css': 'less/bootstrap.less' '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 %>-theme.css': 'less/theme.less'
}
},
compileDocs: { compileDocs: {
options: { options: {
strictMath: true strictMath: true
...@@ -200,12 +188,6 @@ module.exports = function (grunt) { ...@@ -200,12 +188,6 @@ module.exports = function (grunt) {
}, },
src: 'dist/css/<%= pkg.name %>.css' src: 'dist/css/<%= pkg.name %>.css'
}, },
theme: {
options: {
map: true
},
src: 'dist/css/<%= pkg.name %>-theme.css'
},
docs: { docs: {
src: 'docs/assets/css/docs.min.css' src: 'docs/assets/css/docs.min.css'
}, },
...@@ -222,8 +204,7 @@ module.exports = function (grunt) { ...@@ -222,8 +204,7 @@ module.exports = function (grunt) {
csslintrc: 'less/.csslintrc' csslintrc: 'less/.csslintrc'
}, },
src: [ src: [
'dist/css/bootstrap.css', 'dist/css/bootstrap.css'
'dist/css/bootstrap-theme.css'
], ],
examples: [ examples: [
'docs/examples/**/*.css' 'docs/examples/**/*.css'
...@@ -245,8 +226,7 @@ module.exports = function (grunt) { ...@@ -245,8 +226,7 @@ module.exports = function (grunt) {
}, },
core: { core: {
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 %>-theme.min.css': 'dist/css/<%= pkg.name %>-theme.css'
} }
}, },
docs: { docs: {
...@@ -439,7 +419,7 @@ module.exports = function (grunt) { ...@@ -439,7 +419,7 @@ module.exports = function (grunt) {
grunt.registerTask('dist-js', ['concat', 'uglify']); grunt.registerTask('dist-js', ['concat', 'uglify']);
// CSS distribution task. // CSS distribution task.
grunt.registerTask('less-compile', ['less:compileCore', 'less:compileTheme']); grunt.registerTask('less-compile', ['less:compileCore']);
grunt.registerTask('dist-css', ['less-compile', 'autoprefixer', 'usebanner', 'csscomb', 'cssmin']); grunt.registerTask('dist-css', ['less-compile', 'autoprefixer', 'usebanner', 'csscomb', 'cssmin']);
// Docs distribution task. // Docs distribution task.
...@@ -449,7 +429,7 @@ module.exports = function (grunt) { ...@@ -449,7 +429,7 @@ module.exports = function (grunt) {
grunt.registerTask('dist', ['clean', 'dist-css', 'dist-js', 'dist-docs']); grunt.registerTask('dist', ['clean', 'dist-css', 'dist-js', 'dist-docs']);
// Custom docs rebuild task. // Custom docs rebuild task.
grunt.registerTask('build', ['clean', 'less-compile', 'autoprefixer:core', 'autoprefixer:theme', 'autoprefixer:docs', 'usebanner', 'csscomb:dist', 'cssmin:core', 'cssmin:docs', 'concat', 'uglify:bootstrap', 'dist-docs']); grunt.registerTask('build', ['clean', 'less-compile', 'autoprefixer:core', 'autoprefixer:docs', 'usebanner', 'csscomb:dist', 'cssmin:core', 'cssmin:docs', 'concat', 'uglify:bootstrap', 'dist-docs']);
// Default task. // Default task.
grunt.registerTask('default', ['test', 'dist']); grunt.registerTask('default', ['test', 'dist']);
......
This diff is collapsed.
This diff was suppressed by a .gitattributes entry.
This diff is collapsed.
This diff is collapsed.
This diff was suppressed by a .gitattributes entry.
This source diff could not be displayed because it is too large. You can view the blob instead.
This diff is collapsed.
This diff is collapsed.
This diff was suppressed by a .gitattributes entry.
This diff is collapsed.
...@@ -326,6 +326,8 @@ img { ...@@ -326,6 +326,8 @@ img {
background-color: #fff; background-color: #fff;
border: 1px solid #ddd; border: 1px solid #ddd;
border-radius: .2rem; border-radius: .2rem;
-webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, .075);
box-shadow: 0 1px 2px rgba(0, 0, 0, .075);
-webkit-transition: all .2s ease-in-out; -webkit-transition: all .2s ease-in-out;
-o-transition: all .2s ease-in-out; -o-transition: all .2s ease-in-out;
transition: all .2s ease-in-out; transition: all .2s ease-in-out;
...@@ -2139,6 +2141,8 @@ fieldset[disabled] .btn { ...@@ -2139,6 +2141,8 @@ fieldset[disabled] .btn {
color: #fff; color: #fff;
background-color: #027de7; background-color: #027de7;
border-color: #026fce; border-color: #026fce;
-webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, .15), 0 1px 1px rgba(0, 0, 0, .075);
box-shadow: inset 0 1px 0 rgba(255, 255, 255, .15), 0 1px 1px rgba(0, 0, 0, .075);
} }
.btn-primary:hover, .btn-primary:hover,
.btn-primary:focus, .btn-primary:focus,
...@@ -2154,6 +2158,8 @@ fieldset[disabled] .btn { ...@@ -2154,6 +2158,8 @@ fieldset[disabled] .btn {
.btn-primary.active, .btn-primary.active,
.open > .dropdown-toggle.btn-primary { .open > .dropdown-toggle.btn-primary {
background-image: none; background-image: none;
-webkit-box-shadow: inset 0 3px 5px rgba(0, 0, 0, .125);
box-shadow: inset 0 3px 5px rgba(0, 0, 0, .125);
} }
.btn-primary.disabled, .btn-primary.disabled,
.btn-primary[disabled], .btn-primary[disabled],
...@@ -2184,6 +2190,8 @@ fieldset[disabled] .btn-primary.active { ...@@ -2184,6 +2190,8 @@ fieldset[disabled] .btn-primary.active {
color: #373a3c; color: #373a3c;
background-color: #fff; background-color: #fff;
border-color: #eceeef; border-color: #eceeef;
-webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, .15), 0 1px 1px rgba(0, 0, 0, .075);
box-shadow: inset 0 1px 0 rgba(255, 255, 255, .15), 0 1px 1px rgba(0, 0, 0, .075);
} }
.btn-secondary:hover, .btn-secondary:hover,
.btn-secondary:focus, .btn-secondary:focus,
...@@ -2199,6 +2207,8 @@ fieldset[disabled] .btn-primary.active { ...@@ -2199,6 +2207,8 @@ fieldset[disabled] .btn-primary.active {
.btn-secondary.active, .btn-secondary.active,
.open > .dropdown-toggle.btn-secondary { .open > .dropdown-toggle.btn-secondary {
background-image: none; background-image: none;
-webkit-box-shadow: inset 0 3px 5px rgba(0, 0, 0, .125);
box-shadow: inset 0 3px 5px rgba(0, 0, 0, .125);
} }
.btn-secondary.disabled, .btn-secondary.disabled,
.btn-secondary[disabled], .btn-secondary[disabled],
...@@ -2229,6 +2239,8 @@ fieldset[disabled] .btn-secondary.active { ...@@ -2229,6 +2239,8 @@ fieldset[disabled] .btn-secondary.active {
color: #fff; color: #fff;
background-color: #5bc0de; background-color: #5bc0de;
border-color: #46b8da; border-color: #46b8da;
-webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, .15), 0 1px 1px rgba(0, 0, 0, .075);
box-shadow: inset 0 1px 0 rgba(255, 255, 255, .15), 0 1px 1px rgba(0, 0, 0, .075);
} }
.btn-info:hover, .btn-info:hover,
.btn-info:focus, .btn-info:focus,
...@@ -2244,6 +2256,8 @@ fieldset[disabled] .btn-secondary.active { ...@@ -2244,6 +2256,8 @@ fieldset[disabled] .btn-secondary.active {
.btn-info.active, .btn-info.active,
.open > .dropdown-toggle.btn-info { .open > .dropdown-toggle.btn-info {
background-image: none; background-image: none;
-webkit-box-shadow: inset 0 3px 5px rgba(0, 0, 0, .125);
box-shadow: inset 0 3px 5px rgba(0, 0, 0, .125);
} }
.btn-info.disabled, .btn-info.disabled,
.btn-info[disabled], .btn-info[disabled],
...@@ -2274,6 +2288,8 @@ fieldset[disabled] .btn-info.active { ...@@ -2274,6 +2288,8 @@ fieldset[disabled] .btn-info.active {
color: #fff; color: #fff;
background-color: #5cb85c; background-color: #5cb85c;
border-color: #4cae4c; border-color: #4cae4c;
-webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, .15), 0 1px 1px rgba(0, 0, 0, .075);
box-shadow: inset 0 1px 0 rgba(255, 255, 255, .15), 0 1px 1px rgba(0, 0, 0, .075);
} }
.btn-success:hover, .btn-success:hover,
.btn-success:focus, .btn-success:focus,
...@@ -2289,6 +2305,8 @@ fieldset[disabled] .btn-info.active { ...@@ -2289,6 +2305,8 @@ fieldset[disabled] .btn-info.active {
.btn-success.active, .btn-success.active,
.open > .dropdown-toggle.btn-success { .open > .dropdown-toggle.btn-success {
background-image: none; background-image: none;
-webkit-box-shadow: inset 0 3px 5px rgba(0, 0, 0, .125);
box-shadow: inset 0 3px 5px rgba(0, 0, 0, .125);
} }
.btn-success.disabled, .btn-success.disabled,
.btn-success[disabled], .btn-success[disabled],
...@@ -2319,6 +2337,8 @@ fieldset[disabled] .btn-success.active { ...@@ -2319,6 +2337,8 @@ fieldset[disabled] .btn-success.active {
color: #fff; color: #fff;
background-color: #f0ad4e; background-color: #f0ad4e;
border-color: #eea236; border-color: #eea236;
-webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, .15), 0 1px 1px rgba(0, 0, 0, .075);
box-shadow: inset 0 1px 0 rgba(255, 255, 255, .15), 0 1px 1px rgba(0, 0, 0, .075);
} }
.btn-warning:hover, .btn-warning:hover,
.btn-warning:focus, .btn-warning:focus,
...@@ -2334,6 +2354,8 @@ fieldset[disabled] .btn-success.active { ...@@ -2334,6 +2354,8 @@ fieldset[disabled] .btn-success.active {
.btn-warning.active, .btn-warning.active,
.open > .dropdown-toggle.btn-warning { .open > .dropdown-toggle.btn-warning {
background-image: none; background-image: none;
-webkit-box-shadow: inset 0 3px 5px rgba(0, 0, 0, .125);
box-shadow: inset 0 3px 5px rgba(0, 0, 0, .125);
} }
.btn-warning.disabled, .btn-warning.disabled,
.btn-warning[disabled], .btn-warning[disabled],
...@@ -2364,6 +2386,8 @@ fieldset[disabled] .btn-warning.active { ...@@ -2364,6 +2386,8 @@ fieldset[disabled] .btn-warning.active {
color: #fff; color: #fff;
background-color: #d9534f; background-color: #d9534f;
border-color: #d43f3a; border-color: #d43f3a;
-webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, .15), 0 1px 1px rgba(0, 0, 0, .075);
box-shadow: inset 0 1px 0 rgba(255, 255, 255, .15), 0 1px 1px rgba(0, 0, 0, .075);
} }
.btn-danger:hover, .btn-danger:hover,
.btn-danger:focus, .btn-danger:focus,
...@@ -2379,6 +2403,8 @@ fieldset[disabled] .btn-warning.active { ...@@ -2379,6 +2403,8 @@ fieldset[disabled] .btn-warning.active {
.btn-danger.active, .btn-danger.active,
.open > .dropdown-toggle.btn-danger { .open > .dropdown-toggle.btn-danger {
background-image: none; background-image: none;
-webkit-box-shadow: inset 0 3px 5px rgba(0, 0, 0, .125);
box-shadow: inset 0 3px 5px rgba(0, 0, 0, .125);
} }
.btn-danger.disabled, .btn-danger.disabled,
.btn-danger[disabled], .btn-danger[disabled],
......
This diff was suppressed by a .gitattributes entry.
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -9,6 +9,11 @@ ...@@ -9,6 +9,11 @@
box-shadow: @arguments; box-shadow: @arguments;
} }
.render-gradient(@start; @end) when (@enable-gradients = true) {
#gradient > .vertical(@start-color: @start; @end-color: @end);
background-color: @end;
}
// Utilities // Utilities
@import "mixins/hide-text.less"; @import "mixins/hide-text.less";
......
...@@ -7,6 +7,8 @@ ...@@ -7,6 +7,8 @@
color: @color; color: @color;
background-color: @background; background-color: @background;
border-color: @border; border-color: @border;
@shadow: inset 0 1px 0 rgba(255,255,255,.15), 0 1px 1px rgba(0,0,0,.075);
.box-shadow(@shadow);
&:hover, &:hover,
&:focus, &:focus,
...@@ -21,7 +23,9 @@ ...@@ -21,7 +23,9 @@
&:active, &:active,
&.active, &.active,
.open > .dropdown-toggle& { .open > .dropdown-toggle& {
// Remove the gradient for the pressed/active state
background-image: none; background-image: none;
.box-shadow(inset 0 3px 5px rgba(0,0,0,.125));
} }
&.disabled, &.disabled,
&[disabled], &[disabled],
......
...@@ -82,7 +82,7 @@ img { ...@@ -82,7 +82,7 @@ img {
// Rounded corners // Rounded corners
.img-rounded { .img-rounded {
border-radius: @border-radius-large; .border-radius(@border-radius-large);
} }
// Image thumbnails // Image thumbnails
...@@ -93,6 +93,7 @@ img { ...@@ -93,6 +93,7 @@ img {
border: 1px solid @thumbnail-border; border: 1px solid @thumbnail-border;
border-radius: @thumbnail-border-radius; border-radius: @thumbnail-border-radius;
transition: all .2s ease-in-out; transition: all .2s ease-in-out;
.box-shadow(0 1px 2px rgba(0,0,0,.075));
// Keep them at most 100% wide // Keep them at most 100% wide
.img-responsive(inline-block); .img-responsive(inline-block);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment