diff options
| author | Mark Otto <[email protected]> | 2014-10-26 22:31:59 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-10-26 22:31:59 -0700 |
| commit | d6b0f45fb711989cb8ac32f6717d6920ef5c68e0 (patch) | |
| tree | 48f08aacd9aadf5cf6fe9aaeeebfa6eb7fab26d0 /less/_progress.less | |
| parent | d1660ad0788fa4e9b0d072323c1d70f9c6f5dbf2 (diff) | |
| parent | 66bb0b4fc963fec42e7168f40b18703d3f31bfa8 (diff) | |
| download | bootstrap-d6b0f45fb711989cb8ac32f6717d6920ef5c68e0.tar.xz bootstrap-d6b0f45fb711989cb8ac32f6717d6920ef5c68e0.zip | |
Merge branch 'master' into derp
Conflicts:
Gruntfile.js
dist/css/bootstrap-theme.css
dist/css/bootstrap-theme.css.map
dist/css/bootstrap-theme.min.css
dist/css/bootstrap.css
dist/css/bootstrap.css.map
dist/css/bootstrap.min.css
docs/_includes/components/dropdowns.html
docs/_includes/components/media.html
docs/_includes/components/navs.html
docs/_includes/components/progress-bars.html
docs/_includes/components/responsive-embed.html
docs/_includes/css/buttons.html
docs/_includes/css/forms.html
docs/_includes/css/less.html
docs/_includes/css/overview.html
docs/_includes/css/responsive-utilities.html
docs/_includes/customizer-variables.html
docs/_includes/getting-started/browser-device-support.html
docs/_includes/getting-started/grunt.html
docs/_includes/getting-started/template.html
docs/_includes/header.html
docs/_includes/js/alerts.html
docs/_includes/js/buttons.html
docs/_includes/js/carousel.html
docs/_includes/js/collapse.html
docs/_includes/js/dropdowns.html
docs/_includes/js/modal.html
docs/_includes/js/popovers.html
docs/_includes/js/scrollspy.html
docs/_includes/js/tabs.html
docs/_includes/js/tooltips.html
docs/_includes/nav/components.html
docs/_includes/nav/getting-started.html
docs/_layouts/default.html
docs/about.html
docs/assets/css/docs.min.css
docs/assets/css/src/docs.css
docs/assets/js/customize.min.js
docs/assets/js/docs.min.js
docs/assets/js/raw-files.min.js
docs/browser-bugs.html
docs/components.html
docs/components/navbar.md
docs/css.html
docs/dist/css/bootstrap-theme.css
docs/dist/css/bootstrap-theme.css.map
docs/dist/css/bootstrap-theme.min.css
docs/dist/css/bootstrap.css
docs/dist/css/bootstrap.css.map
docs/dist/css/bootstrap.min.css
docs/examples/blog/index.html
docs/examples/carousel/index.html
docs/examples/cover/index.html
docs/examples/dashboard/index.html
docs/examples/grid/index.html
docs/examples/jumbotron-narrow/index.html
docs/examples/jumbotron/index.html
docs/examples/justified-nav/index.html
docs/examples/navbar-fixed-top/index.html
docs/examples/navbar-static-top/index.html
docs/examples/navbar/index.html
docs/examples/non-responsive/index.html
docs/examples/offcanvas/index.html
docs/examples/signin/index.html
docs/examples/starter-template/index.html
docs/examples/sticky-footer-navbar/index.html
docs/examples/sticky-footer/index.html
docs/examples/theme/index.html
docs/examples/tooltip-viewport/index.html
docs/getting-started.html
docs/javascript.html
docs/migration.html
less/_animation.less
less/_modal.less
less/_navbar.less
less/_variables.less
less/glyphicons.less
less/navs.less
less/panels.less
less/progress-bars.less
Diffstat (limited to 'less/_progress.less')
| -rw-r--r-- | less/_progress.less | 56 |
1 files changed, 26 insertions, 30 deletions
diff --git a/less/_progress.less b/less/_progress.less index 4c34dbee9..93038a199 100644 --- a/less/_progress.less +++ b/less/_progress.less @@ -51,42 +51,38 @@ border-top-left-radius: @border-radius-base; border-bottom-left-radius: @border-radius-base; } -.progress[value="0"]::-webkit-progress-value { - color: @gray-light; - min-width: 2rem; - background-color: transparent; - background-image: none; -} .progress[value="100"]::-webkit-progress-value { border-top-right-radius: @border-radius-base; border-bottom-right-radius: @border-radius-base; } // Firefox styles must be entirely separate or it busts Webkit styles. -/* Commented out for now because linter. -@-moz-document url-prefix() { - .progress[value] { - background-color: #eee; - .border-radius(@border-radius-base); - .box-shadow(inset 0 .1rem .1rem rgba(0,0,0,.1)); - } - .progress[value]::-moz-progress-bar { - background-color: #0074d9; - border-top-left-radius: @border-radius-base; - border-bottom-left-radius: @border-radius-base; - } - .progress[value="0"]::-moz-progress-bar { - color: @gray-light; - min-width: 2rem; - background-color: transparent; - background-image: none; - } - .progress[value="100"]::-moz-progress-bar { - border-top-right-radius: @border-radius-base; - border-bottom-right-radius: @border-radius-base; - } -} -*/ +// +// Commented out for now because linter. +// +// @-moz-document url-prefix() { +// .progress[value] { +// background-color: #eee; +// .border-radius(@border-radius-base); +// .box-shadow(inset 0 .1rem .1rem rgba(0,0,0,.1)); +// } +// .progress[value]::-moz-progress-bar { +// background-color: #0074d9; +// border-top-left-radius: @border-radius-base; +// border-bottom-left-radius: @border-radius-base; +// } +// .progress[value="0"]::-moz-progress-bar { +// color: @gray-light; +// min-width: 2rem; +// background-color: transparent; +// background-image: none; +// } +// .progress[value="100"]::-moz-progress-bar { +// border-top-right-radius: @border-radius-base; +// border-bottom-right-radius: @border-radius-base; +// } +// } + // IE9 hacks to accompany custom markup. We don't need to scope this via media queries, but I feel better doing it anyway. @media screen and (~"min-width:0\0") { .progress { |
