diff options
| author | Mark Otto <[email protected]> | 2013-09-01 10:01:57 +0200 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-09-01 10:01:57 +0200 |
| commit | daa8330b414d5b12e943fd614aaad7a4cd2c0c51 (patch) | |
| tree | 7fbc61d31bf1023b5177f6b0c6b2cfa81c8d4bde /less | |
| parent | eb95574d8001591d1e056fcaeaf59138cbbb15a4 (diff) | |
| parent | 4b53ea52e9cc27ab27dde2695400fd6c95a0b6c2 (diff) | |
| download | bootstrap-daa8330b414d5b12e943fd614aaad7a4cd2c0c51.tar.xz bootstrap-daa8330b414d5b12e943fd614aaad7a4cd2c0c51.zip | |
Merge branch 'master' into dancek-breadcrumb-separator
Diffstat (limited to 'less')
| -rw-r--r-- | less/input-groups.less | 1 | ||||
| -rw-r--r-- | less/type.less | 1 | ||||
| -rw-r--r-- | less/variables.less | 2 |
3 files changed, 4 insertions, 0 deletions
diff --git a/less/input-groups.less b/less/input-groups.less index 570f03f90..3c05a458f 100644 --- a/less/input-groups.less +++ b/less/input-groups.less @@ -61,6 +61,7 @@ font-size: @font-size-base; font-weight: normal; line-height: 1; + color: @input-color; text-align: center; background-color: @input-group-addon-bg; border: 1px solid @input-group-addon-border-color; diff --git a/less/type.less b/less/type.less index 6e0b74e13..d921bf0ac 100644 --- a/less/type.less +++ b/less/type.less @@ -53,6 +53,7 @@ h1, h2, h3, h4, h5, h6, font-family: @headings-font-family; font-weight: @headings-font-weight; line-height: @headings-line-height; + color: inherit; small { font-weight: normal; diff --git a/less/variables.less b/less/variables.less index cfe768ccb..9b3cb0ad7 100644 --- a/less/variables.less +++ b/less/variables.less @@ -61,6 +61,8 @@ @headings-font-family: @font-family-base; @headings-font-weight: 500; @headings-line-height: 1.1; +@headings-color: inherit; + // Iconography // ------------------------- |