From c7a2f6a5eedb2d2ac0ed448df36202b53611bca9 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Tue, 14 Apr 2015 20:41:17 -0400 Subject: [PATCH] updated bootstrap to v3.3.4 --- less/bootstrap/alerts.less | 5 ++ less/bootstrap/badges.less | 7 +- less/bootstrap/button-groups.less | 4 +- less/bootstrap/buttons.less | 2 +- less/bootstrap/carousel.less | 14 ++-- less/bootstrap/close.less | 1 + less/bootstrap/component-animations.less | 3 +- less/bootstrap/dropdowns.less | 5 +- less/bootstrap/forms.less | 74 +++++++++++++++------- less/bootstrap/glyphicons.less | 71 +++++++++++++++++++++ less/bootstrap/jumbotron.less | 1 + less/bootstrap/media.less | 14 ++++ less/bootstrap/mixins/vendor-prefixes.less | 2 +- less/bootstrap/modals.less | 4 +- less/bootstrap/navbar.less | 2 +- less/bootstrap/navs.less | 2 - less/bootstrap/panels.less | 6 +- less/bootstrap/popovers.less | 2 +- less/bootstrap/responsive-embed.less | 16 ++--- less/bootstrap/scaffolding.less | 12 ++++ less/bootstrap/tables.less | 6 +- less/bootstrap/theme.less | 5 +- less/bootstrap/tooltip.less | 3 +- less/bootstrap/type.less | 2 +- less/bootstrap/utilities.less | 1 - less/bootstrap/variables.less | 29 +++++---- 26 files changed, 220 insertions(+), 73 deletions(-) diff --git a/less/bootstrap/alerts.less b/less/bootstrap/alerts.less index df070b8..c4199db 100644 --- a/less/bootstrap/alerts.less +++ b/less/bootstrap/alerts.less @@ -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 { .alert-variant(@alert-success-bg; @alert-success-border; @alert-success-text); } + .alert-info { .alert-variant(@alert-info-bg; @alert-info-border; @alert-info-text); } + .alert-warning { .alert-variant(@alert-warning-bg; @alert-warning-border; @alert-warning-text); } + .alert-danger { .alert-variant(@alert-danger-bg; @alert-danger-border; @alert-danger-text); } diff --git a/less/bootstrap/badges.less b/less/bootstrap/badges.less index b27c405..c70bb93 100644 --- a/less/bootstrap/badges.less +++ b/less/bootstrap/badges.less @@ -28,7 +28,9 @@ position: relative; top: -1px; } - .btn-xs & { + + .btn-xs &, + .btn-group-xs > .btn & { top: 0; padding: 1px 5px; } @@ -49,12 +51,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/less/bootstrap/button-groups.less b/less/bootstrap/button-groups.less index f84febb..13c1800 100644 --- a/less/bootstrap/button-groups.less +++ b/less/bootstrap/button-groups.less @@ -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 { .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 { .border-left-radius(0); } diff --git a/less/bootstrap/buttons.less b/less/bootstrap/buttons.less index 40553c6..5a74604 100644 --- a/less/bootstrap/buttons.less +++ b/less/bootstrap/buttons.less @@ -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/less/bootstrap/carousel.less b/less/bootstrap/carousel.less index 5724d8a..4bbe946 100644 --- a/less/bootstrap/carousel.less +++ b/less/bootstrap/carousel.less @@ -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; + .transition-transform(~'0.6s ease-in-out'); + .backface-visibility(~'hidden'); + .perspective(1000); &.next, &.active.right { - transform: translate3d(100%, 0, 0); + .translate3d(100%, 0, 0); left: 0; } &.prev, &.active.left { - transform: translate3d(-100%, 0, 0); + .translate3d(-100%, 0, 0); left: 0; } &.next.left, &.prev.right, &.active { - transform: translate3d(0, 0, 0); + .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/less/bootstrap/close.less b/less/bootstrap/close.less index 9b4e74f..6d5bfe0 100644 --- a/less/bootstrap/close.less +++ b/less/bootstrap/close.less @@ -23,6 +23,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& { padding: 0; cursor: pointer; diff --git a/less/bootstrap/component-animations.less b/less/bootstrap/component-animations.less index 967715d..0bcee91 100644 --- a/less/bootstrap/component-animations.less +++ b/less/bootstrap/component-animations.less @@ -17,9 +17,8 @@ .collapse { display: none; - visibility: hidden; - &.in { display: block; visibility: visible; } + &.in { display: block; } tr&.in { display: table-row; } tbody&.in { display: table-row-group; } } diff --git a/less/bootstrap/dropdowns.less b/less/bootstrap/dropdowns.less index 84a48c1..af34460 100644 --- a/less/bootstrap/dropdowns.less +++ b/less/bootstrap/dropdowns.less @@ -10,12 +10,13 @@ height: 0; margin-left: 2px; vertical-align: middle; - border-top: @caret-width-base solid; + border-top: @caret-width-base dashed; border-right: @caret-width-base solid transparent; border-left: @caret-width-base solid transparent; } // 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/less/bootstrap/forms.less b/less/bootstrap/forms.less index 1bcc2b6..e4b5062 100644 --- a/less/bootstrap/forms.less +++ b/less/bootstrap/forms.less @@ -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 s in CSS. .box-shadow(inset 0 1px 1px rgba(0,0,0,.075)); .transition(~"border-color ease-in-out .15s, box-shadow ease-in-out .15s"); @@ -141,9 +141,13 @@ output { &[disabled], &[readonly], 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 + } + + &[disabled], + fieldset[disabled] & { + cursor: @cursor-disabled; } // Reset height for `textarea`s @@ -170,7 +174,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"], @@ -178,18 +182,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; + } } } @@ -200,7 +202,7 @@ input[type="search"] { // horizontal forms, use the predefined grid classes. .form-group { - margin-bottom: 15px; + margin-bottom: @form-group-margin-bottom; } @@ -240,6 +242,7 @@ input[type="search"] { // Radios and checkboxes on same line .radio-inline, .checkbox-inline { + position: relative; display: inline-block; padding-left: 20px; margin-bottom: 0; @@ -296,6 +299,7 @@ input[type="checkbox"] { padding-bottom: (@padding-base-vertical + 1); // Remove default margin from `p` margin-bottom: 0; + min-height: (@line-height-computed + @font-size-base); &.input-lg, &.input-sm { @@ -309,16 +313,41 @@ 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. -.input-sm, -.form-group-sm .form-control { +.input-sm { .input-size(@input-height-small; @padding-small-vertical; @padding-small-horizontal; @font-size-small; @line-height-small; @input-border-radius-small); } +.form-group-sm { + .form-control { + .input-size(@input-height-small; @padding-small-vertical; @padding-small-horizontal; @font-size-small; @line-height-small; @input-border-radius-small); + } + .form-control-static { + height: @input-height-small; + padding: @padding-small-vertical @padding-small-horizontal; + font-size: @font-size-small; + line-height: @line-height-small; + min-height: (@line-height-computed + @font-size-small); + } +} -.input-lg, -.form-group-lg .form-control { +.input-lg { .input-size(@input-height-large; @padding-large-vertical; @padding-large-horizontal; @font-size-large; @line-height-large; @input-border-radius-large); } +.form-group-lg { + .form-control { + .input-size(@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; + min-height: (@line-height-computed + @font-size-large); + } +} // Form control feedback states @@ -450,8 +479,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/less/bootstrap/glyphicons.less b/less/bootstrap/glyphicons.less index 6eab7f7..335d80a 100644 --- a/less/bootstrap/glyphicons.less +++ b/less/bootstrap/glyphicons.less @@ -12,6 +12,7 @@ font-family: 'Glyphicons Halflings'; src: url('@{icon-font-path}@{icon-font-name}.eot'); src: url('@{icon-font-path}@{icon-font-name}.eot?#iefix') format('embedded-opentype'), + url('@{icon-font-path}@{icon-font-name}.woff2') format('woff2'), url('@{icon-font-path}@{icon-font-name}.woff') format('woff'), url('@{icon-font-path}@{icon-font-name}.ttf') format('truetype'), url('@{icon-font-path}@{icon-font-name}.svg#@{icon-font-svg-id}') format('svg'); @@ -232,3 +233,73 @@ .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-btc { &:before { content: "\e227"; } } +.glyphicon-xbt { &:before { content: "\e227"; } } +.glyphicon-yen { &:before { content: "\00a5"; } } +.glyphicon-jpy { &:before { content: "\00a5"; } } +.glyphicon-ruble { &:before { content: "\20bd"; } } +.glyphicon-rub { &: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/less/bootstrap/jumbotron.less b/less/bootstrap/jumbotron.less index 340d4a3..93036d3 100644 --- a/less/bootstrap/jumbotron.less +++ b/less/bootstrap/jumbotron.less @@ -13,6 +13,7 @@ .h1 { color: @jumbotron-heading-color; } + p { margin-bottom: (@jumbotron-padding / 2); font-size: @jumbotron-font-size; diff --git a/less/bootstrap/media.less b/less/bootstrap/media.less index 292e98d..a6bf781 100644 --- a/less/bootstrap/media.less +++ b/less/bootstrap/media.less @@ -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/less/bootstrap/mixins/vendor-prefixes.less b/less/bootstrap/mixins/vendor-prefixes.less index 31f8e2f..afd3331 100644 --- a/less/bootstrap/mixins/vendor-prefixes.less +++ b/less/bootstrap/mixins/vendor-prefixes.less @@ -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 diff --git a/less/bootstrap/modals.less b/less/bootstrap/modals.less index 032a497..1de6220 100644 --- a/less/bootstrap/modals.less +++ b/less/bootstrap/modals.less @@ -62,10 +62,12 @@ // Modal background .modal-backdrop { - position: absolute; + position: fixed; top: 0; right: 0; + bottom: 0; left: 0; + z-index: @zindex-modal-background; background-color: @modal-backdrop-bg; // Fade for backdrop &.fade { .opacity(0); } diff --git a/less/bootstrap/navbar.less b/less/bootstrap/navbar.less index 67fd352..6d751bb 100644 --- a/less/bootstrap/navbar.less +++ b/less/bootstrap/navbar.less @@ -67,7 +67,6 @@ &.collapse { display: block !important; - visibility: visible !important; height: auto !important; padding-bottom: 0; // Override default setting overflow: visible !important; @@ -331,6 +330,7 @@ } // Menu position and menu caret support for dropups via extra dropup class .navbar-fixed-bottom .navbar-nav > li > .dropdown-menu { + margin-bottom: 0; .border-top-radius(@navbar-border-radius); .border-bottom-radius(0); } diff --git a/less/bootstrap/navs.less b/less/bootstrap/navs.less index f26fec7..a3d11b1 100644 --- a/less/bootstrap/navs.less +++ b/less/bootstrap/navs.less @@ -223,11 +223,9 @@ .tab-content { > .tab-pane { display: none; - visibility: hidden; } > .active { display: block; - visibility: visible; } } diff --git a/less/bootstrap/panels.less b/less/bootstrap/panels.less index d0f8f95..04eb2b3 100644 --- a/less/bootstrap/panels.less +++ b/less/bootstrap/panels.less @@ -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/less/bootstrap/popovers.less b/less/bootstrap/popovers.less index 53ee0ec..2748eea 100644 --- a/less/bootstrap/popovers.less +++ b/less/bootstrap/popovers.less @@ -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/less/bootstrap/responsive-embed.less b/less/bootstrap/responsive-embed.less index c1fa8f8..080a511 100644 --- a/less/bootstrap/responsive-embed.less +++ b/less/bootstrap/responsive-embed.less @@ -22,14 +22,14 @@ width: 100%; border: 0; } +} - // Modifier class for 16:9 aspect ratio - &.embed-responsive-16by9 { - padding-bottom: 56.25%; - } +// Modifier class for 16:9 aspect ratio +.embed-responsive-16by9 { + padding-bottom: 56.25%; +} - // Modifier class for 4:3 aspect ratio - &.embed-responsive-4by3 { - padding-bottom: 75%; - } +// Modifier class for 4:3 aspect ratio +.embed-responsive-4by3 { + padding-bottom: 75%; } diff --git a/less/bootstrap/scaffolding.less b/less/bootstrap/scaffolding.less index 2a40fbc..47b1d5a 100644 --- a/less/bootstrap/scaffolding.less +++ b/less/bootstrap/scaffolding.less @@ -148,3 +148,15 @@ hr { clip: auto; } } + + +// iOS "clickable elements" fix for role="button" +// +// Fixes "clickability" issue (and more generally, the firing of events such as focus as well) +// for traditionally non-focusable elements with role="button" +// see https://developer.mozilla.org/en-US/docs/Web/Events/click#Safari_Mobile +// Upstream patch for normalize.css submitted: https://github.com/necolas/normalize.css/pull/379 - remove this fix once that is merged + +[role="button"] { + cursor: pointer; +} \ No newline at end of file diff --git a/less/bootstrap/tables.less b/less/bootstrap/tables.less index ba24498..2242c03 100644 --- a/less/bootstrap/tables.less +++ b/less/bootstrap/tables.less @@ -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/less/bootstrap/theme.less b/less/bootstrap/theme.less index a15d16e..6f2eb62 100644 --- a/less/bootstrap/theme.less +++ b/less/bootstrap/theme.less @@ -36,7 +36,7 @@ // Mixin for generating new styles .btn-styles(@btn-color: #555) { #gradient > .vertical(@start-color: @btn-color; @end-color: darken(@btn-color, 12%)); - .reset-filter(); // Disable gradients for IE9 because filter bleeds through rounded corners + .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 { #gradient > .vertical(@start-color: lighten(@navbar-inverse-bg, 10%); @end-color: @navbar-inverse-bg); - .reset-filter(); // Remove gradient in IE<10 to fix bug where dropdowns don't get triggered + .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/less/bootstrap/tooltip.less b/less/bootstrap/tooltip.less index 9c2a37f..9d56847 100644 --- a/less/bootstrap/tooltip.less +++ b/less/bootstrap/tooltip.less @@ -8,8 +8,7 @@ position: absolute; 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/less/bootstrap/type.less b/less/bootstrap/type.less index 3ec976e..68ba601 100644 --- a/less/bootstrap/type.less +++ b/less/bootstrap/type.less @@ -238,7 +238,7 @@ abbr[data-original-title] { } .initialism { font-size: 90%; - text-transform: uppercase; + .text-uppercase(); } // Blockquotes diff --git a/less/bootstrap/utilities.less b/less/bootstrap/utilities.less index a260312..7a8ca27 100644 --- a/less/bootstrap/utilities.less +++ b/less/bootstrap/utilities.less @@ -44,7 +44,6 @@ .hidden { display: none !important; - visibility: hidden !important; } diff --git a/less/bootstrap/variables.less b/less/bootstrap/variables.less index 0a376de..b5fb9d0 100644 --- a/less/bootstrap/variables.less +++ b/less/bootstrap/variables.less @@ -14,7 +14,7 @@ @gray-light: lighten(@gray-base, 46.7%); // #777 @gray-lighter: lighten(@gray-base, 93.5%); // #eee -@brand-primary: darken(#428bca, 6.5%); +@brand-primary: darken(#428bca, 6.5%); // #337ab7 @brand-success: #5cb85c; @brand-info: #5bc0de; @brand-warning: #f0ad4e; @@ -42,7 +42,7 @@ // //## Font, line-height, and color for body text, headings, and more. -@font-family-sans-serif: "Roboto", "Helvetica Neue", Helvetica, Arial, sans-serif; +@font-family-sans-serif: "Helvetica Neue", Helvetica, Arial, sans-serif; @font-family-serif: Georgia, "Times New Roman", Times, serif; //** Default monospace fonts for ``, ``, and `
`.
 @font-family-monospace:   Menlo, Monaco, Consolas, "Courier New", monospace;
@@ -87,8 +87,8 @@
 //
 //## Define common padding and border radius sizes and more. Values based on 14px text and 1.428 line-height (~20px to start).
 
-@padding-base-vertical:     10px;
-@padding-base-horizontal:   16px;
+@padding-base-vertical:     6px;
+@padding-base-horizontal:   12px;
 
 @padding-large-vertical:    10px;
 @padding-large-horizontal:  16px;
@@ -99,12 +99,12 @@
 @padding-xs-vertical:       1px;
 @padding-xs-horizontal:     5px;
 
-@line-height-large:         1.33;
+@line-height-large:         1.3333333; // extra decimals for Win 8.1 Chrome
 @line-height-small:         1.5;
 
-@border-radius-base:        0;
-@border-radius-large:       0;
-@border-radius-small:       0;
+@border-radius-base:        4px;
+@border-radius-large:       6px;
+@border-radius-small:       3px;
 
 //** Global color for active items (e.g., navs or dropdowns).
 @component-active-color:    #fff;
@@ -187,6 +187,7 @@
 
 // TODO: Rename `@input-border-radius` to `@input-border-radius-base` in v4
 //** Default `.form-control` border radius
+// This has no effect on ``s in CSS.
 @input-border-radius:            @border-radius-base;
 //** Large `.form-control` border radius
 @input-border-radius-large:      @border-radius-large;
@@ -206,6 +207,9 @@
 //** Small `.form-control` height
 @input-height-small:             (floor(@font-size-small * @line-height-small) + (@padding-small-vertical * 2) + 2);
 
+//** `.form-group` margin
+@form-group-margin-bottom:       15px;
+
 @legend-color:                   @gray-dark;
 @legend-border-color:            #e5e5e5;
 
@@ -265,7 +269,8 @@
 @zindex-popover:           1060;
 @zindex-tooltip:           1070;
 @zindex-navbar-fixed:      1030;
-@zindex-modal:             1040;
+@zindex-modal-background:  1040;
+@zindex-modal:             1050;
 
 
 //== Media queries breakpoints
@@ -354,12 +359,12 @@
 @navbar-padding-vertical:          ((@navbar-height - @line-height-computed) / 2);
 @navbar-collapse-max-height:       340px;
 
-@navbar-default-color:             #333;
-@navbar-default-bg:                white;
+@navbar-default-color:             #777;
+@navbar-default-bg:                #f8f8f8;
 @navbar-default-border:            darken(@navbar-default-bg, 6.5%);
 
 // Navbar links
-@navbar-default-link-color:                #666;
+@navbar-default-link-color:                #777;
 @navbar-default-link-hover-color:          #333;
 @navbar-default-link-hover-bg:             transparent;
 @navbar-default-link-active-color:         #555;