diff options
| author | Mark Otto <[email protected]> | 2013-10-13 15:24:48 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-10-13 15:24:48 -0700 |
| commit | 857e697d72eed7a02591e2f8eebd913a69d862df (patch) | |
| tree | 9a02033472ccacc3648f40bfaaf18f95d7c5648b /less | |
| parent | ef2e0c99f4c5958eb16a401b73a39465a301a484 (diff) | |
| parent | c75f8a5bf64acc5ffb45c8bb6221e412b0b08bcd (diff) | |
| download | bootstrap-857e697d72eed7a02591e2f8eebd913a69d862df.tar.xz bootstrap-857e697d72eed7a02591e2f8eebd913a69d862df.zip | |
Merge branch 'master' of github.com:twbs/bootstrap
Diffstat (limited to 'less')
| -rw-r--r-- | less/code.less | 2 | ||||
| -rw-r--r-- | less/type.less | 15 |
2 files changed, 11 insertions, 6 deletions
diff --git a/less/code.less b/less/code.less index 88bcde552..e12835401 100644 --- a/less/code.less +++ b/less/code.less @@ -42,7 +42,7 @@ pre { color: inherit; white-space: pre-wrap; background-color: transparent; - border: 0; + border-radius: 0; } } diff --git a/less/type.less b/less/type.less index 55e5e1d77..e5544ab3e 100644 --- a/less/type.less +++ b/less/type.less @@ -82,7 +82,8 @@ h1, h2, h3, h4, h5, h6, line-height: @headings-line-height; color: @headings-color; - small { + small, + .small { font-weight: normal; line-height: 1; color: @headings-small-color; @@ -95,7 +96,8 @@ h3 { margin-top: @line-height-computed; margin-bottom: (@line-height-computed / 2); - small { + small, + .small { font-size: 65%; } } @@ -105,7 +107,8 @@ h6 { margin-top: (@line-height-computed / 2); margin-bottom: (@line-height-computed / 2); - small { + small, + .small { font-size: 75%; } } @@ -240,10 +243,12 @@ blockquote { border-right: 5px solid @blockquote-border-color; border-left: 0; p, - small { + small, + .small { text-align: right; } - small { + small, + .small { &:before { content: ''; } |