diff options
| author | Mark Otto <[email protected]> | 2015-01-18 12:24:29 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2015-01-18 12:24:29 -0800 |
| commit | 1bf1ba7103cf4de0364dfd8ec78a31eb813d7b8f (patch) | |
| tree | 7a63ae1a434fae8cb51835fafd1b531d5f5da64e /less/panels.less | |
| parent | dbe47654160d389c6991a312c9cecd2eeb9b6122 (diff) | |
| parent | 22b79dae3c9307c329e6722ff1be8aa0a4143812 (diff) | |
| download | bootstrap-1bf1ba7103cf4de0364dfd8ec78a31eb813d7b8f.tar.xz bootstrap-1bf1ba7103cf4de0364dfd8ec78a31eb813d7b8f.zip | |
Merge branch 'master' into pr/15278
Conflicts:
dist/css/bootstrap.css.map
dist/css/bootstrap.min.css
docs/assets/js/customize.min.js
docs/assets/js/raw-files.min.js
docs/dist/css/bootstrap.css.map
docs/dist/css/bootstrap.min.css
Diffstat (limited to 'less/panels.less')
| -rw-r--r-- | less/panels.less | 6 |
1 files changed, 5 insertions, 1 deletions
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; } } |