Commit 3111a85f authored by Thomas Park's avatar Thomas Park
Browse files

update bootstrap to 3.3.6

parent ffda96bc
...@@ -9,11 +9,11 @@ ...@@ -9,11 +9,11 @@
// from "path/to/font.ext#suffix" to "<%- asset_path(path/to/font.ext)) + #suffix %>" // from "path/to/font.ext#suffix" to "<%- asset_path(path/to/font.ext)) + #suffix %>"
// from "path/to/font.ext?#suffix" to "<%- asset_path(path/to/font.ext)) + ?#suffix %>" // from "path/to/font.ext?#suffix" to "<%- asset_path(path/to/font.ext)) + ?#suffix %>"
// or from "path/to/font.ext" just "<%- asset_path(path/to/font.ext)) %>" // or from "path/to/font.ext" just "<%- asset_path(path/to/font.ext)) %>"
@return "<%- asset_path('#{$path}'.replace(/[#?].*$/, '')) + '#{$path}'.replace(/(^[^#?]*)([#?]?.*$)/, '$2') %>"; @return "<%- asset_path("#{$path}".replace(/[#?].*$/, '')) + "#{$path}".replace(/(^[^#?]*)([#?]?.*$)/, '$2') %>";
} }
@function twbs-image-path($file) { @function twbs-image-path($file) {
@return "<%- asset_path('#{$file}') %>"; @return "<%- asset_path("#{$file}") %>";
} }
$bootstrap-sass-asset-helper: true; $bootstrap-sass-asset-helper: true;
/*! /*!
* Bootstrap v3.3.5 (http://getbootstrap.com) * Bootstrap v3.3.6 (http://getbootstrap.com)
* Copyright 2011-2015 Twitter, Inc. * Copyright 2011-2015 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
*/ */
......
...@@ -14,7 +14,9 @@ ...@@ -14,7 +14,9 @@
display: inline-block; display: inline-block;
+ li:before { + li:before {
content: "#{$breadcrumb-separator}\00a0"; // Unicode space added since inline-block means non-collapsing white-space // [converter] Workaround for https://github.com/sass/libsass/issues/1115
$nbsp: "\00a0";
content: "#{$breadcrumb-separator}#{$nbsp}"; // Unicode space added since inline-block means non-collapsing white-space
padding: 0 5px; padding: 0 5px;
color: $breadcrumb-color; color: $breadcrumb-color;
} }
......
...@@ -173,12 +173,12 @@ ...@@ -173,12 +173,12 @@
border-radius: 0; border-radius: 0;
} }
&:first-child:not(:last-child) { &:first-child:not(:last-child) {
border-top-right-radius: $btn-border-radius-base; @include border-top-radius($btn-border-radius-base);
@include border-bottom-radius(0); @include border-bottom-radius(0);
} }
&:last-child:not(:first-child) { &:last-child:not(:first-child) {
border-bottom-left-radius: $btn-border-radius-base;
@include border-top-radius(0); @include border-top-radius(0);
@include border-bottom-radius($btn-border-radius-base);
} }
} }
.btn-group-vertical > .btn-group:not(:first-child):not(:last-child) > .btn { .btn-group-vertical > .btn-group:not(:first-child):not(:last-child) > .btn {
......
...@@ -101,6 +101,7 @@ ...@@ -101,6 +101,7 @@
color: $carousel-control-color; color: $carousel-control-color;
text-align: center; text-align: center;
text-shadow: $carousel-text-shadow; text-shadow: $carousel-text-shadow;
background-color: rgba(0, 0, 0, 0); // Fix IE9 click-thru bug
// We can't have this transition here because WebKit cancels the carousel // We can't have this transition here because WebKit cancels the carousel
// animation if you trip this while in the middle of another animation. // animation if you trip this while in the middle of another animation.
...@@ -240,18 +241,18 @@ ...@@ -240,18 +241,18 @@
.glyphicon-chevron-right, .glyphicon-chevron-right,
.icon-prev, .icon-prev,
.icon-next { .icon-next {
width: 30px; width: ($carousel-control-font-size * 1.5);
height: 30px; height: ($carousel-control-font-size * 1.5);
margin-top: -15px; margin-top: ($carousel-control-font-size / -2);
font-size: 30px; font-size: ($carousel-control-font-size * 1.5);
} }
.glyphicon-chevron-left, .glyphicon-chevron-left,
.icon-prev { .icon-prev {
margin-left: -15px; margin-left: ($carousel-control-font-size / -2);
} }
.glyphicon-chevron-right, .glyphicon-chevron-right,
.icon-next { .icon-next {
margin-right: -15px; margin-right: ($carousel-control-font-size / -2);
} }
} }
......
...@@ -132,6 +132,12 @@ output { ...@@ -132,6 +132,12 @@ output {
// Placeholder // Placeholder
@include placeholder; @include placeholder;
// Unstyle the caret on `<select>`s in IE10+.
&::-ms-expand {
border: 0;
background-color: transparent;
}
// Disabled and read-only inputs // Disabled and read-only inputs
// //
// HTML5 says that controls under a fieldset > legend:first-child won't be // HTML5 says that controls under a fieldset > legend:first-child won't be
...@@ -431,10 +437,10 @@ input[type="checkbox"] { ...@@ -431,10 +437,10 @@ input[type="checkbox"] {
.has-feedback label { .has-feedback label {
& ~ .form-control-feedback { & ~ .form-control-feedback {
top: ($line-height-computed + 5); // Height of the `label` and its margin top: ($line-height-computed + 5); // Height of the `label` and its margin
} }
&.sr-only ~ .form-control-feedback { &.sr-only ~ .form-control-feedback {
top: 0; top: 0;
} }
} }
...@@ -595,7 +601,7 @@ input[type="checkbox"] { ...@@ -595,7 +601,7 @@ input[type="checkbox"] {
.form-group-lg { .form-group-lg {
@media (min-width: $screen-sm-min) { @media (min-width: $screen-sm-min) {
.control-label { .control-label {
padding-top: (($padding-large-vertical * $line-height-large) + 1); padding-top: ($padding-large-vertical + 1);
font-size: $font-size-large; font-size: $font-size-large;
} }
} }
......
...@@ -34,8 +34,8 @@ ...@@ -34,8 +34,8 @@
} }
// Individual icons // Individual icons
.glyphicon-asterisk { &:before { content: "\2a"; } } .glyphicon-asterisk { &:before { content: "\002a"; } }
.glyphicon-plus { &:before { content: "\2b"; } } .glyphicon-plus { &:before { content: "\002b"; } }
.glyphicon-euro, .glyphicon-euro,
.glyphicon-eur { &:before { content: "\20ac"; } } .glyphicon-eur { &:before { content: "\20ac"; } }
.glyphicon-minus { &:before { content: "\2212"; } } .glyphicon-minus { &:before { content: "\2212"; } }
......
...@@ -29,6 +29,10 @@ ...@@ -29,6 +29,10 @@
width: 100%; width: 100%;
margin-bottom: 0; margin-bottom: 0;
&:focus {
z-index: 3;
}
} }
} }
...@@ -79,18 +83,18 @@ ...@@ -79,18 +83,18 @@
text-align: center; text-align: center;
background-color: $input-group-addon-bg; background-color: $input-group-addon-bg;
border: 1px solid $input-group-addon-border-color; border: 1px solid $input-group-addon-border-color;
border-radius: $border-radius-base; border-radius: $input-border-radius;
// Sizing // Sizing
&.input-sm { &.input-sm {
padding: $padding-small-vertical $padding-small-horizontal; padding: $padding-small-vertical $padding-small-horizontal;
font-size: $font-size-small; font-size: $font-size-small;
border-radius: $border-radius-small; border-radius: $input-border-radius-small;
} }
&.input-lg { &.input-lg {
padding: $padding-large-vertical $padding-large-horizontal; padding: $padding-large-vertical $padding-large-horizontal;
font-size: $font-size-large; font-size: $font-size-large;
border-radius: $border-radius-large; border-radius: $input-border-radius-large;
} }
// Nuke default margins from checkboxes and radios to vertically center within. // Nuke default margins from checkboxes and radios to vertically center within.
......
...@@ -28,6 +28,8 @@ ...@@ -28,6 +28,8 @@
.container &, .container &,
.container-fluid & { .container-fluid & {
border-radius: $border-radius-large; // Only round corners at higher resolutions if contained in a container border-radius: $border-radius-large; // Only round corners at higher resolutions if contained in a container
padding-left: ($grid-gutter-width / 2);
padding-right: ($grid-gutter-width / 2);
} }
.container { .container {
......
...@@ -79,7 +79,7 @@ ...@@ -79,7 +79,7 @@
.modal-header { .modal-header {
padding: $modal-title-padding; padding: $modal-title-padding;
border-bottom: 1px solid $modal-header-border-color; border-bottom: 1px solid $modal-header-border-color;
min-height: ($modal-title-padding + $modal-title-line-height); @include clearfix;
} }
// Close icon // Close icon
.modal-header .close { .modal-header .close {
......
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
> li > span { > li > span {
&:hover, &:hover,
&:focus { &:focus {
z-index: 3; z-index: 2;
color: $pagination-hover-color; color: $pagination-hover-color;
background-color: $pagination-hover-bg; background-color: $pagination-hover-bg;
border-color: $pagination-hover-border; border-color: $pagination-hover-border;
...@@ -52,7 +52,7 @@ ...@@ -52,7 +52,7 @@
&, &,
&:hover, &:hover,
&:focus { &:focus {
z-index: 2; z-index: 3;
color: $pagination-active-color; color: $pagination-active-color;
background-color: $pagination-active-bg; background-color: $pagination-active-bg;
border-color: $pagination-active-border; border-color: $pagination-active-border;
......
/*! /*!
* Bootstrap v3.3.5 (http://getbootstrap.com) * Bootstrap v3.3.6 (http://getbootstrap.com)
* Copyright 2011-2015 Twitter, Inc. * Copyright 2011-2015 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
*/ */
......
...@@ -207,7 +207,7 @@ dd { ...@@ -207,7 +207,7 @@ dd {
@include clearfix; // Clear the floated `dt` if an empty `dd` is present @include clearfix; // Clear the floated `dt` if an empty `dd` is present
} }
@media (min-width: $grid-float-breakpoint) { @media (min-width: $dl-horizontal-breakpoint) {
dt { dt {
float: left; float: left;
width: ($dl-horizontal-offset - 20); width: ($dl-horizontal-offset - 20);
......
...@@ -868,5 +868,7 @@ $blockquote-border-color: $gray-lighter !default; ...@@ -868,5 +868,7 @@ $blockquote-border-color: $gray-lighter !default;
$page-header-border-color: $gray-lighter !default; $page-header-border-color: $gray-lighter !default;
//** Width of horizontal description list titles //** Width of horizontal description list titles
$dl-horizontal-offset: $component-offset-horizontal !default; $dl-horizontal-offset: $component-offset-horizontal !default;
//** Point at which .dl-horizontal becomes horizontal
$dl-horizontal-breakpoint: $grid-float-breakpoint !default;
//** Horizontal line color. //** Horizontal line color.
$hr-border: $gray-lighter !default; $hr-border: $gray-lighter !default;
...@@ -42,12 +42,9 @@ ...@@ -42,12 +42,9 @@
&.disabled, &.disabled,
&[disabled], &[disabled],
fieldset[disabled] & { fieldset[disabled] & {
&,
&:hover, &:hover,
&:focus, &:focus,
&.focus, &.focus {
&:active,
&.active {
background-color: $background; background-color: $background;
border-color: $border; border-color: $border;
} }
......
...@@ -6,8 +6,8 @@ ...@@ -6,8 +6,8 @@
@mixin container-fixed($gutter: $grid-gutter-width) { @mixin container-fixed($gutter: $grid-gutter-width) {
margin-right: auto; margin-right: auto;
margin-left: auto; margin-left: auto;
padding-left: ($gutter / 2); padding-left: floor(($gutter / 2));
padding-right: ($gutter / 2); padding-right: ceil(($gutter / 2));
@include clearfix; @include clearfix;
} }
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
// //
// Source: https://github.com/h5bp/html5-boilerplate/commit/aa0396eae757 // Source: https://github.com/h5bp/html5-boilerplate/commit/aa0396eae757
// Deprecated as of v3.0.1 (will be removed in v4) // Deprecated as of v3.0.1 (has been removed in v4)
@mixin hide-text() { @mixin hide-text() {
font: 0/0 a; font: 0/0 a;
color: transparent; color: transparent;
......
// Vendor Prefixes // Vendor Prefixes
// //
// All vendor mixins are deprecated as of v3.2.0 due to the introduction of // All vendor mixins are deprecated as of v3.2.0 due to the introduction of
// Autoprefixer in our Gruntfile. They will be removed in v4. // Autoprefixer in our Gruntfile. They have been removed in v4.
// - Animations // - Animations
// - Backface visibility // - Backface visibility
...@@ -54,7 +54,7 @@ ...@@ -54,7 +54,7 @@
// Prevent browsers from flickering when using CSS 3D transforms. // Prevent browsers from flickering when using CSS 3D transforms.
// Default value is `visible`, but can be changed to `hidden` // Default value is `visible`, but can be changed to `hidden`
@mixin backface-visibility($visibility){ @mixin backface-visibility($visibility) {
-webkit-backface-visibility: $visibility; -webkit-backface-visibility: $visibility;
-moz-backface-visibility: $visibility; -moz-backface-visibility: $visibility;
backface-visibility: $visibility; backface-visibility: $visibility;
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
"Peter Gumeson", "Peter Gumeson",
"Gleb Mazovetskiy" "Gleb Mazovetskiy"
], ],
"description": "bootstrap-sass is a Sass-powered version of Bootstrap, ready to drop right into your Sass powered applications.", "description": "bootstrap-sass is a Sass-powered version of Bootstrap 3, ready to drop right into your Sass powered applications.",
"moduleType": "globals", "moduleType": "globals",
"main": [ "main": [
"assets/stylesheets/_bootstrap.scss", "assets/stylesheets/_bootstrap.scss",
...@@ -31,5 +31,6 @@ ...@@ -31,5 +31,6 @@
], ],
"dependencies": { "dependencies": {
"jquery": ">= 1.9.0" "jquery": ">= 1.9.0"
} },
"version": "3.3.6"
} }
{ {
"name": "twbs/bootstrap-sass", "name": "twbs/bootstrap-sass",
"description": "bootstrap-sass is a Sass-powered version of Bootstrap, ready to drop right into your Sass powered applications.", "description": "bootstrap-sass is a Sass-powered version of Bootstrap 3, ready to drop right into your Sass powered applications.",
"keywords": ["bootstrap", "css", "sass"], "keywords": ["bootstrap", "css", "sass"],
"homepage": "http://github.com/twbs/bootstrap-sass", "homepage": "http://github.com/twbs/bootstrap-sass",
"authors": [ "authors": [
......
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