diff options
| author | Mark Otto <[email protected]> | 2012-02-21 09:05:04 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-02-21 09:05:04 -0800 |
| commit | d908731566a18a236609708238e697b4fc3c1355 (patch) | |
| tree | 406f0f0a89c1aaee9ed57b9ccc91128d6f17bbf2 /less | |
| parent | 187b3bd4bd891295213a8b131cdf8e5e4d210286 (diff) | |
| parent | dfd03261863b2ccd98cc8ea746e9d5e515ac0b6e (diff) | |
| download | bootstrap-d908731566a18a236609708238e697b4fc3c1355.tar.xz bootstrap-d908731566a18a236609708238e697b4fc3c1355.zip | |
Merge branch '2.0.2-wip-nowrapfix' of https://github.com/andriijas/bootstrap into andriijas-2.0.2-wip-nowrapfix
Conflicts:
docs/assets/bootstrap.zip
Diffstat (limited to 'less')
| -rw-r--r-- | less/badges.less | 1 | ||||
| -rw-r--r-- | less/labels.less | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/less/badges.less b/less/badges.less index 6f74108ee..97dadcefa 100644 --- a/less/badges.less +++ b/less/badges.less @@ -6,6 +6,7 @@ padding: 2px 10px 3px; font-size: @baseFontSize * .925; font-weight: bold; + white-space: nowrap; color: @white; background-color: @grayLight; .border-radius(10px); diff --git a/less/labels.less b/less/labels.less index ae6b00e02..8d9913470 100644 --- a/less/labels.less +++ b/less/labels.less @@ -6,6 +6,7 @@ padding: 2px 4px 3px; font-size: @baseFontSize * .85; font-weight: bold; + white-space: nowrap; color: @white; text-shadow: 0 -1px 0 rgba(0,0,0,.25); background-color: @grayLight; |