diff options
Diffstat (limited to 'less')
| -rw-r--r-- | less/pagination.less | 9 | ||||
| -rw-r--r-- | less/tables.less | 1 | ||||
| -rw-r--r-- | less/type.less | 55 | ||||
| -rw-r--r-- | less/variables.less | 8 |
4 files changed, 44 insertions, 29 deletions
diff --git a/less/pagination.less b/less/pagination.less index 5c68b8bbb..b2856ae60 100644 --- a/less/pagination.less +++ b/less/pagination.less @@ -16,6 +16,7 @@ padding: @padding-base-vertical @padding-base-horizontal; line-height: @line-height-base; text-decoration: none; + color: @pagination-color; background-color: @pagination-bg; border: 1px solid @pagination-border; margin-left: -1px; @@ -39,7 +40,9 @@ > li > span { &:hover, &:focus { + color: @pagination-hover-color; background-color: @pagination-hover-bg; + border-color: @pagination-hover-border; } } @@ -51,7 +54,7 @@ z-index: 2; color: @pagination-active-color; background-color: @pagination-active-bg; - border-color: @pagination-active-bg; + border-color: @pagination-active-border; cursor: default; } } @@ -64,8 +67,8 @@ > a:hover, > a:focus { color: @pagination-disabled-color; - background-color: @pagination-bg; - border-color: @pagination-border; + background-color: @pagination-disabled-bg; + border-color: @pagination-disabled-border; cursor: not-allowed; } } diff --git a/less/tables.less b/less/tables.less index f8c05fecf..c54b0129c 100644 --- a/less/tables.less +++ b/less/tables.less @@ -141,6 +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) float: none; display: table-cell; } diff --git a/less/type.less b/less/type.less index 1d01b9a71..585584470 100644 --- a/less/type.less +++ b/less/type.less @@ -263,12 +263,15 @@ abbr[data-original-title] { blockquote { padding: (@line-height-computed / 2) @line-height-computed; margin: 0 0 @line-height-computed; + font-size: (@font-size-base * 1.25); border-left: 5px solid @blockquote-border-color; - p { - font-size: (@font-size-base * 1.25); - } - p:last-child { - margin-bottom: 0; + + p, + ul, + ol { + &:last-child { + margin-bottom: 0; + } } // Deprecating small and .small for v3.1 @@ -277,32 +280,34 @@ blockquote { small, .small { display: block; + font-size: 80%; // back to default font-size line-height: @line-height-base; color: @blockquote-small-color; + &:before { - content: '\2014 \00A0'; // EM DASH, NBSP + content: '\2014 \00A0'; // em dash, nbsp } } +} - // Float right with text-align: right - &.pull-right { - padding-right: 15px; - padding-left: 0; - border-right: 5px solid @blockquote-border-color; - border-left: 0; - p, - small, - .small { - text-align: right; - } - small, - .small { - &:before { - content: ''; - } - &:after { - content: '\00A0 \2014'; // NBSP, EM DASH - } +// Opposite alignment of blockquote +// +// Heads up: `blockquote.pull-right` has been deprecated as of v3.1. +.blockquote-reverse, +blockquote.pull-right { + padding-right: 15px; + padding-left: 0; + border-right: 5px solid @blockquote-border-color; + border-left: 0; + text-align: right; + + // Account for citation + footer, + small, + .small { + &:before { content: ''; } + &:after { + content: '\00A0 \2014'; // nbsp, em dash } } } diff --git a/less/variables.less b/less/variables.less index 4c7de2a3d..b849cb400 100644 --- a/less/variables.less +++ b/less/variables.less @@ -352,15 +352,21 @@ // Pagination // ------------------------- +@pagination-color: @link-color; @pagination-bg: #fff; @pagination-border: #ddd; +@pagination-hover-color: @link-hover-color; @pagination-hover-bg: @gray-lighter; +@pagination-hover-border: #ddd; -@pagination-active-bg: @brand-primary; @pagination-active-color: #fff; +@pagination-active-bg: @brand-primary; +@pagination-active-border: @brand-primary; @pagination-disabled-color: @gray-light; +@pagination-disabled-bg: #fff; +@pagination-disabled-border: #ddd; // Pager |