diff options
Diffstat (limited to 'less')
| -rw-r--r-- | less/alerts.less | 5 | ||||
| -rw-r--r-- | less/badges.less | 4 | ||||
| -rw-r--r-- | less/buttons.less | 2 | ||||
| -rw-r--r-- | less/carousel.less | 1 | ||||
| -rw-r--r-- | less/close.less | 1 | ||||
| -rw-r--r-- | less/forms.less | 43 | ||||
| -rw-r--r-- | less/glyphicons.less | 11 | ||||
| -rw-r--r-- | less/jumbotron.less | 1 | ||||
| -rw-r--r-- | less/media.less | 4 | ||||
| -rw-r--r-- | less/mixins/vendor-prefixes.less | 2 | ||||
| -rw-r--r-- | less/navbar.less | 1 | ||||
| -rw-r--r-- | less/panels.less | 6 | ||||
| -rw-r--r-- | less/popovers.less | 2 | ||||
| -rw-r--r-- | less/tables.less | 6 | ||||
| -rw-r--r-- | less/theme.less | 5 | ||||
| -rw-r--r-- | less/tooltip.less | 2 | ||||
| -rw-r--r-- | less/variables.less | 3 |
17 files changed, 69 insertions, 30 deletions
diff --git a/less/alerts.less b/less/alerts.less index df070b8ab..5618bfcec 100644 --- a/less/alerts.less +++ b/less/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/badges.less b/less/badges.less index b27c405a3..4a8040253 100644 --- a/less/badges.less +++ b/less/badges.less @@ -28,6 +28,7 @@ position: relative; top: -1px; } + .btn-xs & { top: 0; padding: 1px 5px; @@ -49,12 +50,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/buttons.less b/less/buttons.less index 40553c638..5a746049e 100644 --- a/less/buttons.less +++ b/less/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/carousel.less b/less/carousel.less index a28e397a5..4bbe946d3 100644 --- a/less/carousel.less +++ b/less/carousel.less @@ -196,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/close.less b/less/close.less index 9b4e74f2b..6d5bfe087 100644 --- a/less/close.less +++ b/less/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/forms.less b/less/forms.less index 085d9d47c..3138c2c51 100644 --- a/less/forms.less +++ b/less/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 <select>s in some browsers, due to the limited stylability of <select>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"); @@ -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 } // Reset height for `textarea`s @@ -170,7 +170,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 +178,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; + } } } @@ -320,6 +318,12 @@ input[type="checkbox"] { .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; + } } .input-lg { @@ -329,6 +333,12 @@ input[type="checkbox"] { .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; + } } @@ -461,8 +471,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/glyphicons.less b/less/glyphicons.less index fcdc91de4..8b25f89a5 100644 --- a/less/glyphicons.less +++ b/less/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'); @@ -238,8 +239,14 @@ .glyphicon-level-up { &:before { content: "\e204"; } } .glyphicon-copy { &:before { content: "\e205"; } } .glyphicon-paste { &:before { content: "\e206"; } } -.glyphicon-door { &:before { content: "\1f6aa"; } } -.glyphicon-key { &:before { content: "\1F511"; } } +// 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"; } } diff --git a/less/jumbotron.less b/less/jumbotron.less index 340d4a372..d6410238a 100644 --- a/less/jumbotron.less +++ b/less/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/media.less b/less/media.less index ee1a600ea..a6bf78192 100644 --- a/less/media.less +++ b/less/media.less @@ -13,6 +13,10 @@ overflow: hidden; } +.media-body { + width: 10000px; +} + .media-object { display: block; } diff --git a/less/mixins/vendor-prefixes.less b/less/mixins/vendor-prefixes.less index 31f8e2f7a..afd3331c3 100644 --- a/less/mixins/vendor-prefixes.less +++ b/less/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/navbar.less b/less/navbar.less index 67fd3528f..0c835030e 100644 --- a/less/navbar.less +++ b/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 { + margin-bottom: 0; .border-top-radius(@navbar-border-radius); .border-bottom-radius(0); } diff --git a/less/panels.less b/less/panels.less index d0f8f95f4..04eb2b39c 100644 --- a/less/panels.less +++ b/less/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/popovers.less b/less/popovers.less index 53ee0ecd7..2748eead1 100644 --- a/less/popovers.less +++ b/less/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/tables.less b/less/tables.less index ba24498a3..2242c0368 100644 --- a/less/tables.less +++ b/less/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/theme.less b/less/theme.less index a15d16ecd..6f2eb6212 100644 --- a/less/theme.less +++ b/less/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/tooltip.less b/less/tooltip.less index 9c2a37fd4..3ebfdcdff 100644 --- a/less/tooltip.less +++ b/less/tooltip.less @@ -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/less/variables.less b/less/variables.less index b13be9d44..4c51ce96f 100644 --- a/less/variables.less +++ b/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: darken(#428bca, 6.5%); +@brand-primary: darken(#428bca, 6.5%); // #337ab7 @brand-success: #5cb85c; @brand-info: #5bc0de; @brand-warning: #f0ad4e; @@ -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 `<select>`s in some browsers, due to the limited stylability of `<select>`s in CSS. @input-border-radius: @border-radius-base; //** Large `.form-control` border radius @input-border-radius-large: @border-radius-large; |
