Skip to content

Commit

Permalink
Synchronized with twbs/bootstrap#v3.3.1
Browse files Browse the repository at this point in the history
  • Loading branch information
caitp committed Dec 13, 2014
1 parent 69b09e6 commit 98c8da4
Show file tree
Hide file tree
Showing 14 changed files with 60 additions and 57 deletions.
2 changes: 1 addition & 1 deletion bower.json
@@ -1,6 +1,6 @@
{
"name": "strapless",
"version": "3.3.0",
"version": "3.3.1",
"authors": [
"Caitlin Potter <caitpotter88@gmail.com>"
],
Expand Down
8 changes: 7 additions & 1 deletion less/badges.less
Expand Up @@ -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;
}
Expand Down
4 changes: 0 additions & 4 deletions less/button-groups.less
Expand Up @@ -18,10 +18,6 @@
&.active {
z-index: 2;
}
&:focus {
// Remove focus outline when dropdown JS adds it after closing the menu
outline: 0;
}
}
}

Expand Down
51 changes: 19 additions & 32 deletions less/forms.less
Expand Up @@ -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;
}
}

Expand Down
3 changes: 2 additions & 1 deletion less/jumbotron.less
Expand Up @@ -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);
}
Expand Down
8 changes: 0 additions & 8 deletions less/list-group.less
Expand Up @@ -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;
}
}


Expand Down
4 changes: 2 additions & 2 deletions less/mixins/grid-framework.less
Expand Up @@ -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);
}
Expand All @@ -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);
}
Expand Down
3 changes: 1 addition & 2 deletions less/modals.less
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions less/navbar.less
Expand Up @@ -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);
}

Expand Down
1 change: 1 addition & 0 deletions less/popovers.less
Expand Up @@ -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;
Expand Down
12 changes: 12 additions & 0 deletions less/theme.less
Expand Up @@ -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
Expand Down
16 changes: 12 additions & 4 deletions less/tooltip.less
Expand Up @@ -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);

Expand Down Expand Up @@ -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;
Expand All @@ -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;
}
Expand All @@ -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;
}
Expand Down
2 changes: 1 addition & 1 deletion less/variables.less
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion package.json
@@ -1,6 +1,6 @@
{
"name": "bower-strapless",
"version": "3.3.0",
"version": "3.3.1",
"description": "Unadulterated Less stylesheet source files for Twitter Bootstrap (The sleek, intuitive, and powerful front-end framework for faster and easier web development)",
"scripts": {
"build": "grunt"
Expand Down

0 comments on commit 98c8da4

Please sign in to comment.