Commit 41f3af40 authored by Mark Otto's avatar Mark Otto

Merge branch 'derp' into derp_navs

Conflicts:
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	docs/dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.min.css
parents 0e47ce95 87c9ce53
...@@ -170,6 +170,14 @@ module.exports = function (grunt) { ...@@ -170,6 +170,14 @@ module.exports = function (grunt) {
files: { files: {
'dist/css/<%= pkg.name %>-theme.css': 'less/theme.less' 'dist/css/<%= pkg.name %>-theme.css': 'less/theme.less'
} }
},
compileDocs: {
options: {
strictMath: true
},
files: {
'docs/assets/css/docs.min.css': 'docs/assets/less/docs.less'
}
} }
}, },
...@@ -199,7 +207,7 @@ module.exports = function (grunt) { ...@@ -199,7 +207,7 @@ module.exports = function (grunt) {
src: 'dist/css/<%= pkg.name %>-theme.css' src: 'dist/css/<%= pkg.name %>-theme.css'
}, },
docs: { docs: {
src: 'docs/assets/css/src/docs.css' src: 'docs/assets/css/docs.min.css'
}, },
examples: { examples: {
expand: true, expand: true,
...@@ -225,7 +233,7 @@ module.exports = function (grunt) { ...@@ -225,7 +233,7 @@ module.exports = function (grunt) {
ids: false, ids: false,
'overqualified-elements': false 'overqualified-elements': false
}, },
src: 'docs/assets/css/src/docs.css' src: 'docs/assets/css/docs.css'
} }
}, },
...@@ -242,10 +250,7 @@ module.exports = function (grunt) { ...@@ -242,10 +250,7 @@ module.exports = function (grunt) {
} }
}, },
docs: { docs: {
src: [ src: 'docs/assets/css/docs.min.css',
'docs/assets/css/src/docs.css',
'docs/assets/css/src/pygments-manni.css'
],
dest: 'docs/assets/css/docs.min.css' dest: 'docs/assets/css/docs.min.css'
} }
}, },
...@@ -355,6 +360,10 @@ module.exports = function (grunt) { ...@@ -355,6 +360,10 @@ module.exports = function (grunt) {
less: { less: {
files: 'less/*.less', files: 'less/*.less',
tasks: 'less' tasks: 'less'
},
docs: {
files: 'docs/assets/less/*.less',
tasks: 'less'
} }
}, },
......
...@@ -182,7 +182,6 @@ ...@@ -182,7 +182,6 @@
background-color: #c12e2a; background-color: #c12e2a;
background-image: none; background-image: none;
} }
.thumbnail,
.img-thumbnail { .img-thumbnail {
-webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, .075); -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, .075);
box-shadow: 0 1px 2px rgba(0, 0, 0, .075); box-shadow: 0 1px 2px rgba(0, 0, 0, .075);
......
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.
...@@ -43,9 +43,20 @@ ...@@ -43,9 +43,20 @@
</li> </li>
</ul> </ul>
<br> <br>
<button class="btn btn-primary" type="button"> <p>
Messages <span class="badge">4</span> <button class="btn btn-primary btn-lg" type="button">
</button> Large button <span class="badge">4</span>
</button>
<button class="btn btn-primary" type="button">
Button <span class="badge">4</span>
</button>
<button class="btn btn-primary btn-sm" type="button">
Small button <span class="badge">4</span>
</button>
<button class="btn btn-primary btn-xs" type="button">
Extra small <span class="badge">4</span>
</button>
</p>
</div> </div>
{% highlight html %} {% highlight html %}
<ul class="nav nav-pills nav-stacked" role="tablist"> <ul class="nav nav-pills nav-stacked" role="tablist">
......
...@@ -21,31 +21,20 @@ ...@@ -21,31 +21,20 @@
{% endif %} {% endif %}
{% if page.slug == "css" or page.slug == "components" or page.slug == "js" %} {% if page.slug == "css" or page.slug == "components" or page.slug == "js" %}
<!-- Optional Bootstrap Theme --> <!-- Optional Bootstrap Theme -->
{% if site.github %} {% if site.github %}
<link href="data:text/css;charset=utf-8," data-href="../dist/css/bootstrap-theme.min.css" rel="stylesheet" id="bs-theme-stylesheet"> <link href="data:text/css;charset=utf-8," data-href="../dist/css/bootstrap-theme.min.css" rel="stylesheet" id="bs-theme-stylesheet">
{% else %} {% else %}
<link href="data:text/css;charset=utf-8," data-href="../dist/css/bootstrap-theme.css" rel="stylesheet" id="bs-theme-stylesheet"> <link href="data:text/css;charset=utf-8," data-href="../dist/css/bootstrap-theme.css" rel="stylesheet" id="bs-theme-stylesheet">
{% endif %} {% endif %}
{% endif %} {% endif %}
<!-- Documentation extras --> <!-- Documentation extras -->
{% if site.github %}
<link href="../assets/css/docs.min.css" rel="stylesheet"> <link href="../assets/css/docs.min.css" rel="stylesheet">
{% else %}
<link href="../assets/css/src/docs.css" rel="stylesheet">
<link href="../assets/css/src/pygments-manni.css" rel="stylesheet">
{% endif %}
<!--[if lt IE 9]><script src="../assets/js/ie8-responsive-file-warning.js"></script><![endif]-->
<!-- IE10 viewport hack for Surface/desktop Windows 8 bug --> <!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->
<script src="../assets/js/ie10-viewport-bug-workaround.js"></script> <script src="../assets/js/ie10-viewport-bug-workaround.js"></script>
<script src="../assets/js/ie-emulation-modes-warning.js"></script> <script src="../assets/js/ie-emulation-modes-warning.js"></script>
<!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
<!--[if lt IE 9]>
<script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
<script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
<![endif]-->
<!-- Favicons --> <!-- Favicons -->
<link rel="apple-touch-icon-precomposed" href="/apple-touch-icon-precomposed.png"> <link rel="apple-touch-icon-precomposed" href="/apple-touch-icon-precomposed.png">
<link rel="icon" href="/favicon.ico"> <link rel="icon" href="/favicon.ico">
......
...@@ -8,8 +8,7 @@ ...@@ -8,8 +8,7 @@
<span class="icon-bar"></span> <span class="icon-bar"></span>
</button> </button>
<a href="../" class="navbar-brand"> <a href="../" class="navbar-brand">
<span class="visible-xs">Bootstrap</span> Bootstrap
<span class="bs-docs-booticon bs-docs-booticon-md hidden-xs">B</span>
</a> </a>
</div> </div>
<nav class="collapse navbar-collapse bs-sidenav-collapse" role="navigation"> <nav class="collapse navbar-collapse bs-sidenav-collapse" role="navigation">
......
This diff is collapsed.
.hll { background-color: #ffffcc }
/*{ background: #f0f3f3; }*/
.c { color: #999; } /* Comment */
.err { color: #AA0000; background-color: #FFAAAA } /* Error */
.k { color: #006699; } /* Keyword */
.o { color: #555555 } /* Operator */
.cm { color: #999; } /* Comment.Multiline */ /* Edited to remove italics and make into comment */
.cp { color: #009999 } /* Comment.Preproc */
.c1 { color: #999; } /* Comment.Single */
.cs { color: #999; } /* Comment.Special */
.gd { background-color: #FFCCCC; border: 1px solid #CC0000 } /* Generic.Deleted */
.ge { font-style: italic } /* Generic.Emph */
.gr { color: #FF0000 } /* Generic.Error */
.gh { color: #003300; } /* Generic.Heading */
.gi { background-color: #CCFFCC; border: 1px solid #00CC00 } /* Generic.Inserted */
.go { color: #AAAAAA } /* Generic.Output */
.gp { color: #000099; } /* Generic.Prompt */
.gs { } /* Generic.Strong */
.gu { color: #003300; } /* Generic.Subheading */
.gt { color: #99CC66 } /* Generic.Traceback */
.kc { color: #006699; } /* Keyword.Constant */
.kd { color: #006699; } /* Keyword.Declaration */
.kn { color: #006699; } /* Keyword.Namespace */
.kp { color: #006699 } /* Keyword.Pseudo */
.kr { color: #006699; } /* Keyword.Reserved */
.kt { color: #007788; } /* Keyword.Type */
.m { color: #FF6600 } /* Literal.Number */
.s { color: #d44950 } /* Literal.String */
.na { color: #4f9fcf } /* Name.Attribute */
.nb { color: #336666 } /* Name.Builtin */
.nc { color: #00AA88; } /* Name.Class */
.no { color: #336600 } /* Name.Constant */
.nd { color: #9999FF } /* Name.Decorator */
.ni { color: #999999; } /* Name.Entity */
.ne { color: #CC0000; } /* Name.Exception */
.nf { color: #CC00FF } /* Name.Function */
.nl { color: #9999FF } /* Name.Label */
.nn { color: #00CCFF; } /* Name.Namespace */
.nt { color: #2f6f9f; } /* Name.Tag */
.nv { color: #003333 } /* Name.Variable */
.ow { color: #000000; } /* Operator.Word */
.w { color: #bbbbbb } /* Text.Whitespace */
.mf { color: #FF6600 } /* Literal.Number.Float */
.mh { color: #FF6600 } /* Literal.Number.Hex */
.mi { color: #FF6600 } /* Literal.Number.Integer */
.mo { color: #FF6600 } /* Literal.Number.Oct */
.sb { color: #CC3300 } /* Literal.String.Backtick */
.sc { color: #CC3300 } /* Literal.String.Char */
.sd { color: #CC3300; font-style: italic } /* Literal.String.Doc */
.s2 { color: #CC3300 } /* Literal.String.Double */
.se { color: #CC3300; } /* Literal.String.Escape */
.sh { color: #CC3300 } /* Literal.String.Heredoc */
.si { color: #AA0000 } /* Literal.String.Interpol */
.sx { color: #CC3300 } /* Literal.String.Other */
.sr { color: #33AAAA } /* Literal.String.Regex */
.s1 { color: #CC3300 } /* Literal.String.Single */
.ss { color: #FFCC33 } /* Literal.String.Symbol */
.bp { color: #336666 } /* Name.Builtin.Pseudo */
.vc { color: #003333 } /* Name.Variable.Class */
.vg { color: #003333 } /* Name.Variable.Global */
.vi { color: #003333 } /* Name.Variable.Instance */
.il { color: #FF6600 } /* Literal.Number.Integer.Long */
.css .o,
.css .o + .nt,
.css .nt + .nt { color: #999; }
...@@ -21,4 +21,4 @@ var Holder=Holder||{};!function(a,b){function c(a,b,c){b=parseInt(b,10),a=parseI ...@@ -21,4 +21,4 @@ var Holder=Holder||{};!function(a,b){function c(a,b,c){b=parseInt(b,10),a=parseI
* Licensed under the Creative Commons Attribution 3.0 Unported License. For * Licensed under the Creative Commons Attribution 3.0 Unported License. For
* details, see http://creativecommons.org/licenses/by/3.0/. * details, see http://creativecommons.org/licenses/by/3.0/.
*/ */
!function(a){"use strict";a(function(){var b=a(window),c=a(document.body);c.scrollspy({target:".active .bs-docs-sidenav"}),b.on("load",function(){c.scrollspy("refresh")}),a(".bs-docs-container [href=#]").click(function(a){a.preventDefault()}),function(){var b=a("#bs-theme-stylesheet"),c=a(".bs-docs-theme-toggle"),d=function(){b.attr("href",b.attr("data-href")),c.text("Disable theme preview"),localStorage.setItem("previewTheme",!0)};localStorage.getItem("previewTheme")&&d(),c.click(function(){var a=b.attr("href");a&&0!==a.indexOf("data")?(b.attr("href",""),c.text("Preview theme"),localStorage.removeItem("previewTheme")):d()})}(),a(".tooltip-demo").tooltip({selector:'[data-toggle="tooltip"]',container:"body"}),a(".popover-demo").popover({selector:'[data-toggle="popover"]',container:"body"}),a(".tooltip-test").tooltip(),a(".popover-test").popover(),a(".bs-docs-popover").popover(),a(".bs-docs-popover-dismiss").popover({trigger:"focus"}),a("#loading-example-btn").click(function(){var b=a(this);b.button("loading"),setTimeout(function(){b.button("reset")},3e3)}),ZeroClipboard.config({moviePath:"/assets/flash/ZeroClipboard.swf",hoverClass:"btn-clipboard-hover"}),a(".highlight").each(function(){var b=a(this),c=b.prev(),d='<div class="zero-clipboard"><span class="btn-clipboard">Copy</span></div>';c.hasClass("bs-example")?c.before(d.replace(/btn-clipboard/,"btn-clipboard with-example")):b.before(d)});var d=new ZeroClipboard(a(".btn-clipboard")),e=a("#global-zeroclipboard-html-bridge");d.on("load",function(){e.data("placement","top").attr("title","Copy to clipboard").tooltip()}),d.on("dataRequested",function(b){var c=a(this).parent().nextAll(".highlight").first();b.setText(c.text())}),d.on("complete",function(){e.attr("title","Copied!").tooltip("fixTitle").tooltip("show").attr("title","Copy to clipboard").tooltip("fixTitle")}),d.on("noflash wrongflash",function(){e.attr("title","Flash required").tooltip("fixTitle").tooltip("show")})})}(jQuery); !function(a){"use strict";a(function(){var b=a(window),c=a(document.body);c.scrollspy({target:".active .bs-docs-sidenav"}),b.on("load",function(){c.scrollspy("refresh")}),a(".bs-docs-container [href=#]").click(function(a){a.preventDefault()})(function(){var b=a("#bs-theme-stylesheet"),c=a(".bs-docs-theme-toggle"),d=function(){b.attr("href",b.attr("data-href")),c.text("Disable theme preview"),localStorage.setItem("previewTheme",!0)};localStorage.getItem("previewTheme")&&d(),c.click(function(){var a=b.attr("href");a&&0!==a.indexOf("data")?(b.attr("href",""),c.text("Preview theme"),localStorage.removeItem("previewTheme")):d()})}),a(".tooltip-demo").tooltip({selector:'[data-toggle="tooltip"]',container:"body"}),a(".popover-demo").popover({selector:'[data-toggle="popover"]',container:"body"}),a(".tooltip-test").tooltip(),a(".popover-test").popover(),a(".bs-docs-popover").popover(),a(".bs-docs-popover-dismiss").popover({trigger:"focus"}),a("#loading-example-btn").click(function(){var b=a(this);b.button("loading"),setTimeout(function(){b.button("reset")},3e3)}),ZeroClipboard.config({moviePath:"/assets/flash/ZeroClipboard.swf",hoverClass:"btn-clipboard-hover"}),a(".highlight").each(function(){var b=a(this),c=b.prev(),d='<div class="zero-clipboard"><span class="btn-clipboard">Copy</span></div>';c.hasClass("bs-example")?c.before(d.replace(/btn-clipboard/,"btn-clipboard with-example")):b.before(d)});var d=new ZeroClipboard(a(".btn-clipboard")),e=a("#global-zeroclipboard-html-bridge");d.on("load",function(){e.data("placement","top").attr("title","Copy to clipboard").tooltip()}),d.on("dataRequested",function(b){var c=a(this).parent().nextAll(".highlight").first();b.setText(c.text())}),d.on("complete",function(){e.attr("title","Copied!").tooltip("fixTitle").tooltip("show").attr("title","Copy to clipboard").tooltip("fixTitle")}),d.on("noflash wrongflash",function(){e.attr("title","Flash required").tooltip("fixTitle").tooltip("show")})})}(jQuery);
\ No newline at end of file \ No newline at end of file
// NOTICE!! DO NOT USE ANY OF THIS JAVASCRIPT
// IT'S JUST JUNK FOR OUR DOCS!
// ++++++++++++++++++++++++++++++++++++++++++
/*!
* Copyright 2011-2014 Twitter, Inc.
*
* Licensed under the Creative Commons Attribution 3.0 Unported License. For
* details, see http://creativecommons.org/licenses/by/3.0/.
*/
// Intended to prevent false-positive bug reports about responsive styling supposedly not working in IE8.
if (window.location.protocol == 'file:') {
window.alert('ERROR: Bootstrap\'s responsive CSS is disabled!\nSee getbootstrap.com/getting-started/#respond-file-proto for details.')
}
...@@ -32,32 +32,8 @@ ...@@ -32,32 +32,8 @@
e.preventDefault() e.preventDefault()
}) })
// Sidenav affixing
// setTimeout(function () {
// var $sideBar = $('.bs-docs-sidebar')
// $sideBar.affix({
// offset: {
// top: function () {
// var offsetTop = $sideBar.offset().top
// var sideBarMargin = parseInt($sideBar.children(0).css('margin-top'), 10)
// var navOuterHeight = $('.bs-docs-nav').height()
// return (this.top = offsetTop - navOuterHeight - sideBarMargin)
// },
// bottom: function () {
// return (this.bottom = $('.bs-docs-footer').outerHeight(true))
// }
// }
// })
// }, 100)
// setTimeout(function () {
// $('.bs-top').affix()
// }, 100)
// theme toggler // theme toggler
;(function () { (function () {
var stylesheetLink = $('#bs-theme-stylesheet') var stylesheetLink = $('#bs-theme-stylesheet')
var themeBtn = $('.bs-docs-theme-toggle') var themeBtn = $('.bs-docs-theme-toggle')
...@@ -81,7 +57,7 @@ ...@@ -81,7 +57,7 @@
localStorage.removeItem('previewTheme') localStorage.removeItem('previewTheme')
} }
}) })
})(); })
// Tooltip and popover demos // Tooltip and popover demos
$('.tooltip-demo').tooltip({ $('.tooltip-demo').tooltip({
......
.hll { background-color: #ffffcc }
.c { color: #999; }
.err { color: #AA0000; background-color: #FFAAAA }
.k { color: #006699; }
.o { color: #555555 }
.cm { color: #999; }
.cp { color: #009999 }
.c1 { color: #999; }
.cs { color: #999; }
.gd { background-color: #FFCCCC; border: 1px solid #CC0000 }
.ge { font-style: italic }
.gr { color: #FF0000 }
.gh { color: #003300; }
.gi { background-color: #CCFFCC; border: 1px solid #00CC00 }
.go { color: #AAAAAA }
.gp { color: #000099; }
.gu { color: #003300; }
.gt { color: #99CC66 }
.kc { color: #006699; }
.kd { color: #006699; }
.kn { color: #006699; }
.kp { color: #006699 }
.kr { color: #006699; }
.kt { color: #007788; }
.m { color: #FF6600 }
.s { color: #d44950 }
.na { color: #4f9fcf }
.nb { color: #336666 }
.nc { color: #00AA88; }
.no { color: #336600 }
.nd { color: #9999FF }
.ni { color: #999999; }
.ne { color: #CC0000; }
.nf { color: #CC00FF }
.nl { color: #9999FF }
.nn { color: #00CCFF; }
.nt { color: #2f6f9f; }
.nv { color: #003333 }
.ow { color: #000000; }
.w { color: #bbbbbb }
.mf { color: #FF6600 }
.mh { color: #FF6600 }
.mi { color: #FF6600 }
.mo { color: #FF6600 }
.sb { color: #CC3300 }
.sc { color: #CC3300 }
.sd { color: #CC3300; font-style: italic }
.s2 { color: #CC3300 }
.se { color: #CC3300; }
.sh { color: #CC3300 }
.si { color: #AA0000 }
.sx { color: #CC3300 }
.sr { color: #33AAAA }
.s1 { color: #CC3300 }
.ss { color: #FFCC33 }
.bp { color: #336666 }
.vc { color: #003333 }
.vg { color: #003333 }
.vi { color: #003333 }
.il { color: #FF6600 }
.css .o,
.css .o + .nt,
.css .nt + .nt { color: #999; }
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
layout: default layout: default
title: Components title: Components
slug: components slug: components
lead: "Over a dozen reusable components built to provide iconography, dropdowns, input groups, navigation, alerts, and much more." lead: "Over a dozen reusable components built to provide dropdowns, input groups, navigation, alerts, and much more."
--- ---
{% include components/dropdowns.html %} {% include components/dropdowns.html %}
......
...@@ -182,7 +182,6 @@ ...@@ -182,7 +182,6 @@
background-color: #c12e2a; background-color: #c12e2a;
background-image: none; background-image: none;
} }
.thumbnail,
.img-thumbnail { .img-thumbnail {
-webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, .075); -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, .075);
box-shadow: 0 1px 2px rgba(0, 0, 0, .075); box-shadow: 0 1px 2px rgba(0, 0, 0, .075);
......
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.
...@@ -16,18 +16,8 @@ ...@@ -16,18 +16,8 @@
<!-- Custom styles for this template --> <!-- Custom styles for this template -->
<link href="blog.css" rel="stylesheet"> <link href="blog.css" rel="stylesheet">
<!-- Just for debugging purposes. Don't actually copy these 2 lines! -->
<!--[if lt IE 9]><script src="../../assets/js/ie8-responsive-file-warning.js"></script><![endif]-->
<script src="../../assets/js/ie-emulation-modes-warning.js"></script>
<!-- IE10 viewport hack for Surface/desktop Windows 8 bug --> <!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->
<script src="../../assets/js/ie10-viewport-bug-workaround.js"></script> <script src="../../assets/js/ie10-viewport-bug-workaround.js"></script>
<!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
<!--[if lt IE 9]>
<script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
<script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
<![endif]-->
</head> </head>
<body> <body>
......
...@@ -13,19 +13,9 @@ ...@@ -13,19 +13,9 @@
<!-- Bootstrap core CSS --> <!-- Bootstrap core CSS -->
<link href="../../dist/css/bootstrap.min.css" rel="stylesheet"> <link href="../../dist/css/bootstrap.min.css" rel="stylesheet">
<!-- Just for debugging purposes. Don't actually copy these 2 lines! -->
<!--[if lt IE 9]><script src="../../assets/js/ie8-responsive-file-warning.js"></script><![endif]-->
<script src="../../assets/js/ie-emulation-modes-warning.js"></script>
<!-- IE10 viewport hack for Surface/desktop Windows 8 bug --> <!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->
<script src="../../assets/js/ie10-viewport-bug-workaround.js"></script> <script src="../../assets/js/ie10-viewport-bug-workaround.js"></script>
<!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
<!--[if lt IE 9]>
<script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
<script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
<![endif]-->
<!-- Custom styles for this template --> <!-- Custom styles for this template -->
<link href="carousel.css" rel="stylesheet"> <link href="carousel.css" rel="stylesheet">
</head> </head>
......
...@@ -16,18 +16,8 @@ ...@@ -16,18 +16,8 @@
<!-- Custom styles for this template --> <!-- Custom styles for this template -->
<link href="cover.css" rel="stylesheet"> <link href="cover.css" rel="stylesheet">
<!-- Just for debugging purposes. Don't actually copy these 2 lines! -->
<!--[if lt IE 9]><script src="../../assets/js/ie8-responsive-file-warning.js"></script><![endif]-->
<script src="../../assets/js/ie-emulation-modes-warning.js"></script>
<!-- IE10 viewport hack for Surface/desktop Windows 8 bug --> <!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->
<script src="../../assets/js/ie10-viewport-bug-workaround.js"></script> <script src="../../assets/js/ie10-viewport-bug-workaround.js"></script>
<!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
<!--[if lt IE 9]>
<script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
<script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
<![endif]-->
</head> </head>
<body> <body>
......
...@@ -16,18 +16,8 @@ ...@@ -16,18 +16,8 @@
<!-- Custom styles for this template --> <!-- Custom styles for this template -->
<link href="dashboard.css" rel="stylesheet"> <link href="dashboard.css" rel="stylesheet">
<!-- Just for debugging purposes. Don't actually copy these 2 lines! -->
<!--[if lt IE 9]><script src="../../assets/js/ie8-responsive-file-warning.js"></script><![endif]-->
<script src="../../assets/js/ie-emulation-modes-warning.js"></script>
<!-- IE10 viewport hack for Surface/desktop Windows 8 bug --> <!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->
<script src="../../assets/js/ie10-viewport-bug-workaround.js"></script> <script src="../../assets/js/ie10-viewport-bug-workaround.js"></script>
<!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
<!--[if lt IE 9]>
<script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
<script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
<![endif]-->
</head> </head>
<body> <body>
......
...@@ -16,18 +16,8 @@ ...@@ -16,18 +16,8 @@
<!-- Custom styles for this template --> <!-- Custom styles for this template -->
<link href="grid.css" rel="stylesheet"> <link href="grid.css" rel="stylesheet">
<!-- Just for debugging purposes. Don't actually copy these 2 lines! -->
<!--[if lt IE 9]><script src="../../assets/js/ie8-responsive-file-warning.js"></script><![endif]-->
<script src="../../assets/js/ie-emulation-modes-warning.js"></script>
<!-- IE10 viewport hack for Surface/desktop Windows 8 bug --> <!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->
<script src="../../assets/js/ie10-viewport-bug-workaround.js"></script> <script src="../../assets/js/ie10-viewport-bug-workaround.js"></script>
<!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
<!--[if lt IE 9]>
<script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
<script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
<![endif]-->
</head> </head>
<body> <body>
......
...@@ -16,18 +16,8 @@ ...@@ -16,18 +16,8 @@
<!-- Custom styles for this template --> <!-- Custom styles for this template -->
<link href="jumbotron-narrow.css" rel="stylesheet"> <link href="jumbotron-narrow.css" rel="stylesheet">
<!-- Just for debugging purposes. Don't actually copy these 2 lines! -->
<!--[if lt IE 9]><script src="../../assets/js/ie8-responsive-file-warning.js"></script><![endif]-->
<script src="../../assets/js/ie-emulation-modes-warning.js"></script>
<!-- IE10 viewport hack for Surface/desktop Windows 8 bug --> <!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->
<script src="../../assets/js/ie10-viewport-bug-workaround.js"></script> <script src="../../assets/js/ie10-viewport-bug-workaround.js"></script>
<!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
<!--[if lt IE 9]>
<script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
<script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
<![endif]-->
</head> </head>
<body> <body>
......
...@@ -16,18 +16,8 @@ ...@@ -16,18 +16,8 @@
<!-- Custom styles for this template --> <!-- Custom styles for this template -->
<link href="jumbotron.css" rel="stylesheet"> <link href="jumbotron.css" rel="stylesheet">
<!-- Just for debugging purposes. Don't actually copy these 2 lines! -->
<!--[if lt IE 9]><script src="../../assets/js/ie8-responsive-file-warning.js"></script><![endif]-->
<script src="../../assets/js/ie-emulation-modes-warning.js"></script>
<!-- IE10 viewport hack for Surface/desktop Windows 8 bug --> <!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->
<script src="../../assets/js/ie10-viewport-bug-workaround.js"></script> <script src="../../assets/js/ie10-viewport-bug-workaround.js"></script>
<!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
<!--[if lt IE 9]>
<script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
<script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
<![endif]-->
</head> </head>
<body> <body>
......
...@@ -16,18 +16,8 @@ ...@@ -16,18 +16,8 @@
<!-- Custom styles for this template --> <!-- Custom styles for this template -->
<link href="justified-nav.css" rel="stylesheet"> <link href="justified-nav.css" rel="stylesheet">
<!-- Just for debugging purposes. Don't actually copy these 2 lines! -->
<!--[if lt IE 9]><script src="../../assets/js/ie8-responsive-file-warning.js"></script><![endif]-->
<script src="../../assets/js/ie-emulation-modes-warning.js"></script>
<!-- IE10 viewport hack for Surface/desktop Windows 8 bug --> <!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->
<script src="../../assets/js/ie10-viewport-bug-workaround.js"></script> <script src="../../assets/js/ie10-viewport-bug-workaround.js"></script>
<!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
<!--[if lt IE 9]>
<script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
<script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
<![endif]-->
</head> </head>
<body> <body>
......
...@@ -16,18 +16,8 @@ ...@@ -16,18 +16,8 @@
<!-- Custom styles for this template --> <!-- Custom styles for this template -->
<link href="navbar-fixed-top.css" rel="stylesheet"> <link href="navbar-fixed-top.css" rel="stylesheet">
<!-- Just for debugging purposes. Don't actually copy these 2 lines! -->
<!--[if lt IE 9]><script src="../../assets/js/ie8-responsive-file-warning.js"></script><![endif]-->
<script src="../../assets/js/ie-emulation-modes-warning.js"></script>
<!-- IE10 viewport hack for Surface/desktop Windows 8 bug --> <!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->
<script src="../../assets/js/ie10-viewport-bug-workaround.js"></script> <script src="../../assets/js/ie10-viewport-bug-workaround.js"></script>
<!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
<!--[if lt IE 9]>
<script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
<script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
<![endif]-->
</head> </head>
<body> <body>
......
...@@ -16,18 +16,8 @@ ...@@ -16,18 +16,8 @@
<!-- Custom styles for this template --> <!-- Custom styles for this template -->
<link href="navbar-static-top.css" rel="stylesheet"> <link href="navbar-static-top.css" rel="stylesheet">
<!-- Just for debugging purposes. Don't actually copy these 2 lines! -->
<!--[if lt IE 9]><script src="../../assets/js/ie8-responsive-file-warning.js"></script><![endif]-->
<script src="../../assets/js/ie-emulation-modes-warning.js"></script>
<!-- IE10 viewport hack for Surface/desktop Windows 8 bug --> <!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->
<script src="../../assets/js/ie10-viewport-bug-workaround.js"></script> <script src="../../assets/js/ie10-viewport-bug-workaround.js"></script>
<!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
<!--[if lt IE 9]>
<script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
<script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
<![endif]-->
</head> </head>
<body> <body>
......
...@@ -16,18 +16,8 @@ ...@@ -16,18 +16,8 @@
<!-- Custom styles for this template --> <!-- Custom styles for this template -->
<link href="navbar.css" rel="stylesheet"> <link href="navbar.css" rel="stylesheet">
<!-- Just for debugging purposes. Don't actually copy these 2 lines! -->
<!--[if lt IE 9]><script src="../../assets/js/ie8-responsive-file-warning.js"></script><![endif]-->
<script src="../../assets/js/ie-emulation-modes-warning.js"></script>
<!-- IE10 viewport hack for Surface/desktop Windows 8 bug --> <!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->
<script src="../../assets/js/ie10-viewport-bug-workaround.js"></script> <script src="../../assets/js/ie10-viewport-bug-workaround.js"></script>
<!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
<!--[if lt IE 9]>
<script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
<script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
<![endif]-->
</head> </head>
<body> <body>
......
...@@ -18,18 +18,8 @@ ...@@ -18,18 +18,8 @@
<!-- Custom styles for this template --> <!-- Custom styles for this template -->
<link href="non-responsive.css" rel="stylesheet"> <link href="non-responsive.css" rel="stylesheet">
<!-- Just for debugging purposes. Don't actually copy these 2 lines! -->
<!--[if lt IE 9]><script src="../../assets/js/ie8-responsive-file-warning.js"></script><![endif]-->
<script src="../../assets/js/ie-emulation-modes-warning.js"></script>
<!-- IE10 viewport hack for Surface/desktop Windows 8 bug --> <!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->
<script src="../../assets/js/ie10-viewport-bug-workaround.js"></script> <script src="../../assets/js/ie10-viewport-bug-workaround.js"></script>
<!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
<!--[if lt IE 9]>
<script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
<script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
<![endif]-->
</head> </head>
<body> <body>
......
...@@ -16,18 +16,8 @@ ...@@ -16,18 +16,8 @@
<!-- Custom styles for this template --> <!-- Custom styles for this template -->
<link href="offcanvas.css" rel="stylesheet"> <link href="offcanvas.css" rel="stylesheet">
<!-- Just for debugging purposes. Don't actually copy these 2 lines! -->
<!--[if lt IE 9]><script src="../../assets/js/ie8-responsive-file-warning.js"></script><![endif]-->
<script src="../../assets/js/ie-emulation-modes-warning.js"></script>
<!-- IE10 viewport hack for Surface/desktop Windows 8 bug --> <!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->
<script src="../../assets/js/ie10-viewport-bug-workaround.js"></script> <script src="../../assets/js/ie10-viewport-bug-workaround.js"></script>
<!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
<!--[if lt IE 9]>
<script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
<script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
<![endif]-->
</head> </head>
<body> <body>
......
...@@ -16,18 +16,8 @@ ...@@ -16,18 +16,8 @@
<!-- Custom styles for this template --> <!-- Custom styles for this template -->
<link href="signin.css" rel="stylesheet"> <link href="signin.css" rel="stylesheet">
<!-- Just for debugging purposes. Don't actually copy these 2 lines! -->
<!--[if lt IE 9]><script src="../../assets/js/ie8-responsive-file-warning.js"></script><![endif]-->
<script src="../../assets/js/ie-emulation-modes-warning.js"></script>
<!-- IE10 viewport hack for Surface/desktop Windows 8 bug --> <!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->
<script src="../../assets/js/ie10-viewport-bug-workaround.js"></script> <script src="../../assets/js/ie10-viewport-bug-workaround.js"></script>
<!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
<!--[if lt IE 9]>
<script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
<script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
<![endif]-->
</head> </head>
<body> <body>
......
...@@ -16,18 +16,8 @@ ...@@ -16,18 +16,8 @@
<!-- Custom styles for this template --> <!-- Custom styles for this template -->
<link href="starter-template.css" rel="stylesheet"> <link href="starter-template.css" rel="stylesheet">
<!-- Just for debugging purposes. Don't actually copy these 2 lines! -->
<!--[if lt IE 9]><script src="../../assets/js/ie8-responsive-file-warning.js"></script><![endif]-->
<script src="../../assets/js/ie-emulation-modes-warning.js"></script>
<!-- IE10 viewport hack for Surface/desktop Windows 8 bug --> <!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->
<script src="../../assets/js/ie10-viewport-bug-workaround.js"></script> <script src="../../assets/js/ie10-viewport-bug-workaround.js"></script>
<!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
<!--[if lt IE 9]>
<script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
<script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
<![endif]-->
</head> </head>
<body> <body>
......
...@@ -16,18 +16,8 @@ ...@@ -16,18 +16,8 @@
<!-- Custom styles for this template --> <!-- Custom styles for this template -->
<link href="sticky-footer-navbar.css" rel="stylesheet"> <link href="sticky-footer-navbar.css" rel="stylesheet">
<!-- Just for debugging purposes. Don't actually copy these 2 lines! -->
<!--[if lt IE 9]><script src="../../assets/js/ie8-responsive-file-warning.js"></script><![endif]-->
<script src="../../assets/js/ie-emulation-modes-warning.js"></script>
<!-- IE10 viewport hack for Surface/desktop Windows 8 bug --> <!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->
<script src="../../assets/js/ie10-viewport-bug-workaround.js"></script> <script src="../../assets/js/ie10-viewport-bug-workaround.js"></script>
<!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
<!--[if lt IE 9]>
<script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
<script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
<![endif]-->
</head> </head>
<body> <body>
......
...@@ -16,18 +16,8 @@ ...@@ -16,18 +16,8 @@
<!-- Custom styles for this template --> <!-- Custom styles for this template -->
<link href="sticky-footer.css" rel="stylesheet"> <link href="sticky-footer.css" rel="stylesheet">
<!-- Just for debugging purposes. Don't actually copy these 2 lines! -->
<!--[if lt IE 9]><script src="../../assets/js/ie8-responsive-file-warning.js"></script><![endif]-->
<script src="../../assets/js/ie-emulation-modes-warning.js"></script>
<!-- IE10 viewport hack for Surface/desktop Windows 8 bug --> <!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->
<script src="../../assets/js/ie10-viewport-bug-workaround.js"></script> <script src="../../assets/js/ie10-viewport-bug-workaround.js"></script>
<!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
<!--[if lt IE 9]>
<script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
<script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
<![endif]-->
</head> </head>
<body> <body>
......
...@@ -18,18 +18,8 @@ ...@@ -18,18 +18,8 @@
<!-- Custom styles for this template --> <!-- Custom styles for this template -->
<link href="theme.css" rel="stylesheet"> <link href="theme.css" rel="stylesheet">
<!-- Just for debugging purposes. Don't actually copy these 2 lines! -->
<!--[if lt IE 9]><script src="../../assets/js/ie8-responsive-file-warning.js"></script><![endif]-->
<script src="../../assets/js/ie-emulation-modes-warning.js"></script>
<!-- IE10 viewport hack for Surface/desktop Windows 8 bug --> <!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->
<script src="../../assets/js/ie10-viewport-bug-workaround.js"></script> <script src="../../assets/js/ie10-viewport-bug-workaround.js"></script>
<!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
<!--[if lt IE 9]>
<script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
<script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
<![endif]-->
</head> </head>
<body role="document"> <body role="document">
......
...@@ -16,18 +16,8 @@ ...@@ -16,18 +16,8 @@
<!-- Custom styles for this template --> <!-- Custom styles for this template -->
<link href="tooltip-viewport.css" rel="stylesheet"> <link href="tooltip-viewport.css" rel="stylesheet">
<!-- Just for debugging purposes. Don't actually copy these 2 lines! -->
<!--[if lt IE 9]><script src="../../assets/js/ie8-responsive-file-warning.js"></script><![endif]-->
<script src="../../assets/js/ie-emulation-modes-warning.js"></script>
<!-- IE10 viewport hack for Surface/desktop Windows 8 bug --> <!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->
<script src="../../assets/js/ie10-viewport-bug-workaround.js"></script> <script src="../../assets/js/ie10-viewport-bug-workaround.js"></script>
<!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
<!--[if lt IE 9]>
<script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
<script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
<![endif]-->
</head> </head>
<body> <body>
......
...@@ -5,7 +5,7 @@ title: Bootstrap &middot; The world's most popular mobile-first and responsive f ...@@ -5,7 +5,7 @@ title: Bootstrap &middot; The world's most popular mobile-first and responsive f
<main class="bs-docs-masthead" id="content" role="main"> <main class="bs-docs-masthead" id="content" role="main">
<div class="container"> <div class="container">
<span class="bs-docs-booticon bs-docs-booticon-lg bs-docs-booticon-outline">B</span> <span class="bs-docs-booticon outline">B</span>
<p class="lead">Bootstrap is the most popular HTML, CSS, and JS framework for developing responsive, mobile first projects on the web.</p> <p class="lead">Bootstrap is the most popular HTML, CSS, and JS framework for developing responsive, mobile first projects on the web.</p>
<p class="lead"> <p class="lead">
<a href="getting-started#download" class="btn btn-outline-inverse btn-lg" onclick="ga('send', 'event', 'Jumbotron actions', 'Download', 'Download {{ site.current_version }}');">Download Bootstrap</a> <a href="getting-started#download" class="btn btn-outline-inverse btn-lg" onclick="ga('send', 'event', 'Jumbotron actions', 'Download', 'Download {{ site.current_version }}');">Download Bootstrap</a>
......
...@@ -5,32 +5,38 @@ ...@@ -5,32 +5,38 @@
// Base class // Base class
.badge { .badge {
position: relative;
top: -.1em;
display: inline-block; display: inline-block;
min-width: 10px; padding-left: .6em;
padding: 3px 7px; padding-right: .6em;
font-size: @font-size-small; font-size: .75em;
font-weight: @badge-font-weight; font-weight: @badge-font-weight;
color: @badge-color; color: @badge-color;
line-height: @badge-line-height;
vertical-align: baseline;
white-space: nowrap;
text-align: center; text-align: center;
white-space: nowrap;
background-color: @badge-bg; background-color: @badge-bg;
.border-radius(@badge-border-radius); .border-radius(@badge-border-radius);
// Empty badges collapse automatically (not available in IE8) // Empty badges collapse automatically
&:empty { &:empty {
display: none; display: none;
} }
&.pull-left,
&.pull-right {
top: .2em;
}
// Quick fix for badges in buttons // Quick fix for badges in buttons
.btn & { /* .btn & {
position: relative; position: relative;
top: -1px; top: -1px;
} }
*/
.btn-xs & { .btn-xs & {
top: 0; /*top: 0;*/
padding: 1px 5px; /*padding: 1px 5px;*/
} }
// Hover state, but only for links // Hover state, but only for links
......
...@@ -117,11 +117,11 @@ ...@@ -117,11 +117,11 @@
// The clickable button for toggling the menu // The clickable button for toggling the menu
// Remove the gradient and set the same inset shadow as the :active state // Remove the gradient and set the same inset shadow as the :active state
.btn-group.open .dropdown-toggle { .btn-group.open .dropdown-toggle {
box-shadow: inset 0 3px 5px rgba(0,0,0,.125); .box-shadow(inset 0 3px 5px rgba(0,0,0,.125));
// Show no shadow for `.btn-link` since it has no other button styles. // Show no shadow for `.btn-link` since it has no other button styles.
&.btn-link { &.btn-link {
box-shadow: none; .box-shadow(none);
} }
} }
...@@ -239,7 +239,7 @@ ...@@ -239,7 +239,7 @@
input[type="checkbox"] { input[type="checkbox"] {
position: absolute; position: absolute;
z-index: -1; z-index: -1;
.opacity(0); opacity: 0;
} }
} }
} }
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
&.active { &.active {
outline: 0; outline: 0;
background-image: none; background-image: none;
box-shadow: inset 0 3px 5px rgba(0,0,0,.125); .box-shadow(inset 0 3px 5px rgba(0,0,0,.125));
} }
&.disabled, &.disabled,
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
cursor: not-allowed; cursor: not-allowed;
pointer-events: none; // Future-proof disabling of clicks pointer-events: none; // Future-proof disabling of clicks
opacity: .65; opacity: .65;
box-shadow: none; .box-shadow(none);
} }
} }
...@@ -90,7 +90,7 @@ ...@@ -90,7 +90,7 @@
&[disabled], &[disabled],
fieldset[disabled] & { fieldset[disabled] & {
background-color: transparent; background-color: transparent;
box-shadow: none; .box-shadow(none);
} }
&, &,
&:hover, &:hover,
......
...@@ -72,7 +72,7 @@ ...@@ -72,7 +72,7 @@
left: 0; left: 0;
bottom: 0; bottom: 0;
width: @carousel-control-width; width: @carousel-control-width;
.opacity(@carousel-control-opacity); opacity: @carousel-control-opacity;
font-size: @carousel-control-font-size; font-size: @carousel-control-font-size;
color: @carousel-control-color; color: @carousel-control-color;
text-align: center; text-align: center;
...@@ -96,7 +96,7 @@ ...@@ -96,7 +96,7 @@
outline: 0; outline: 0;
color: @carousel-control-color; color: @carousel-control-color;
text-decoration: none; text-decoration: none;
.opacity(.9); opacity: .9;
} }
// Toggles // Toggles
...@@ -159,15 +159,11 @@ ...@@ -159,15 +159,11 @@
border-radius: 10px; border-radius: 10px;
cursor: pointer; cursor: pointer;
// IE8-9 hack for event handling // IE9 hack for event handling
// //
// Internet Explorer 8-9 does not support clicks on elements without a set // Internet Explorer 9 does not support clicks on elements without a set
// `background-color`. We cannot use `filter` since that's not viewed as a // `background-color`. We cannot use `filter` since that's not viewed as a
// background color by the browser. Thus, a hack is needed. // background color by the browser. Thus, a hack is needed.
//
// For IE8, we set solid black as it doesn't support `rgba()`. For IE9, we
// set alpha transparency for the best results possible.
background-color: #000 \9; // IE8
background-color: rgba(0,0,0,0); // IE9 background-color: rgba(0,0,0,0); // IE9
} }
.active { .active {
......
...@@ -17,7 +17,7 @@ code { ...@@ -17,7 +17,7 @@ code {
font-size: 90%; font-size: 90%;
color: @code-color; color: @code-color;
background-color: @code-bg; background-color: @code-bg;
border-radius: @border-radius-base; .border-radius(@border-radius-base);
} }
// User input typically entered via keyboard // User input typically entered via keyboard
...@@ -26,13 +26,13 @@ kbd { ...@@ -26,13 +26,13 @@ kbd {
font-size: 90%; font-size: 90%;
color: @kbd-color; color: @kbd-color;
background-color: @kbd-bg; background-color: @kbd-bg;
border-radius: @border-radius-small; .border-radius(@border-radius-small);
box-shadow: inset 0 -.1rem 0 rgba(0,0,0,.25); .box-shadow(inset 0 -.1rem 0 rgba(0,0,0,.25));
kbd { kbd {
padding: 0; padding: 0;
font-size: 100%; font-size: 100%;
box-shadow: none; .box-shadow(none);
} }
} }
......
...@@ -2,11 +2,6 @@ ...@@ -2,11 +2,6 @@
// Component animations // Component animations
// -------------------------------------------------- // --------------------------------------------------
// Heads up!
//
// We don't use the `.opacity()` mixin here since it causes a bug with text
// fields in IE7-8. Source: https://github.com/twbs/bootstrap/pull/3552.
.fade { .fade {
opacity: 0; opacity: 0;
transition: opacity .15s linear; transition: opacity .15s linear;
......
...@@ -42,10 +42,9 @@ ...@@ -42,10 +42,9 @@
font-size: @font-size-base; font-size: @font-size-base;
text-align: left; // Ensures proper alignment if parent has it changed (e.g., modal footer) text-align: left; // Ensures proper alignment if parent has it changed (e.g., modal footer)
background-color: @dropdown-bg; background-color: @dropdown-bg;
border: 1px solid @dropdown-fallback-border; // IE8 fallback
border: 1px solid @dropdown-border; border: 1px solid @dropdown-border;
.border-radius(@border-radius-base); .border-radius(@border-radius-base);
box-shadow: 0 6px 12px rgba(0,0,0,.175); .box-shadow(0 6px 12px rgba(0,0,0,.175));
background-clip: padding-box; background-clip: padding-box;
// Dividers (basically an hr) within the dropdown // Dividers (basically an hr) within the dropdown
......
...@@ -31,7 +31,6 @@ legend { ...@@ -31,7 +31,6 @@ legend {
label { label {
display: inline-block; display: inline-block;
max-width: 100%; // Force IE8 to wrap long content (see https://github.com/twbs/bootstrap/issues/13141)
margin-bottom: 5px; margin-bottom: 5px;
font-weight: bold; font-weight: bold;
} }
...@@ -52,7 +51,7 @@ input[type="search"] { ...@@ -52,7 +51,7 @@ input[type="search"] {
input[type="radio"], input[type="radio"],
input[type="checkbox"] { input[type="checkbox"] {
margin: 4px 0 0; margin: 4px 0 0;
margin-top: 1px \9; // IE8-9 margin-top: 1px \9; // IE9
line-height: normal; line-height: normal;
} }
...@@ -124,7 +123,7 @@ output { ...@@ -124,7 +123,7 @@ output {
background-image: none; // Reset unusual Firefox-on-Android default style; see https://github.com/necolas/normalize.css/issues/214 background-image: none; // Reset unusual Firefox-on-Android default style; see https://github.com/necolas/normalize.css/issues/214
border: 1px solid @input-border; border: 1px solid @input-border;
.border-radius(@input-border-radius); .border-radius(@input-border-radius);
box-shadow: inset 0 1px 1px rgba(0,0,0,.075); .box-shadow(inset 0 1px 1px rgba(0,0,0,.075));
transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s; transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s;
// Customize the `:focus` state to imitate native WebKit styles. // Customize the `:focus` state to imitate native WebKit styles.
...@@ -182,7 +181,7 @@ input[type="time"], ...@@ -182,7 +181,7 @@ input[type="time"],
input[type="datetime-local"], input[type="datetime-local"],
input[type="month"] { input[type="month"] {
line-height: @input-height-base; line-height: @input-height-base;
// IE8+ misaligns the text within date inputs, so we reset // IE9+ misaligns the text within date inputs, so we reset
line-height: @line-height-base ~"\0"; line-height: @line-height-base ~"\0";
&.input-sm { &.input-sm {
......
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
} }
} }
// Empty labels collapse automatically (not available in IE8) // Empty labels collapse automatically
&:empty { &:empty {
display: none; display: none;
} }
......
...@@ -5,14 +5,13 @@ ...@@ -5,14 +5,13 @@
border-radius: @radius; border-radius: @radius;
} }
.box-shadow(@shadow: 0 .1rem .2rem rgba(0,0,0,.1)) when (@enable-shadows = true) { .box-shadow(@shadow) when (@enable-shadows = true) {
box-shadow: @shadow; box-shadow: @arguments;
} }
// Utilities // Utilities
@import "mixins/hide-text.less"; @import "mixins/hide-text.less";
@import "mixins/opacity.less";
@import "mixins/image.less"; @import "mixins/image.less";
@import "mixins/labels.less"; @import "mixins/labels.less";
@import "mixins/reset-filter.less"; @import "mixins/reset-filter.less";
......
...@@ -20,10 +20,11 @@ ...@@ -20,10 +20,11 @@
// Set the border and box shadow on specific inputs to match // Set the border and box shadow on specific inputs to match
.form-control { .form-control {
border-color: @border-color; border-color: @border-color;
box-shadow: inset 0 1px 1px rgba(0,0,0,.075); // Redeclare so transitions work .box-shadow(inset 0 1px 1px rgba(0,0,0,.075)); // Redeclare so transitions work
&:focus { &:focus {
border-color: darken(@border-color, 10%); border-color: darken(@border-color, 10%);
box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 6px lighten(@border-color, 20%); @shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 6px lighten(@border-color, 20%);
.box-shadow(@shadow);
} }
} }
// Set validation states also for addons // Set validation states also for addons
...@@ -51,12 +52,12 @@ ...@@ -51,12 +52,12 @@
// //
// Example usage: change the default blue border and shadow to white for better // Example usage: change the default blue border and shadow to white for better
// contrast against a dark gray background. // contrast against a dark gray background.
.form-control-focus(@color: @input-border-focus) { .form-control-focus() {
@color-rgba: rgba(red(@color), green(@color), blue(@color), .6);
&:focus { &:focus {
border-color: @color; border-color: @input-border-focus;
outline: 0; outline: 0;
box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px @color-rgba; @shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px @input-box-shadow-focus;
.box-shadow(@shadow);
} }
} }
......
// Opacity
.opacity(@opacity) {
opacity: @opacity;
// IE8 filter
@opacity-ie: (@opacity * 100);
filter: ~"alpha(opacity=@{opacity-ie})";
}
// Progress bars // Progress bars
.progress-bar-variant(@color) { .progress-variant(@color) {
background-color: @color; &[value]::-webkit-progress-value {
background-color: @color;
// Deprecated parent class requirement as of v3.2.0 }
.progress-striped & { &[value]::-moz-progress-bar {
#gradient > .striped(); background-color: @color;
}
@media screen and (~"min-width:0\0") {
.progress-bar {
background-color: @color;
}
} }
} }
...@@ -51,10 +51,9 @@ ...@@ -51,10 +51,9 @@
.modal-content { .modal-content {
position: relative; position: relative;
background-color: @modal-content-bg; background-color: @modal-content-bg;
border: 1px solid @modal-content-fallback-border-color; //old browsers fallback (ie8 etc)
border: 1px solid @modal-content-border-color; border: 1px solid @modal-content-border-color;
.border-radius(@border-radius-large); .border-radius(@border-radius-large);
box-shadow: 0 3px 9px rgba(0,0,0,.5); .box-shadow(0 3px 9px rgba(0,0,0,.5));
background-clip: padding-box; background-clip: padding-box;
// Remove focus outline from opened modal // Remove focus outline from opened modal
outline: 0; outline: 0;
...@@ -138,7 +137,7 @@ ...@@ -138,7 +137,7 @@
margin: 30px auto; margin: 30px auto;
} }
.modal-content { .modal-content {
box-shadow: 0 5px 15px rgba(0,0,0,.5); .box-shadow(0 5px 15px rgba(0,0,0,.5));
} }
// Modal sizes // Modal sizes
......
...@@ -52,7 +52,7 @@ ...@@ -52,7 +52,7 @@
padding-right: @navbar-padding-horizontal; padding-right: @navbar-padding-horizontal;
padding-left: @navbar-padding-horizontal; padding-left: @navbar-padding-horizontal;
border-top: 1px solid transparent; border-top: 1px solid transparent;
box-shadow: inset 0 1px 0 rgba(255,255,255,.1); .box-shadow(inset 0 1px 0 rgba(255,255,255,.1));
&:extend(.clearfix all); &:extend(.clearfix all);
-webkit-overflow-scrolling: touch; -webkit-overflow-scrolling: touch;
...@@ -63,7 +63,7 @@ ...@@ -63,7 +63,7 @@
@media (min-width: @grid-float-breakpoint) { @media (min-width: @grid-float-breakpoint) {
width: auto; width: auto;
border-top: 0; border-top: 0;
box-shadow: none; .box-shadow(none);
&.collapse { &.collapse {
display: block !important; display: block !important;
...@@ -248,7 +248,7 @@ ...@@ -248,7 +248,7 @@
margin-top: 0; margin-top: 0;
background-color: transparent; background-color: transparent;
border: 0; border: 0;
box-shadow: none; .box-shadow(none);
> li > a, > li > a,
.dropdown-header { .dropdown-header {
padding: 5px 15px 5px 25px; padding: 5px 15px 5px 25px;
...@@ -290,7 +290,7 @@ ...@@ -290,7 +290,7 @@
padding: 10px @navbar-padding-horizontal; padding: 10px @navbar-padding-horizontal;
border-top: 1px solid transparent; border-top: 1px solid transparent;
border-bottom: 1px solid transparent; border-bottom: 1px solid transparent;
box-shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.1); .box-shadow(~"inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.1)");
// Mixin behavior for optimum display // Mixin behavior for optimum display
.form-inline(); .form-inline();
...@@ -312,7 +312,7 @@ ...@@ -312,7 +312,7 @@
margin-right: 0; margin-right: 0;
padding-top: 0; padding-top: 0;
padding-bottom: 0; padding-bottom: 0;
box-shadow: none; .box-shadow(none);
} }
} }
......
...@@ -20,6 +20,8 @@ ...@@ -20,6 +20,8 @@
position: relative; position: relative;
display: block; display: block;
padding: @nav-link-padding; padding: @nav-link-padding;
line-height: @line-height-base;
&:hover, &:hover,
&:focus { &:focus {
text-decoration: none; text-decoration: none;
...@@ -59,13 +61,6 @@ ...@@ -59,13 +61,6 @@
.nav-divider { .nav-divider {
.nav-divider(); .nav-divider();
} }
// Prevent IE8 from misplacing imgs
//
// See https://github.com/h5bp/html5-boilerplate/issues/984#issuecomment-3985989
> li > a > img {
max-width: none;
}
} }
......
...@@ -14,10 +14,9 @@ ...@@ -14,10 +14,9 @@
text-align: left; // Reset given new insertion method text-align: left; // Reset given new insertion method
background-color: @popover-bg; background-color: @popover-bg;
background-clip: padding-box; background-clip: padding-box;
border: 1px solid @popover-fallback-border-color;
border: 1px solid @popover-border-color; border: 1px solid @popover-border-color;
border-radius: @border-radius-large; .border-radius(@border-radius-large);
box-shadow: 0 5px 10px rgba(0,0,0,.2); .box-shadow(0 5px 10px rgba(0,0,0,.2));
// Overrides for proper insertion // Overrides for proper insertion
white-space: normal; white-space: normal;
...@@ -72,7 +71,6 @@ ...@@ -72,7 +71,6 @@
left: 50%; left: 50%;
margin-left: -@popover-arrow-outer-width; margin-left: -@popover-arrow-outer-width;
border-bottom-width: 0; border-bottom-width: 0;
border-top-color: @popover-arrow-outer-fallback-color; // IE8 fallback
border-top-color: @popover-arrow-outer-color; border-top-color: @popover-arrow-outer-color;
bottom: -@popover-arrow-outer-width; bottom: -@popover-arrow-outer-width;
&:after { &:after {
...@@ -88,7 +86,6 @@ ...@@ -88,7 +86,6 @@
left: -@popover-arrow-outer-width; left: -@popover-arrow-outer-width;
margin-top: -@popover-arrow-outer-width; margin-top: -@popover-arrow-outer-width;
border-left-width: 0; border-left-width: 0;
border-right-color: @popover-arrow-outer-fallback-color; // IE8 fallback
border-right-color: @popover-arrow-outer-color; border-right-color: @popover-arrow-outer-color;
&:after { &:after {
content: " "; content: " ";
...@@ -102,7 +99,6 @@ ...@@ -102,7 +99,6 @@
left: 50%; left: 50%;
margin-left: -@popover-arrow-outer-width; margin-left: -@popover-arrow-outer-width;
border-top-width: 0; border-top-width: 0;
border-bottom-color: @popover-arrow-outer-fallback-color; // IE8 fallback
border-bottom-color: @popover-arrow-outer-color; border-bottom-color: @popover-arrow-outer-color;
top: -@popover-arrow-outer-width; top: -@popover-arrow-outer-width;
&:after { &:after {
...@@ -119,7 +115,6 @@ ...@@ -119,7 +115,6 @@
right: -@popover-arrow-outer-width; right: -@popover-arrow-outer-width;
margin-top: -@popover-arrow-outer-width; margin-top: -@popover-arrow-outer-width;
border-right-width: 0; border-right-width: 0;
border-left-color: @popover-arrow-outer-fallback-color; // IE8 fallback
border-left-color: @popover-arrow-outer-color; border-left-color: @popover-arrow-outer-color;
&:after { &:after {
content: " "; content: " ";
......
...@@ -3,98 +3,165 @@ ...@@ -3,98 +3,165 @@
// -------------------------------------------------- // --------------------------------------------------
// Bar animations //
// ------------------------- // Progress animations
//
// WebKit
@-webkit-keyframes progress-bar-stripes { @-webkit-keyframes progress-bar-stripes {
from { background-position: 40px 0; } from { background-position: @line-height-computed 0; }
to { background-position: 0 0; } to { background-position: 0 0; }
} }
// Spec and IE10+
@keyframes progress-bar-stripes { @keyframes progress-bar-stripes {
from { background-position: 40px 0; } from { background-position: @line-height-computed 0; }
to { background-position: 0 0; } to { background-position: 0 0; }
} }
//
// Basic progress bar
//
// Bar itself
// -------------------------
// Outer container
.progress { .progress {
overflow: hidden; display: block;
width: 100%;
height: @line-height-computed; height: @line-height-computed;
margin-bottom: @line-height-computed; margin-bottom: @line-height-computed;
background-color: @progress-bg; }
.progress[value] {
// Reset the default appearance
appearance: none;
// Remove Firefox and Opera border
border: 0;
// IE10 uses `color` to set the bar background-color
color: #0074d9;
}
.progress[value]::-webkit-progress-bar {
background-color: #eee;
.border-radius(@border-radius-base); .border-radius(@border-radius-base);
box-shadow: inset 0 1px 2px rgba(0,0,0,.1); .box-shadow(inset 0 .1rem .1rem rgba(0,0,0,.1));
}
.progress[value]::-webkit-progress-value::before {
content: attr(value);
}
.progress[value]::-webkit-progress-value {
background-color: #0074d9;
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;
} }
// Bar of progress // Firefox styles must be entirely separate or it busts Webkit styles.
.progress-bar { @-moz-document url-prefix() {
float: left; .progress[value] {
width: 0%; background-color: #eee;
height: 100%; .border-radius(@border-radius-base);
font-size: @font-size-small; .box-shadow(inset 0 .1rem .1rem rgba(0,0,0,.1));
line-height: @line-height-computed; }
color: @progress-bar-color; .progress[value]::-moz-progress-bar {
text-align: center; background-color: #0074d9;
background-color: @progress-bar-bg; border-top-left-radius: @border-radius-base;
box-shadow: inset 0 -1px 0 rgba(0,0,0,.15); border-bottom-left-radius: @border-radius-base;
transition: width .6s ease; }
.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;
}
} }
// Striped bars // 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 {
background-color: #eee;
.border-radius(@border-radius-base);
.box-shadow(inset 0 .1rem .1rem rgba(0,0,0,.1));
}
.progress-bar {
display: inline-block;
height: @line-height-computed;
text-indent: -999rem; // Simulate hiding of value as in native `<progress>`
background-color: #0074d9;
border-top-left-radius: @border-radius-base;
border-bottom-left-radius: @border-radius-base;
}
.progress[width^="0"] {
color: @gray-light;
min-width: 2rem;
background-color: transparent;
background-image: none;
}
.progress[width="100%"] {
border-top-right-radius: @border-radius-base;
border-bottom-right-radius: @border-radius-base;
}
}
// //
// `.progress-striped .progress-bar` is deprecated as of v3.2.0 in favor of the // Striped
// `.progress-bar-striped` class, which you just add to an existing //
// `.progress-bar`.
.progress-striped .progress-bar, .progress-striped[value]::-webkit-progress-value {
.progress-bar-striped { #gradient > .striped();
background-size: @line-height-computed @line-height-computed;
}
.progress-striped[value]::-moz-progress-bar {
#gradient > .striped(); #gradient > .striped();
background-size: 40px 40px; background-size: @line-height-computed @line-height-computed;
}
@media screen and (~"min-width:0\0") {
.progress-bar-striped {
#gradient > .striped();
background-size: @line-height-computed @line-height-computed;
}
} }
// Call animation for the active one
//
// Animated
// //
// `.progress.active .progress-bar` is deprecated as of v3.2.0 in favor of the
// `.progress-bar.active` approach. .progress-animated[value]::-webkit-progress-value {
.progress.active .progress-bar,
.progress-bar.active {
animation: progress-bar-stripes 2s linear infinite; animation: progress-bar-stripes 2s linear infinite;
} }
.progress-animated[value]::-moz-progress-bar {
// Account for lower percentages animation: progress-bar-stripes 2s linear infinite;
.progress-bar { }
&[aria-valuenow="0"] { @media screen and (~"min-width:0\0") {
color: @gray-light; .progress-animated .progress-bar-striped {
min-width: 30px; animation: progress-bar-stripes 2s linear infinite;
background-color: transparent;
background-image: none;
box-shadow: none;
} }
} }
//
// Variations // Variations
// ------------------------- //
.progress-bar-success { .progress-success {
.progress-bar-variant(@progress-bar-success-bg); .progress-variant(@progress-bar-success-bg);
} }
.progress-info {
.progress-bar-info { .progress-variant(@progress-bar-info-bg);
.progress-bar-variant(@progress-bar-info-bg);
} }
.progress-warning {
.progress-bar-warning { .progress-variant(@progress-bar-warning-bg);
.progress-bar-variant(@progress-bar-warning-bg);
} }
.progress-danger {
.progress-bar-danger { .progress-variant(@progress-bar-danger-bg);
.progress-bar-variant(@progress-bar-danger-bg);
} }
...@@ -19,12 +19,13 @@ ...@@ -19,12 +19,13 @@
.btn-warning, .btn-warning,
.btn-danger { .btn-danger {
text-shadow: 0 -1px 0 rgba(0,0,0,.2); text-shadow: 0 -1px 0 rgba(0,0,0,.2);
box-shadow: inset 0 1px 0 rgba(255,255,255,.15), 0 1px 1px rgba(0,0,0,.075); @shadow: inset 0 1px 0 rgba(255,255,255,.15), 0 1px 1px rgba(0,0,0,.075);
.box-shadow(@shadow);
// Reset the shadow // Reset the shadow
&:active, &:active,
&.active { &.active {
box-shadow: inset 0 3px 5px rgba(0,0,0,.125); .box-shadow(inset 0 3px 5px rgba(0,0,0,.125));
} }
} }
...@@ -77,9 +78,8 @@ ...@@ -77,9 +78,8 @@
// Images // Images
// -------------------------------------------------- // --------------------------------------------------
.thumbnail,
.img-thumbnail { .img-thumbnail {
box-shadow: 0 1px 2px rgba(0,0,0,.075); .box-shadow(0 1px 2px rgba(0,0,0,.075));
} }
...@@ -111,11 +111,12 @@ ...@@ -111,11 +111,12 @@
#gradient > .vertical(@start-color: lighten(@navbar-default-bg, 10%); @end-color: @navbar-default-bg); #gradient > .vertical(@start-color: lighten(@navbar-default-bg, 10%); @end-color: @navbar-default-bg);
.reset-filter(); // Remove gradient in IE<10 to fix bug where dropdowns don't get triggered .reset-filter(); // Remove gradient in IE<10 to fix bug where dropdowns don't get triggered
.border-radius(@navbar-border-radius); .border-radius(@navbar-border-radius);
box-shadow: inset 0 1px 0 rgba(255,255,255,.15), 0 1px 5px rgba(0,0,0,.075); @shadow: inset 0 1px 0 rgba(255,255,255,.15), 0 1px 5px rgba(0,0,0,.075);
.box-shadow(@shadow);
.navbar-nav > .active > a { .navbar-nav > .active > a {
#gradient > .vertical(@start-color: darken(@navbar-default-bg, 5%); @end-color: darken(@navbar-default-bg, 2%)); #gradient > .vertical(@start-color: darken(@navbar-default-bg, 5%); @end-color: darken(@navbar-default-bg, 2%));
box-shadow: inset 0 3px 9px rgba(0,0,0,.075); .box-shadow(inset 0 3px 9px rgba(0,0,0,.075));
} }
} }
.navbar-brand, .navbar-brand,
...@@ -130,7 +131,7 @@ ...@@ -130,7 +131,7 @@
.navbar-nav > .active > a { .navbar-nav > .active > a {
#gradient > .vertical(@start-color: @navbar-inverse-bg; @end-color: lighten(@navbar-inverse-bg, 2.5%)); #gradient > .vertical(@start-color: @navbar-inverse-bg; @end-color: lighten(@navbar-inverse-bg, 2.5%));
box-shadow: inset 0 3px 9px rgba(0,0,0,.25); .box-shadow(inset 0 3px 9px rgba(0,0,0,.25));
} }
.navbar-brand, .navbar-brand,
...@@ -155,7 +156,8 @@ ...@@ -155,7 +156,8 @@
// Common styles // Common styles
.alert { .alert {
text-shadow: 0 1px 0 rgba(255,255,255,.2); text-shadow: 0 1px 0 rgba(255,255,255,.2);
box-shadow: inset 0 1px 0 rgba(255,255,255,.25), 0 1px 2px rgba(0,0,0,.05); @shadow: inset 0 1px 0 rgba(255,255,255,.25), 0 1px 2px rgba(0,0,0,.05);
.box-shadow(@shadow);
} }
// Mixin for generating new styles // Mixin for generating new styles
...@@ -206,7 +208,7 @@ ...@@ -206,7 +208,7 @@
.list-group { .list-group {
.border-radius(@border-radius-base); .border-radius(@border-radius-base);
box-shadow: 0 1px 2px rgba(0,0,0,.075); .box-shadow(0 1px 2px rgba(0,0,0,.075));
} }
.list-group-item.active, .list-group-item.active,
.list-group-item.active:hover, .list-group-item.active:hover,
......
...@@ -187,6 +187,7 @@ ...@@ -187,6 +187,7 @@
@input-border-radius: @border-radius-base; @input-border-radius: @border-radius-base;
//** Border color for inputs on focus //** Border color for inputs on focus
@input-border-focus: #66afe9; @input-border-focus: #66afe9;
@input-box-shadow-focus: rgba(102,175,233,.6);
//** Placeholder text color //** Placeholder text color
@input-color-placeholder: @gray-light; @input-color-placeholder: @gray-light;
...@@ -215,8 +216,6 @@ ...@@ -215,8 +216,6 @@
@dropdown-bg: #fff; @dropdown-bg: #fff;
//** Dropdown menu `border-color`. //** Dropdown menu `border-color`.
@dropdown-border: rgba(0,0,0,.15); @dropdown-border: rgba(0,0,0,.15);
//** Dropdown menu `border-color` **for IE8**.
@dropdown-fallback-border: #ccc;
//** Divider color for between dropdown items. //** Divider color for between dropdown items.
@dropdown-divider-bg: #e5e5e5; @dropdown-divider-bg: #e5e5e5;
...@@ -370,7 +369,7 @@ ...@@ -370,7 +369,7 @@
//## //##
//=== Shared nav styles //=== Shared nav styles
@nav-link-padding: 10px 15px; @nav-link-padding: .5em 1em;
@nav-link-hover-bg: @gray-lighter; @nav-link-hover-bg: @gray-lighter;
@nav-disabled-link-color: @gray-light; @nav-disabled-link-color: @gray-light;
...@@ -551,8 +550,6 @@ ...@@ -551,8 +550,6 @@
@modal-content-bg: #fff; @modal-content-bg: #fff;
//** Modal content border color //** Modal content border color
@modal-content-border-color: rgba(0,0,0,.2); @modal-content-border-color: rgba(0,0,0,.2);
//** Modal content border color **for IE8**
@modal-content-fallback-border-color: #999;
//** Modal backdrop background color //** Modal backdrop background color
@modal-backdrop-bg: #000; @modal-backdrop-bg: #000;
...@@ -678,7 +675,7 @@ ...@@ -678,7 +675,7 @@
@badge-font-weight: bold; @badge-font-weight: bold;
@badge-line-height: 1; @badge-line-height: 1;
@badge-border-radius: 10px; @badge-border-radius: 2em;
//== Breadcrumbs //== Breadcrumbs
......
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