mirror of
https://github.com/twbs/bootstrap.git
synced 2024-12-01 13:24:25 +01:00
Merge pull request #11642 from tlindig/caret_color_fix
removed all caret border color settings.
This commit is contained in:
Mark Otto
commit
2abaed9876
16
dist/css/bootstrap-theme.css
vendored
16
dist/css/bootstrap-theme.css
vendored
@ -1,11 +1,11 @@
|
||||
/*!
|
||||
* Bootstrap v3.0.2 by @fat and @mdo
|
||||
* Copyright 2013 Twitter, Inc.
|
||||
* Licensed under http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Designed and built with all the love in the world by @mdo and @fat.
|
||||
*/
|
||||
|
||||
/*!
|
||||
* Bootstrap v3.0.2 by @fat and @mdo
|
||||
* Copyright 2013 Twitter, Inc.
|
||||
* Licensed under http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Designed and built with all the love in the world by @mdo and @fat.
|
||||
*/
|
||||
|
||||
.btn-default,
|
||||
.btn-primary,
|
||||
.btn-success,
|
||||
|
||||
16
dist/css/bootstrap-theme.min.css
vendored
16
dist/css/bootstrap-theme.min.css
vendored
File diff suppressed because one or more lines are too long
127
dist/css/bootstrap.css
vendored
127
dist/css/bootstrap.css
vendored
@ -1,11 +1,11 @@
|
||||
/*!
|
||||
* Bootstrap v3.0.2 by @fat and @mdo
|
||||
* Copyright 2013 Twitter, Inc.
|
||||
* Licensed under http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Designed and built with all the love in the world by @mdo and @fat.
|
||||
*/
|
||||
|
||||
/*!
|
||||
* Bootstrap v3.0.2 by @fat and @mdo
|
||||
* Copyright 2013 Twitter, Inc.
|
||||
* Licensed under http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Designed and built with all the love in the world by @mdo and @fat.
|
||||
*/
|
||||
|
||||
/*! normalize.css v2.1.3 | MIT License | git.io/normalize */
|
||||
|
||||
article,
|
||||
@ -3461,7 +3461,7 @@ input[type="button"].btn-block {
|
||||
height: 0;
|
||||
margin-left: 2px;
|
||||
vertical-align: middle;
|
||||
border-top: 4px solid #000000;
|
||||
border-top: 4px solid;
|
||||
border-right: 4px solid transparent;
|
||||
border-left: 4px solid transparent;
|
||||
}
|
||||
@ -3581,7 +3581,7 @@ input[type="button"].btn-block {
|
||||
.dropup .caret,
|
||||
.navbar-fixed-bottom .dropdown .caret {
|
||||
border-top: 0;
|
||||
border-bottom: 4px solid #000000;
|
||||
border-bottom: 4px solid;
|
||||
content: "";
|
||||
}
|
||||
|
||||
@ -3599,30 +3599,6 @@ input[type="button"].btn-block {
|
||||
}
|
||||
}
|
||||
|
||||
.btn-default .caret {
|
||||
border-top-color: #333333;
|
||||
}
|
||||
|
||||
.btn-primary .caret,
|
||||
.btn-success .caret,
|
||||
.btn-warning .caret,
|
||||
.btn-danger .caret,
|
||||
.btn-info .caret {
|
||||
border-top-color: #fff;
|
||||
}
|
||||
|
||||
.dropup .btn-default .caret {
|
||||
border-bottom-color: #333333;
|
||||
}
|
||||
|
||||
.dropup .btn-primary .caret,
|
||||
.dropup .btn-success .caret,
|
||||
.dropup .btn-warning .caret,
|
||||
.dropup .btn-danger .caret,
|
||||
.dropup .btn-info .caret {
|
||||
border-bottom-color: #fff;
|
||||
}
|
||||
|
||||
.btn-group,
|
||||
.btn-group-vertical {
|
||||
position: relative;
|
||||
@ -4102,13 +4078,6 @@ textarea.input-group-sm > .input-group-btn > .btn {
|
||||
border-color: #428bca;
|
||||
}
|
||||
|
||||
.nav .open > a .caret,
|
||||
.nav .open > a:hover .caret,
|
||||
.nav .open > a:focus .caret {
|
||||
border-top-color: #2a6496;
|
||||
border-bottom-color: #2a6496;
|
||||
}
|
||||
|
||||
.nav .nav-divider {
|
||||
height: 1px;
|
||||
margin: 9px 0;
|
||||
@ -4221,13 +4190,6 @@ textarea.input-group-sm > .input-group-btn > .btn {
|
||||
background-color: #428bca;
|
||||
}
|
||||
|
||||
.nav-pills > li.active > a .caret,
|
||||
.nav-pills > li.active > a:hover .caret,
|
||||
.nav-pills > li.active > a:focus .caret {
|
||||
border-top-color: #ffffff;
|
||||
border-bottom-color: #ffffff;
|
||||
}
|
||||
|
||||
.nav-stacked > li {
|
||||
float: none;
|
||||
}
|
||||
@ -4300,16 +4262,6 @@ textarea.input-group-sm > .input-group-btn > .btn {
|
||||
display: block;
|
||||
}
|
||||
|
||||
.nav .caret {
|
||||
border-top-color: #428bca;
|
||||
border-bottom-color: #428bca;
|
||||
}
|
||||
|
||||
.nav a:hover .caret {
|
||||
border-top-color: #2a6496;
|
||||
border-bottom-color: #2a6496;
|
||||
}
|
||||
|
||||
.nav-tabs .dropdown-menu {
|
||||
margin-top: -1px;
|
||||
border-top-right-radius: 0;
|
||||
@ -4739,12 +4691,6 @@ textarea.input-group-sm > .input-group-btn > .btn {
|
||||
border-color: #e7e7e7;
|
||||
}
|
||||
|
||||
.navbar-default .navbar-nav > .dropdown > a:hover .caret,
|
||||
.navbar-default .navbar-nav > .dropdown > a:focus .caret {
|
||||
border-top-color: #333333;
|
||||
border-bottom-color: #333333;
|
||||
}
|
||||
|
||||
.navbar-default .navbar-nav > .open > a,
|
||||
.navbar-default .navbar-nav > .open > a:hover,
|
||||
.navbar-default .navbar-nav > .open > a:focus {
|
||||
@ -4752,18 +4698,6 @@ textarea.input-group-sm > .input-group-btn > .btn {
|
||||
background-color: #e7e7e7;
|
||||
}
|
||||
|
||||
.navbar-default .navbar-nav > .open > a .caret,
|
||||
.navbar-default .navbar-nav > .open > a:hover .caret,
|
||||
.navbar-default .navbar-nav > .open > a:focus .caret {
|
||||
border-top-color: #555555;
|
||||
border-bottom-color: #555555;
|
||||
}
|
||||
|
||||
.navbar-default .navbar-nav > .dropdown > a .caret {
|
||||
border-top-color: #777777;
|
||||
border-bottom-color: #777777;
|
||||
}
|
||||
|
||||
@media (max-width: 767px) {
|
||||
.navbar-default .navbar-nav .open .dropdown-menu > li > a {
|
||||
color: #777777;
|
||||
@ -4863,23 +4797,6 @@ textarea.input-group-sm > .input-group-btn > .btn {
|
||||
background-color: #080808;
|
||||
}
|
||||
|
||||
.navbar-inverse .navbar-nav > .dropdown > a:hover .caret {
|
||||
border-top-color: #ffffff;
|
||||
border-bottom-color: #ffffff;
|
||||
}
|
||||
|
||||
.navbar-inverse .navbar-nav > .dropdown > a .caret {
|
||||
border-top-color: #999999;
|
||||
border-bottom-color: #999999;
|
||||
}
|
||||
|
||||
.navbar-inverse .navbar-nav > .open > a .caret,
|
||||
.navbar-inverse .navbar-nav > .open > a:hover .caret,
|
||||
.navbar-inverse .navbar-nav > .open > a:focus .caret {
|
||||
border-top-color: #ffffff;
|
||||
border-bottom-color: #ffffff;
|
||||
}
|
||||
|
||||
@media (max-width: 767px) {
|
||||
.navbar-inverse .navbar-nav .open .dropdown-menu > .dropdown-header {
|
||||
border-color: #080808;
|
||||
@ -5784,10 +5701,6 @@ a.list-group-item.active:focus .list-group-item-text {
|
||||
border-top-color: #dddddd;
|
||||
}
|
||||
|
||||
.panel-default > .panel-heading > .dropdown .caret {
|
||||
border-color: #333333 transparent;
|
||||
}
|
||||
|
||||
.panel-default > .panel-footer + .panel-collapse .panel-body {
|
||||
border-bottom-color: #dddddd;
|
||||
}
|
||||
@ -5806,10 +5719,6 @@ a.list-group-item.active:focus .list-group-item-text {
|
||||
border-top-color: #428bca;
|
||||
}
|
||||
|
||||
.panel-primary > .panel-heading > .dropdown .caret {
|
||||
border-color: #ffffff transparent;
|
||||
}
|
||||
|
||||
.panel-primary > .panel-footer + .panel-collapse .panel-body {
|
||||
border-bottom-color: #428bca;
|
||||
}
|
||||
@ -5828,10 +5737,6 @@ a.list-group-item.active:focus .list-group-item-text {
|
||||
border-top-color: #d6e9c6;
|
||||
}
|
||||
|
||||
.panel-success > .panel-heading > .dropdown .caret {
|
||||
border-color: #468847 transparent;
|
||||
}
|
||||
|
||||
.panel-success > .panel-footer + .panel-collapse .panel-body {
|
||||
border-bottom-color: #d6e9c6;
|
||||
}
|
||||
@ -5850,10 +5755,6 @@ a.list-group-item.active:focus .list-group-item-text {
|
||||
border-top-color: #faebcc;
|
||||
}
|
||||
|
||||
.panel-warning > .panel-heading > .dropdown .caret {
|
||||
border-color: #c09853 transparent;
|
||||
}
|
||||
|
||||
.panel-warning > .panel-footer + .panel-collapse .panel-body {
|
||||
border-bottom-color: #faebcc;
|
||||
}
|
||||
@ -5872,10 +5773,6 @@ a.list-group-item.active:focus .list-group-item-text {
|
||||
border-top-color: #ebccd1;
|
||||
}
|
||||
|
||||
.panel-danger > .panel-heading > .dropdown .caret {
|
||||
border-color: #b94a48 transparent;
|
||||
}
|
||||
|
||||
.panel-danger > .panel-footer + .panel-collapse .panel-body {
|
||||
border-bottom-color: #ebccd1;
|
||||
}
|
||||
@ -5894,10 +5791,6 @@ a.list-group-item.active:focus .list-group-item-text {
|
||||
border-top-color: #bce8f1;
|
||||
}
|
||||
|
||||
.panel-info > .panel-heading > .dropdown .caret {
|
||||
border-color: #3a87ad transparent;
|
||||
}
|
||||
|
||||
.panel-info > .panel-footer + .panel-collapse .panel-body {
|
||||
border-bottom-color: #bce8f1;
|
||||
}
|
||||
|
||||
18
dist/css/bootstrap.min.css
vendored
18
dist/css/bootstrap.min.css
vendored
File diff suppressed because one or more lines are too long
42
dist/js/bootstrap.js
vendored
42
dist/js/bootstrap.js
vendored
@ -1,13 +1,13 @@
|
||||
/*!
|
||||
* Bootstrap v3.0.2 by @fat and @mdo
|
||||
* Copyright 2013 Twitter, Inc.
|
||||
* Licensed under http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Designed and built with all the love in the world by @mdo and @fat.
|
||||
*/
|
||||
|
||||
if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery") }
|
||||
|
||||
/*!
|
||||
* Bootstrap v3.0.2 by @fat and @mdo
|
||||
* Copyright 2013 Twitter, Inc.
|
||||
* Licensed under http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Designed and built with all the love in the world by @mdo and @fat.
|
||||
*/
|
||||
|
||||
if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery") }
|
||||
|
||||
/* ========================================================================
|
||||
* Bootstrap: transition.js v3.0.2
|
||||
* http://getbootstrap.com/javascript/#transitions
|
||||
@ -64,7 +64,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
|
||||
})
|
||||
|
||||
}(jQuery);
|
||||
|
||||
|
||||
/* ========================================================================
|
||||
* Bootstrap: alert.js v3.0.2
|
||||
* http://getbootstrap.com/javascript/#alerts
|
||||
@ -163,7 +163,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
|
||||
$(document).on('click.bs.alert.data-api', dismiss, Alert.prototype.close)
|
||||
|
||||
}(jQuery);
|
||||
|
||||
|
||||
/* ========================================================================
|
||||
* Bootstrap: button.js v3.0.2
|
||||
* http://getbootstrap.com/javascript/#buttons
|
||||
@ -279,7 +279,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
|
||||
})
|
||||
|
||||
}(jQuery);
|
||||
|
||||
|
||||
/* ========================================================================
|
||||
* Bootstrap: carousel.js v3.0.2
|
||||
* http://getbootstrap.com/javascript/#carousel
|
||||
@ -497,7 +497,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
|
||||
})
|
||||
|
||||
}(jQuery);
|
||||
|
||||
|
||||
/* ========================================================================
|
||||
* Bootstrap: collapse.js v3.0.2
|
||||
* http://getbootstrap.com/javascript/#collapse
|
||||
@ -677,7 +677,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
|
||||
})
|
||||
|
||||
}(jQuery);
|
||||
|
||||
|
||||
/* ========================================================================
|
||||
* Bootstrap: dropdown.js v3.0.2
|
||||
* http://getbootstrap.com/javascript/#dropdowns
|
||||
@ -832,7 +832,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
|
||||
.on('keydown.bs.dropdown.data-api', toggle + ', [role=menu]' , Dropdown.prototype.keydown)
|
||||
|
||||
}(jQuery);
|
||||
|
||||
|
||||
/* ========================================================================
|
||||
* Bootstrap: modal.js v3.0.2
|
||||
* http://getbootstrap.com/javascript/#modals
|
||||
@ -1079,7 +1079,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
|
||||
.on('hidden.bs.modal', '.modal', function () { $(document.body).removeClass('modal-open') })
|
||||
|
||||
}(jQuery);
|
||||
|
||||
|
||||
/* ========================================================================
|
||||
* Bootstrap: tooltip.js v3.0.2
|
||||
* http://getbootstrap.com/javascript/#tooltip
|
||||
@ -1466,7 +1466,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
|
||||
}
|
||||
|
||||
}(jQuery);
|
||||
|
||||
|
||||
/* ========================================================================
|
||||
* Bootstrap: popover.js v3.0.2
|
||||
* http://getbootstrap.com/javascript/#popovers
|
||||
@ -1584,7 +1584,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
|
||||
}
|
||||
|
||||
}(jQuery);
|
||||
|
||||
|
||||
/* ========================================================================
|
||||
* Bootstrap: scrollspy.js v3.0.2
|
||||
* http://getbootstrap.com/javascript/#scrollspy
|
||||
@ -1743,7 +1743,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
|
||||
})
|
||||
|
||||
}(jQuery);
|
||||
|
||||
|
||||
/* ========================================================================
|
||||
* Bootstrap: tab.js v3.0.2
|
||||
* http://getbootstrap.com/javascript/#tabs
|
||||
@ -1879,7 +1879,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
|
||||
})
|
||||
|
||||
}(jQuery);
|
||||
|
||||
|
||||
/* ========================================================================
|
||||
* Bootstrap: affix.js v3.0.2
|
||||
* http://getbootstrap.com/javascript/#affix
|
||||
|
||||
16
dist/js/bootstrap.min.js
vendored
16
dist/js/bootstrap.min.js
vendored
File diff suppressed because one or more lines are too long
@ -2,37 +2,6 @@
|
||||
// Button groups
|
||||
// --------------------------------------------------
|
||||
|
||||
// Button carets
|
||||
//
|
||||
// Match the button text color to the arrow/caret for indicating dropdown-ness.
|
||||
|
||||
.caret {
|
||||
.btn-default & {
|
||||
border-top-color: @btn-default-color;
|
||||
}
|
||||
.btn-primary &,
|
||||
.btn-success &,
|
||||
.btn-warning &,
|
||||
.btn-danger &,
|
||||
.btn-info & {
|
||||
border-top-color: #fff;
|
||||
}
|
||||
}
|
||||
.dropup {
|
||||
.btn-default .caret {
|
||||
border-bottom-color: @btn-default-color;
|
||||
}
|
||||
.btn-primary,
|
||||
.btn-success,
|
||||
.btn-warning,
|
||||
.btn-danger,
|
||||
.btn-info {
|
||||
.caret {
|
||||
border-bottom-color: #fff;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Make the div behave like a button
|
||||
.btn-group,
|
||||
.btn-group-vertical {
|
||||
|
||||
@ -10,7 +10,7 @@
|
||||
height: 0;
|
||||
margin-left: 2px;
|
||||
vertical-align: middle;
|
||||
border-top: @caret-width-base solid @dropdown-caret-color;
|
||||
border-top: @caret-width-base solid;
|
||||
border-right: @caret-width-base solid transparent;
|
||||
border-left: @caret-width-base solid transparent;
|
||||
}
|
||||
@ -161,7 +161,7 @@
|
||||
// Reverse the caret
|
||||
.caret {
|
||||
border-top: 0;
|
||||
border-bottom: @caret-width-base solid @dropdown-caret-color;
|
||||
border-bottom: @caret-width-base solid;
|
||||
content: "";
|
||||
}
|
||||
// Different positioning for bottom up menu
|
||||
|
||||
@ -403,9 +403,6 @@
|
||||
+ .panel-collapse .panel-body {
|
||||
border-top-color: @border;
|
||||
}
|
||||
& > .dropdown .caret {
|
||||
border-color: @heading-text-color transparent;
|
||||
}
|
||||
}
|
||||
& > .panel-footer {
|
||||
+ .panel-collapse .panel-body {
|
||||
|
||||
@ -414,15 +414,8 @@
|
||||
border-color: @navbar-default-border;
|
||||
}
|
||||
|
||||
// Dropdown menu items and carets
|
||||
// Dropdown menu items
|
||||
.navbar-nav {
|
||||
// Caret should match text color on hover
|
||||
> .dropdown > a:hover .caret,
|
||||
> .dropdown > a:focus .caret {
|
||||
border-top-color: @navbar-default-link-hover-color;
|
||||
border-bottom-color: @navbar-default-link-hover-color;
|
||||
}
|
||||
|
||||
// Remove background color from open dropdown
|
||||
> .open > a {
|
||||
&,
|
||||
@ -430,17 +423,8 @@
|
||||
&:focus {
|
||||
background-color: @navbar-default-link-active-bg;
|
||||
color: @navbar-default-link-active-color;
|
||||
.caret {
|
||||
border-top-color: @navbar-default-link-active-color;
|
||||
border-bottom-color: @navbar-default-link-active-color;
|
||||
}
|
||||
}
|
||||
}
|
||||
> .dropdown > a .caret {
|
||||
border-top-color: @navbar-default-link-color;
|
||||
border-bottom-color: @navbar-default-link-color;
|
||||
}
|
||||
|
||||
|
||||
@media (max-width: @screen-xs-max) {
|
||||
// Dropdowns get custom display when collapsed
|
||||
@ -561,24 +545,6 @@
|
||||
color: @navbar-inverse-link-active-color;
|
||||
}
|
||||
}
|
||||
> .dropdown > a:hover .caret {
|
||||
border-top-color: @navbar-inverse-link-hover-color;
|
||||
border-bottom-color: @navbar-inverse-link-hover-color;
|
||||
}
|
||||
> .dropdown > a .caret {
|
||||
border-top-color: @navbar-inverse-link-color;
|
||||
border-bottom-color: @navbar-inverse-link-color;
|
||||
}
|
||||
> .open > a {
|
||||
&,
|
||||
&:hover,
|
||||
&:focus {
|
||||
.caret {
|
||||
border-top-color: @navbar-inverse-link-active-color;
|
||||
border-bottom-color: @navbar-inverse-link-active-color;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@media (max-width: @screen-xs-max) {
|
||||
// Dropdowns get custom display
|
||||
|
||||
@ -48,11 +48,6 @@
|
||||
&:focus {
|
||||
background-color: @nav-link-hover-bg;
|
||||
border-color: @link-color;
|
||||
|
||||
.caret {
|
||||
border-top-color: @link-hover-color;
|
||||
border-bottom-color: @link-hover-color;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -138,11 +133,6 @@
|
||||
&:focus {
|
||||
color: @nav-pills-active-link-hover-color;
|
||||
background-color: @nav-pills-active-link-hover-bg;
|
||||
|
||||
.caret {
|
||||
border-top-color: @nav-pills-active-link-hover-color;
|
||||
border-bottom-color: @nav-pills-active-link-hover-color;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -243,16 +233,6 @@
|
||||
// Dropdowns
|
||||
// -------------------------
|
||||
|
||||
// Make dropdown carets use link color in navs
|
||||
.nav .caret {
|
||||
border-top-color: @link-color;
|
||||
border-bottom-color: @link-color;
|
||||
}
|
||||
.nav a:hover .caret {
|
||||
border-top-color: @link-hover-color;
|
||||
border-bottom-color: @link-hover-color;
|
||||
}
|
||||
|
||||
// Specific dropdowns
|
||||
.nav-tabs .dropdown-menu {
|
||||
// make dropdown border overlap tab border
|
||||
|
||||
@ -186,8 +186,6 @@
|
||||
|
||||
@dropdown-header-color: @gray-light;
|
||||
|
||||
@dropdown-caret-color: #000;
|
||||
|
||||
|
||||
// COMPONENT VARIABLES
|
||||
// --------------------------------------------------
|
||||
@ -321,7 +319,6 @@
|
||||
@nav-disabled-link-hover-color: @gray-light;
|
||||
|
||||
@nav-open-link-hover-color: #fff;
|
||||
@nav-open-caret-border-color: #fff;
|
||||
|
||||
// Tabs
|
||||
@nav-tabs-border-color: #ddd;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user