diff options
author | Thomas Park <thomas@thomaspark.me> | 2015-01-22 22:36:20 -0500 |
---|---|---|
committer | Thomas Park <thomas@thomaspark.me> | 2015-01-22 22:36:20 -0500 |
commit | 25f57ee1fe9773b08d95d5f7d6ba93e2db048f8f (patch) | |
tree | 8e4448eed6bce0fa1288321e18c2b4675b8cb393 /bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap | |
parent | 0a7f9e5bb684c185d309d1ac1079dfb8b36af33c (diff) |
update bootstrap to 3.3.2
Diffstat (limited to 'bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap')
22 files changed, 173 insertions, 49 deletions
diff --git a/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_alerts.scss b/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_alerts.scss index e45de830..372eec97 100644 --- a/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_alerts.scss +++ b/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_alerts.scss @@ -18,6 +18,7 @@ // Specified for the h4 to prevent conflicts of changing $headings-color color: inherit; } + // Provide class for links that match alerts .alert-link { font-weight: $alert-link-font-weight; @@ -28,6 +29,7 @@ > ul { margin-bottom: 0; } + > p + p { margin-top: 5px; } @@ -57,12 +59,15 @@ .alert-success { @include alert-variant($alert-success-bg, $alert-success-border, $alert-success-text); } + .alert-info { @include alert-variant($alert-info-bg, $alert-info-border, $alert-info-text); } + .alert-warning { @include alert-variant($alert-warning-bg, $alert-warning-border, $alert-warning-text); } + .alert-danger { @include alert-variant($alert-danger-bg, $alert-danger-border, $alert-danger-text); } diff --git a/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_badges.scss b/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_badges.scss index c913f144..a647592d 100644 --- a/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_badges.scss +++ b/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_badges.scss @@ -28,6 +28,7 @@ position: relative; top: -1px; } + .btn-xs & { top: 0; padding: 1px 5px; @@ -41,12 +42,15 @@ 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-sass-official/assets/stylesheets/bootstrap/_button-groups.scss b/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_button-groups.scss index e761daaf..a73bc54d 100644 --- a/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_button-groups.scss +++ b/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_button-groups.scss @@ -71,13 +71,13 @@ .btn-group > .btn-group:not(:first-child):not(:last-child) > .btn { border-radius: 0; } -.btn-group > .btn-group:first-child { +.btn-group > .btn-group:first-child:not(:last-child) { > .btn:last-child, > .dropdown-toggle { @include border-right-radius(0); } } -.btn-group > .btn-group:last-child > .btn:first-child { +.btn-group > .btn-group:last-child:not(:first-child) > .btn:first-child { @include border-left-radius(0); } diff --git a/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_buttons.scss b/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_buttons.scss index 37bf259e..7f0db458 100644 --- a/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_buttons.scss +++ b/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_buttons.scss @@ -107,7 +107,7 @@ &:hover, &:focus { color: $link-hover-color; - text-decoration: underline; + text-decoration: $link-hover-decoration; background-color: transparent; } &[disabled], diff --git a/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_carousel.scss b/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_carousel.scss index 49db83fc..f91d7ee3 100644 --- a/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_carousel.scss +++ b/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_carousel.scss @@ -27,24 +27,24 @@ // WebKit CSS3 transforms for supported devices @media all and (transform-3d), (-webkit-transform-3d) { - transition: transform .6s ease-in-out; - backface-visibility: hidden; - perspective: 1000; + @include transition-transform(0.6s ease-in-out); + @include backface-visibility(hidden); + @include perspective(1000); &.next, &.active.right { - transform: translate3d(100%, 0, 0); + @include translate3d(100%, 0, 0); left: 0; } &.prev, &.active.left { - transform: translate3d(-100%, 0, 0); + @include translate3d(-100%, 0, 0); left: 0; } &.next.left, &.prev.right, &.active { - transform: translate3d(0, 0, 0); + @include translate3d(0, 0, 0); left: 0; } } @@ -148,6 +148,7 @@ width: 20px; height: 20px; margin-top: -10px; + line-height: 1; font-family: serif; } @@ -195,6 +196,7 @@ // Internet Explorer 8-9 does not support clicks on elements without a set // `background-color`. We cannot use `filter` since that's not viewed as a // background color by the browser. Thus, a hack is needed. + // See https://developer.mozilla.org/en-US/docs/Web/Events/click#Internet_Explorer // // For IE8, we set solid black as it doesn't support `rgba()`. For IE9, we // set alpha transparency for the best results possible. diff --git a/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_close.scss b/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_close.scss index 62ce30fa..3b74d8a9 100644 --- a/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_close.scss +++ b/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_close.scss @@ -26,6 +26,7 @@ // Additional properties for button version // iOS requires the button element instead of an anchor tag. // If you want the anchor version, it requires `href="#"`. +// See https://developer.mozilla.org/en-US/docs/Web/Events/click#Safari_Mobile button.close { padding: 0; cursor: pointer; diff --git a/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_dropdowns.scss b/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_dropdowns.scss index c7256e10..b8120b8e 100644 --- a/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_dropdowns.scss +++ b/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_dropdowns.scss @@ -16,6 +16,7 @@ } // The dropdown wrapper (div) +.dropup, .dropdown { position: relative; } @@ -190,7 +191,7 @@ .dropdown-menu { top: auto; bottom: 100%; - margin-bottom: 1px; + margin-bottom: 2px; } } diff --git a/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_forms.scss b/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_forms.scss index 439657c0..72d130b7 100644 --- a/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_forms.scss +++ b/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_forms.scss @@ -123,7 +123,7 @@ output { background-color: $input-bg; background-image: none; // Reset unusual Firefox-on-Android default style; see https://github.com/necolas/normalize.css/issues/214 border: 1px solid $input-border; - border-radius: $input-border-radius; + border-radius: $input-border-radius; // Note: This has no effect on <select>s in some browsers, due to the limited stylability of <select>s in CSS. @include box-shadow(inset 0 1px 1px rgba(0,0,0,.075)); @include transition(border-color ease-in-out .15s, box-shadow ease-in-out .15s); @@ -143,7 +143,7 @@ output { fieldset[disabled] & { cursor: $cursor-disabled; background-color: $input-bg-disabled; - opacity: 1; // iOS fix for unreadable disabled content + opacity: 1; // iOS fix for unreadable disabled content; see https://github.com/twbs/bootstrap/issues/11655 } // [converter] extracted textarea& to textarea.form-control @@ -172,7 +172,7 @@ input[type="search"] { // 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, but only -// for Safari. +// for Safari. See https://bugs.webkit.org/show_bug.cgi?id=139848 @media screen and (-webkit-min-device-pixel-ratio: 0) { input[type="date"], @@ -180,18 +180,16 @@ input[type="search"] { 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; - } - 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; + + &.input-sm, + .input-group-sm & { + line-height: $input-height-small; + } + + &.input-lg, + .input-group-lg & { + line-height: $input-height-large; + } } } @@ -311,10 +309,35 @@ input[type="checkbox"] { // // Build on `.form-control` with modifier classes to decrease or increase the // height and font-size of form controls. +// +// The `.form-group-* form-control` variations are sadly duplicated to avoid the +// issue documented in https://github.com/twbs/bootstrap/issues/15074. + +@include input-size('.input-sm', $input-height-small, $padding-small-vertical, $padding-small-horizontal, $font-size-small, $line-height-small, $input-border-radius-small); +.form-group-sm { -@include input-size('.input-sm, .form-group-sm .form-control', $input-height-small, $padding-small-vertical, $padding-small-horizontal, $font-size-small, $line-height-small, $input-border-radius-small); + @include input-size('.form-control', $input-height-small, $padding-small-vertical, $padding-small-horizontal, $font-size-small, $line-height-small, $input-border-radius-small); -@include input-size('.input-lg, .form-group-lg .form-control', $input-height-large, $padding-large-vertical, $padding-large-horizontal, $font-size-large, $line-height-large, $input-border-radius-large); + .form-control-static { + height: $input-height-small; + padding: $padding-small-vertical $padding-small-horizontal; + font-size: $font-size-small; + line-height: $line-height-small; + } +} + +@include input-size('.input-lg', $input-height-large, $padding-large-vertical, $padding-large-horizontal, $font-size-large, $line-height-large, $input-border-radius-large); +.form-group-lg { + + @include input-size('.form-control', $input-height-large, $padding-large-vertical, $padding-large-horizontal, $font-size-large, $line-height-large, $input-border-radius-large); + + .form-control-static { + height: $input-height-large; + padding: $padding-large-vertical $padding-large-horizontal; + font-size: $font-size-large; + line-height: $line-height-large; + } +} // Form control feedback states @@ -447,8 +470,7 @@ input[type="checkbox"] { } // Remove default margin on radios/checkboxes that were used for stacking, and - // then undo the floating of radios and checkboxes to match (which also avoids - // a bug in WebKit: https://github.com/twbs/bootstrap/issues/1969). + // then undo the floating of radios and checkboxes to match. .radio, .checkbox { display: inline-block; diff --git a/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_glyphicons.scss b/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_glyphicons.scss index 5486eaa4..dc95ed7d 100644 --- a/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_glyphicons.scss +++ b/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_glyphicons.scss @@ -12,6 +12,7 @@ font-family: 'Glyphicons Halflings'; src: url(if($bootstrap-sass-asset-helper, twbs-font-path('#{$icon-font-path}#{$icon-font-name}.eot'), '#{$icon-font-path}#{$icon-font-name}.eot')); src: url(if($bootstrap-sass-asset-helper, twbs-font-path('#{$icon-font-path}#{$icon-font-name}.eot?#iefix'), '#{$icon-font-path}#{$icon-font-name}.eot?#iefix')) format('embedded-opentype'), + url(if($bootstrap-sass-asset-helper, twbs-font-path('#{$icon-font-path}#{$icon-font-name}.woff2'), '#{$icon-font-path}#{$icon-font-name}.woff2')) format('woff2'), url(if($bootstrap-sass-asset-helper, twbs-font-path('#{$icon-font-path}#{$icon-font-name}.woff'), '#{$icon-font-path}#{$icon-font-name}.woff')) format('woff'), url(if($bootstrap-sass-asset-helper, twbs-font-path('#{$icon-font-path}#{$icon-font-name}.ttf'), '#{$icon-font-path}#{$icon-font-name}.ttf')) format('truetype'), url(if($bootstrap-sass-asset-helper, twbs-font-path('#{$icon-font-path}#{$icon-font-name}.svg##{$icon-font-svg-id}'), '#{$icon-font-path}#{$icon-font-name}.svg##{$icon-font-svg-id}')) format('svg'); @@ -232,3 +233,69 @@ .glyphicon-cloud-upload { &:before { content: "\e198"; } } .glyphicon-tree-conifer { &:before { content: "\e199"; } } .glyphicon-tree-deciduous { &:before { content: "\e200"; } } +.glyphicon-cd { &:before { content: "\e201"; } } +.glyphicon-save-file { &:before { content: "\e202"; } } +.glyphicon-open-file { &:before { content: "\e203"; } } +.glyphicon-level-up { &:before { content: "\e204"; } } +.glyphicon-copy { &:before { content: "\e205"; } } +.glyphicon-paste { &:before { content: "\e206"; } } +// The following 2 Glyphicons are omitted for the time being because +// they currently use Unicode codepoints that are outside the +// Basic Multilingual Plane (BMP). Older buggy versions of WebKit can't handle +// non-BMP codepoints in CSS string escapes, and thus can't display these two icons. +// Notably, the bug affects some older versions of the Android Browser. +// More info: https://github.com/twbs/bootstrap/issues/10106 +// .glyphicon-door { &:before { content: "\1f6aa"; } } +// .glyphicon-key { &:before { content: "\1f511"; } } +.glyphicon-alert { &:before { content: "\e209"; } } +.glyphicon-equalizer { &:before { content: "\e210"; } } +.glyphicon-king { &:before { content: "\e211"; } } +.glyphicon-queen { &:before { content: "\e212"; } } +.glyphicon-pawn { &:before { content: "\e213"; } } +.glyphicon-bishop { &:before { content: "\e214"; } } +.glyphicon-knight { &:before { content: "\e215"; } } +.glyphicon-baby-formula { &:before { content: "\e216"; } } +.glyphicon-tent { &:before { content: "\26fa"; } } +.glyphicon-blackboard { &:before { content: "\e218"; } } +.glyphicon-bed { &:before { content: "\e219"; } } +.glyphicon-apple { &:before { content: "\f8ff"; } } +.glyphicon-erase { &:before { content: "\e221"; } } +.glyphicon-hourglass { &:before { content: "\231b"; } } +.glyphicon-lamp { &:before { content: "\e223"; } } +.glyphicon-duplicate { &:before { content: "\e224"; } } +.glyphicon-piggy-bank { &:before { content: "\e225"; } } +.glyphicon-scissors { &:before { content: "\e226"; } } +.glyphicon-bitcoin { &:before { content: "\e227"; } } +.glyphicon-yen { &:before { content: "\00a5"; } } +.glyphicon-ruble { &:before { content: "\20bd"; } } +.glyphicon-scale { &:before { content: "\e230"; } } +.glyphicon-ice-lolly { &:before { content: "\e231"; } } +.glyphicon-ice-lolly-tasted { &:before { content: "\e232"; } } +.glyphicon-education { &:before { content: "\e233"; } } +.glyphicon-option-horizontal { &:before { content: "\e234"; } } +.glyphicon-option-vertical { &:before { content: "\e235"; } } +.glyphicon-menu-hamburger { &:before { content: "\e236"; } } +.glyphicon-modal-window { &:before { content: "\e237"; } } +.glyphicon-oil { &:before { content: "\e238"; } } +.glyphicon-grain { &:before { content: "\e239"; } } +.glyphicon-sunglasses { &:before { content: "\e240"; } } +.glyphicon-text-size { &:before { content: "\e241"; } } +.glyphicon-text-color { &:before { content: "\e242"; } } +.glyphicon-text-background { &:before { content: "\e243"; } } +.glyphicon-object-align-top { &:before { content: "\e244"; } } +.glyphicon-object-align-bottom { &:before { content: "\e245"; } } +.glyphicon-object-align-horizontal{ &:before { content: "\e246"; } } +.glyphicon-object-align-left { &:before { content: "\e247"; } } +.glyphicon-object-align-vertical { &:before { content: "\e248"; } } +.glyphicon-object-align-right { &:before { content: "\e249"; } } +.glyphicon-triangle-right { &:before { content: "\e250"; } } +.glyphicon-triangle-left { &:before { content: "\e251"; } } +.glyphicon-triangle-bottom { &:before { content: "\e252"; } } +.glyphicon-triangle-top { &:before { content: "\e253"; } } +.glyphicon-console { &:before { content: "\e254"; } } +.glyphicon-superscript { &:before { content: "\e255"; } } +.glyphicon-subscript { &:before { content: "\e256"; } } +.glyphicon-menu-left { &:before { content: "\e257"; } } +.glyphicon-menu-right { &:before { content: "\e258"; } } +.glyphicon-menu-down { &:before { content: "\e259"; } } +.glyphicon-menu-up { &:before { content: "\e260"; } } diff --git a/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_jumbotron.scss b/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_jumbotron.scss index ed4c6c99..e326b327 100644 --- a/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_jumbotron.scss +++ b/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_jumbotron.scss @@ -13,6 +13,7 @@ .h1 { color: $jumbotron-heading-color; } + p { margin-bottom: ($jumbotron-padding / 2); font-size: $jumbotron-font-size; diff --git a/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_media.scss b/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_media.scss index 292e98db..a6bf7819 100644 --- a/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_media.scss +++ b/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_media.scss @@ -7,6 +7,20 @@ } } +.media, +.media-body { + zoom: 1; + overflow: hidden; +} + +.media-body { + width: 10000px; +} + +.media-object { + display: block; +} + .media-right, .media > .pull-right { padding-left: 10px; diff --git a/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_navbar.scss b/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_navbar.scss index 73b8587b..ed36a993 100644 --- a/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_navbar.scss +++ b/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_navbar.scss @@ -331,6 +331,7 @@ } // Menu position and menu caret support for dropups via extra dropup class .navbar-fixed-bottom .navbar-nav > li > .dropdown-menu { + margin-bottom: 0; @include border-top-radius($navbar-border-radius); @include border-bottom-radius(0); } diff --git a/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_panels.scss b/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_panels.scss index 6c323d90..84847b47 100644 --- a/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_panels.scss +++ b/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_panels.scss @@ -36,7 +36,11 @@ font-size: ceil(($font-size-base * 1.125)); color: inherit; - > a { + > a, + > small, + > .small, + > small > a, + > .small > a { color: inherit; } } diff --git a/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_popovers.scss b/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_popovers.scss index 46c45f50..699c7b8d 100644 --- a/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_popovers.scss +++ b/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_popovers.scss @@ -11,7 +11,7 @@ display: none; max-width: $popover-max-width; padding: 1px; - // Reset font and text propertes given new insertion method + // Reset font and text properties given new insertion method font-family: $font-family-base; font-size: $font-size-base; font-weight: normal; diff --git a/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_responsive-utilities.scss b/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_responsive-utilities.scss index 4d9e13b5..8d02aaa3 100644 --- a/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_responsive-utilities.scss +++ b/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_responsive-utilities.scss @@ -26,7 +26,10 @@ // Visibility utilities // Note: Deprecated .visible-xs, .visible-sm, .visible-md, and .visible-lg as of v3.2.0 -@include responsive-invisibility('.visible-xs, .visible-sm, .visible-md, .visible-lg'); +@include responsive-invisibility('.visible-xs'); +@include responsive-invisibility('.visible-sm'); +@include responsive-invisibility('.visible-md'); +@include responsive-invisibility('.visible-lg'); .visible-xs-block, .visible-xs-inline, diff --git a/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_tables.scss b/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_tables.scss index a575ff1b..affcc58c 100644 --- a/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_tables.scss +++ b/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_tables.scss @@ -111,7 +111,7 @@ th { // Default zebra-stripe styles (alternating gray and transparent backgrounds) .table-striped { - > tbody > tr:nth-child(odd) { + > tbody > tr:nth-of-type(odd) { background-color: $table-bg-accent; } } @@ -133,7 +133,7 @@ th { // Reset default table behavior table col[class*="col-"] { - position: static; // Prevent border hiding in Firefox and IE9/10 (see https://github.com/twbs/bootstrap/issues/11623) + position: static; // Prevent border hiding in Firefox and IE9-11 (see https://github.com/twbs/bootstrap/issues/11623) float: none; display: table-column; } @@ -141,7 +141,7 @@ table { td, th { &[class*="col-"] { - position: static; // Prevent border hiding in Firefox and IE9/10 (see https://github.com/twbs/bootstrap/issues/11623) + position: static; // Prevent border hiding in Firefox and IE9-11 (see https://github.com/twbs/bootstrap/issues/11623) float: none; display: table-cell; } diff --git a/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_theme.scss b/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_theme.scss index 51534fe7..ed106a4f 100644 --- a/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_theme.scss +++ b/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_theme.scss @@ -36,7 +36,7 @@ // Mixin for generating new styles @mixin btn-styles($btn-color: #555) { @include gradient-vertical($start-color: $btn-color, $end-color: darken($btn-color, 12%)); - @include reset-filter; // Disable gradients for IE9 because filter bleeds through rounded corners + @include reset-filter; // Disable gradients for IE9 because filter bleeds through rounded corners; see https://github.com/twbs/bootstrap/issues/10620 background-repeat: repeat-x; border-color: darken($btn-color, 14%); @@ -52,6 +52,7 @@ border-color: darken($btn-color, 14%); } + &.disabled, &:disabled, &[disabled] { background-color: darken($btn-color, 12%); @@ -130,7 +131,7 @@ // Inverted navbar .navbar-inverse { @include gradient-vertical($start-color: lighten($navbar-inverse-bg, 10%), $end-color: $navbar-inverse-bg); - @include reset-filter; // Remove gradient in IE<10 to fix bug where dropdowns don't get triggered + @include reset-filter; // Remove gradient in IE<10 to fix bug where dropdowns don't get triggered; see https://github.com/twbs/bootstrap/issues/10257 .navbar-nav > .open > a, .navbar-nav > .active > a { diff --git a/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_tooltip.scss b/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_tooltip.scss index c6e43287..6004f598 100644 --- a/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_tooltip.scss +++ b/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_tooltip.scss @@ -9,7 +9,7 @@ z-index: $zindex-tooltip; display: block; visibility: visible; - // Reset font and text propertes given new insertion method + // Reset font and text properties given new insertion method font-family: $font-family-base; font-size: $font-size-small; font-weight: normal; diff --git a/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_variables.scss b/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_variables.scss index 7d190f26..578b7b69 100644 --- a/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_variables.scss +++ b/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_variables.scss @@ -1,8 +1,4 @@ -// When true, asset path helpers are used, otherwise the regular CSS `url()` is used. -// When there no function is defined, `fn('')` is parsed as string that equals the right hand side -// NB: in Sass 3.3 there is a native function: function-exists(twbs-font-path) -$bootstrap-sass-asset-helper: (twbs-font-path("") != unquote('twbs-font-path("")')) !default; - +$bootstrap-sass-asset-helper: false !default; // // Variables // -------------------------------------------------- @@ -19,7 +15,7 @@ $gray: lighten($gray-base, 33.5%) !default; // #555 $gray-light: lighten($gray-base, 46.7%) !default; // #777 $gray-lighter: lighten($gray-base, 93.5%) !default; // #eee -$brand-primary: darken(#428bca, 6.5%) !default; +$brand-primary: darken(#428bca, 6.5%) !default; // #337ab7 $brand-success: #5cb85c !default; $brand-info: #5bc0de !default; $brand-warning: #f0ad4e !default; @@ -82,7 +78,8 @@ $headings-color: inherit !default; //** Load fonts from this directory. -// [converter] Asset helpers such as Sprockets and Node.js Mincer do not resolve relative paths +// [converter] If $bootstrap-sass-asset-helper if used, provide path relative to the assets load path. +// [converter] This is because some asset helpers, such as Sprockets, do not work with file-relative paths. $icon-font-path: if($bootstrap-sass-asset-helper, "bootstrap/", "../fonts/bootstrap/") !default; //** File name for all font files. @@ -107,7 +104,7 @@ $padding-small-horizontal: 10px !default; $padding-xs-vertical: 1px !default; $padding-xs-horizontal: 5px !default; -$line-height-large: 1.33 !default; +$line-height-large: 1.3333333 !default; // extra decimals for Win 8.1 Chrome $line-height-small: 1.5 !default; $border-radius-base: 4px !default; @@ -195,6 +192,7 @@ $input-border: #ccc !default; // TODO: Rename `$input-border-radius` to `$input-border-radius-base` in v4 //** Default `.form-control` border radius +// This has no effect on `<select>`s in some browsers, due to the limited stylability of `<select>`s in CSS. $input-border-radius: $border-radius-base !default; //** Large `.form-control` border radius $input-border-radius-large: $border-radius-large !default; diff --git a/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/mixins/_hide-text.scss b/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/mixins/_hide-text.scss index 45db6385..c59d7361 100644 --- a/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/mixins/_hide-text.scss +++ b/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/mixins/_hide-text.scss @@ -8,7 +8,7 @@ // Deprecated as of v3.0.1 (will be removed in v4) @mixin hide-text() { - font: #{0/0} a; + font: 0/0 a; color: transparent; text-shadow: none; background-color: transparent; diff --git a/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/mixins/_opacity.scss b/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/mixins/_opacity.scss index df088adf..88e9a576 100644 --- a/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/mixins/_opacity.scss +++ b/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/mixins/_opacity.scss @@ -4,5 +4,5 @@ opacity: $opacity; // IE8 filter $opacity-ie: ($opacity * 100); - filter: #{alpha(opacity=$opacity-ie)}; + filter: alpha(opacity=$opacity-ie); } diff --git a/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/mixins/_vendor-prefixes.scss b/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/mixins/_vendor-prefixes.scss index a6b9ef4e..df4c1ec8 100644 --- a/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/mixins/_vendor-prefixes.scss +++ b/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/mixins/_vendor-prefixes.scss @@ -102,7 +102,7 @@ // Firefox &::-moz-placeholder { color: $color; - opacity: 1; // See https://github.com/twbs/bootstrap/pull/11526 + opacity: 1; // Override Firefox's unusual default opacity; see https://github.com/twbs/bootstrap/pull/11526 } &:-ms-input-placeholder { color: $color; } // Internet Explorer 10+ &::-webkit-input-placeholder { color: $color; } // Safari and Chrome |