summaryrefslogtreecommitdiff
path: root/bower_components/bootstrap/less
diff options
context:
space:
mode:
authorThomas Park <thomas@thomaspark.me>2014-11-12 15:34:02 -0500
committerThomas Park <thomas@thomaspark.me>2014-11-12 15:34:02 -0500
commit4e5b5fd0ee3d3e1856f32d5956cb7c8cc1029254 (patch)
treed32fa80285b3e7e0dd516794ccf382a706be2569 /bower_components/bootstrap/less
parentfa6487a9732f63b66399829fe3463a6192a26554 (diff)
update bootstrap to 3.3.1
Diffstat (limited to 'bower_components/bootstrap/less')
-rw-r--r--bower_components/bootstrap/less/badges.less8
-rw-r--r--bower_components/bootstrap/less/button-groups.less4
-rw-r--r--bower_components/bootstrap/less/forms.less51
-rw-r--r--bower_components/bootstrap/less/jumbotron.less3
-rw-r--r--bower_components/bootstrap/less/list-group.less8
-rw-r--r--bower_components/bootstrap/less/mixins/grid-framework.less4
-rw-r--r--bower_components/bootstrap/less/modals.less3
-rw-r--r--bower_components/bootstrap/less/navbar.less1
-rw-r--r--bower_components/bootstrap/less/popovers.less1
-rw-r--r--bower_components/bootstrap/less/theme.less12
-rw-r--r--bower_components/bootstrap/less/tooltip.less16
-rw-r--r--bower_components/bootstrap/less/variables.less2
12 files changed, 58 insertions, 55 deletions
diff --git a/bower_components/bootstrap/less/badges.less b/bower_components/bootstrap/less/badges.less
index 20624f30..b27c405a 100644
--- a/bower_components/bootstrap/less/badges.less
+++ b/bower_components/bootstrap/less/badges.less
@@ -44,11 +44,17 @@
}
// Account for badges in navs
- a.list-group-item.active > &,
+ .list-group-item.active > &,
.nav-pills > .active > a > & {
color: @badge-active-color;
background-color: @badge-active-bg;
}
+ .list-group-item > & {
+ float: right;
+ }
+ .list-group-item > & + & {
+ margin-right: 5px;
+ }
.nav-pills > li > a > & {
margin-left: 3px;
}
diff --git a/bower_components/bootstrap/less/button-groups.less b/bower_components/bootstrap/less/button-groups.less
index fbcdf457..f84febbd 100644
--- a/bower_components/bootstrap/less/button-groups.less
+++ b/bower_components/bootstrap/less/button-groups.less
@@ -18,10 +18,6 @@
&.active {
z-index: 2;
}
- &:focus {
- // Remove focus outline when dropdown JS adds it after closing the menu
- outline: 0;
- }
}
}
diff --git a/bower_components/bootstrap/less/forms.less b/bower_components/bootstrap/less/forms.less
index 38e4ce6d..1bcc2b6b 100644
--- a/bower_components/bootstrap/less/forms.less
+++ b/bower_components/bootstrap/less/forms.less
@@ -168,41 +168,28 @@ input[type="search"] {
// Special styles for iOS temporal inputs
//
// In Mobile Safari, setting `display: block` on temporal inputs causes the
-// text within the input to become vertically misaligned.
-// As a workaround, we set a pixel line-height that matches the
-// given height of the input. Since this fucks up everything else, we have to
-// appropriately reset it for Internet Explorer and the size variations.
-
-input[type="date"],
-input[type="time"],
-input[type="datetime-local"],
-input[type="month"] {
- line-height: @input-height-base;
- // IE8+ misaligns the text within date inputs, so we reset
- line-height: @line-height-base ~"\0";
-
- &.input-sm {
+// text within the input to become vertically misaligned. As a workaround, we
+// set a pixel line-height that matches the given height of the input, but only
+// for Safari.
+
+@media screen and (-webkit-min-device-pixel-ratio: 0) {
+ input[type="date"],
+ input[type="time"],
+ input[type="datetime-local"],
+ input[type="month"] {
+ line-height: @input-height-base;
+ }
+ input[type="date"].input-sm,
+ input[type="time"].input-sm,
+ input[type="datetime-local"].input-sm,
+ input[type="month"].input-sm {
line-height: @input-height-small;
- line-height: @line-height-small ~"\0";
}
- &.input-lg {
+ input[type="date"].input-lg,
+ input[type="time"].input-lg,
+ input[type="datetime-local"].input-lg,
+ input[type="month"].input-lg {
line-height: @input-height-large;
- line-height: @line-height-large ~"\0";
- }
-}
-
-// IE 11 hack to reverse the iOS temporal input hack.
-_:-ms-fullscreen, :root input[type="date"],
-_:-ms-fullscreen, :root input[type="time"],
-_:-ms-fullscreen, :root input[type="datetime-local"],
-_:-ms-fullscreen, :root input[type="month"] {
- line-height: @line-height-base;
-
- &.input-sm {
- line-height: @line-height-small;
- }
- &.input-lg {
- line-height: @line-height-large;
}
}
diff --git a/bower_components/bootstrap/less/jumbotron.less b/bower_components/bootstrap/less/jumbotron.less
index 9d1e2902..340d4a37 100644
--- a/bower_components/bootstrap/less/jumbotron.less
+++ b/bower_components/bootstrap/less/jumbotron.less
@@ -35,7 +35,8 @@
@media screen and (min-width: @screen-sm-min) {
padding: (@jumbotron-padding * 1.6) 0;
- .container & {
+ .container &,
+ .container-fluid & {
padding-left: (@jumbotron-padding * 2);
padding-right: (@jumbotron-padding * 2);
}
diff --git a/bower_components/bootstrap/less/list-group.less b/bower_components/bootstrap/less/list-group.less
index da657005..1462ce16 100644
--- a/bower_components/bootstrap/less/list-group.less
+++ b/bower_components/bootstrap/less/list-group.less
@@ -35,14 +35,6 @@
margin-bottom: 0;
.border-bottom-radius(@list-group-border-radius);
}
-
- // Align badges within list items
- > .badge {
- float: right;
- }
- > .badge + .badge {
- margin-right: 5px;
- }
}
diff --git a/bower_components/bootstrap/less/mixins/grid-framework.less b/bower_components/bootstrap/less/mixins/grid-framework.less
index 63178546..f3b3929d 100644
--- a/bower_components/bootstrap/less/mixins/grid-framework.less
+++ b/bower_components/bootstrap/less/mixins/grid-framework.less
@@ -5,7 +5,7 @@
.make-grid-columns() {
// Common styles for all sizes of grid columns, widths 1-12
- .col(@index) when (@index = 1) { // initial
+ .col(@index) { // initial
@item: ~".col-xs-@{index}, .col-sm-@{index}, .col-md-@{index}, .col-lg-@{index}";
.col((@index + 1), @item);
}
@@ -27,7 +27,7 @@
}
.float-grid-columns(@class) {
- .col(@index) when (@index = 1) { // initial
+ .col(@index) { // initial
@item: ~".col-@{class}-@{index}";
.col((@index + 1), @item);
}
diff --git a/bower_components/bootstrap/less/modals.less b/bower_components/bootstrap/less/modals.less
index 7468b14f..032a497d 100644
--- a/bower_components/bootstrap/less/modals.less
+++ b/bower_components/bootstrap/less/modals.less
@@ -62,10 +62,9 @@
// Modal background
.modal-backdrop {
- position: fixed;
+ position: absolute;
top: 0;
right: 0;
- bottom: 0;
left: 0;
background-color: @modal-backdrop-bg;
// Fade for backdrop
diff --git a/bower_components/bootstrap/less/navbar.less b/bower_components/bootstrap/less/navbar.less
index 30a79d4a..67fd3528 100644
--- a/bower_components/bootstrap/less/navbar.less
+++ b/bower_components/bootstrap/less/navbar.less
@@ -331,6 +331,7 @@
}
// Menu position and menu caret support for dropups via extra dropup class
.navbar-fixed-bottom .navbar-nav > li > .dropdown-menu {
+ .border-top-radius(@navbar-border-radius);
.border-bottom-radius(0);
}
diff --git a/bower_components/bootstrap/less/popovers.less b/bower_components/bootstrap/less/popovers.less
index ab720f2f..53ee0ecd 100644
--- a/bower_components/bootstrap/less/popovers.less
+++ b/bower_components/bootstrap/less/popovers.less
@@ -12,6 +12,7 @@
max-width: @popover-max-width;
padding: 1px;
// Reset font and text propertes given new insertion method
+ font-family: @font-family-base;
font-size: @font-size-base;
font-weight: normal;
line-height: @line-height-base;
diff --git a/bower_components/bootstrap/less/theme.less b/bower_components/bootstrap/less/theme.less
index 5a19d924..a15d16ec 100644
--- a/bower_components/bootstrap/less/theme.less
+++ b/bower_components/bootstrap/less/theme.less
@@ -151,6 +151,18 @@
border-radius: 0;
}
+// Fix active state of dropdown items in collapsed mode
+@media (max-width: @grid-float-breakpoint-max) {
+ .navbar .navbar-nav .open .dropdown-menu > .active > a {
+ &,
+ &:hover,
+ &:focus {
+ color: #fff;
+ #gradient > .vertical(@start-color: @dropdown-link-active-bg; @end-color: darken(@dropdown-link-active-bg, 5%));
+ }
+ }
+}
+
//
// Alerts
diff --git a/bower_components/bootstrap/less/tooltip.less b/bower_components/bootstrap/less/tooltip.less
index bd626996..9c2a37fd 100644
--- a/bower_components/bootstrap/less/tooltip.less
+++ b/bower_components/bootstrap/less/tooltip.less
@@ -9,7 +9,10 @@
z-index: @zindex-tooltip;
display: block;
visibility: visible;
+ // Reset font and text propertes given new insertion method
+ font-family: @font-family-base;
font-size: @font-size-small;
+ font-weight: normal;
line-height: 1.4;
.opacity(0);
@@ -39,6 +42,7 @@
border-color: transparent;
border-style: solid;
}
+// Note: Deprecated .top-left, .top-right, .bottom-left, and .bottom-right as of v3.3.1
.tooltip {
&.top .tooltip-arrow {
bottom: 0;
@@ -49,13 +53,15 @@
}
&.top-left .tooltip-arrow {
bottom: 0;
- left: @tooltip-arrow-width;
+ right: @tooltip-arrow-width;
+ margin-bottom: -@tooltip-arrow-width;
border-width: @tooltip-arrow-width @tooltip-arrow-width 0;
border-top-color: @tooltip-arrow-color;
}
&.top-right .tooltip-arrow {
bottom: 0;
- right: @tooltip-arrow-width;
+ left: @tooltip-arrow-width;
+ margin-bottom: -@tooltip-arrow-width;
border-width: @tooltip-arrow-width @tooltip-arrow-width 0;
border-top-color: @tooltip-arrow-color;
}
@@ -82,13 +88,15 @@
}
&.bottom-left .tooltip-arrow {
top: 0;
- left: @tooltip-arrow-width;
+ right: @tooltip-arrow-width;
+ margin-top: -@tooltip-arrow-width;
border-width: 0 @tooltip-arrow-width @tooltip-arrow-width;
border-bottom-color: @tooltip-arrow-color;
}
&.bottom-right .tooltip-arrow {
top: 0;
- right: @tooltip-arrow-width;
+ left: @tooltip-arrow-width;
+ margin-top: -@tooltip-arrow-width;
border-width: 0 @tooltip-arrow-width @tooltip-arrow-width;
border-bottom-color: @tooltip-arrow-color;
}
diff --git a/bower_components/bootstrap/less/variables.less b/bower_components/bootstrap/less/variables.less
index a215b855..b13be9d4 100644
--- a/bower_components/bootstrap/less/variables.less
+++ b/bower_components/bootstrap/less/variables.less
@@ -14,7 +14,7 @@
@gray-light: lighten(@gray-base, 46.7%); // #777
@gray-lighter: lighten(@gray-base, 93.5%); // #eee
-@brand-primary: #428bca;
+@brand-primary: darken(#428bca, 6.5%);
@brand-success: #5cb85c;
@brand-info: #5bc0de;
@brand-warning: #f0ad4e;