Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/twbs/bootstrap.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/less
diff options
context:
space:
mode:
authorTobias Lindig <tl@cm4all.com>2013-11-28 20:41:43 +0400
committerTobias Lindig <tl@cm4all.com>2013-11-28 20:41:43 +0400
commitea782486082251c5e28e974f5843b6c37147cf51 (patch)
tree7ce99851856eed901b2a990fb2956f11fcb2b958 /less
parent9829c86f7ca5c76ef21892ec1198858eebc99392 (diff)
removed all caret border color settings.
Diffstat (limited to 'less')
-rw-r--r--less/button-groups.less31
-rw-r--r--less/dropdowns.less4
-rw-r--r--less/mixins.less3
-rw-r--r--less/navbar.less36
-rw-r--r--less/navs.less20
-rw-r--r--less/variables.less3
6 files changed, 3 insertions, 94 deletions
diff --git a/less/button-groups.less b/less/button-groups.less
index c253576225..0a07a4bc8d 100644
--- a/less/button-groups.less
+++ b/less/button-groups.less
@@ -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 {
diff --git a/less/dropdowns.less b/less/dropdowns.less
index dbaf31fe0d..1a8f1973f4 100644
--- a/less/dropdowns.less
+++ b/less/dropdowns.less
@@ -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
diff --git a/less/mixins.less b/less/mixins.less
index dff49cb4d3..a919779844 100644
--- a/less/mixins.less
+++ b/less/mixins.less
@@ -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 {
diff --git a/less/navbar.less b/less/navbar.less
index 21cffc2500..d2ad023e19 100644
--- a/less/navbar.less
+++ b/less/navbar.less
@@ -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
diff --git a/less/navs.less b/less/navs.less
index 6cddcd494e..859d5d8666 100644
--- a/less/navs.less
+++ b/less/navs.less
@@ -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
diff --git a/less/variables.less b/less/variables.less
index 08bb701dba..cf217b3661 100644
--- a/less/variables.less
+++ b/less/variables.less
@@ -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;