diff options
| author | Mark Otto <[email protected]> | 2012-02-04 22:22:19 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-02-04 22:22:19 -0800 |
| commit | 7e81f84b29da8ba87fb4aefcc11946002ad9962c (patch) | |
| tree | 130579102ad3b46e6617c1427d99530af7444a95 /less | |
| parent | 81d1f3b96ea5c78d2e570c07c4c419a32a9b212c (diff) | |
| download | bootstrap-7e81f84b29da8ba87fb4aefcc11946002ad9962c.tar.xz bootstrap-7e81f84b29da8ba87fb4aefcc11946002ad9962c.zip | |
buttons and icons updated for improved placement and variable support for icon paths
Diffstat (limited to 'less')
| -rw-r--r-- | less/buttons.less | 4 | ||||
| -rw-r--r-- | less/sprites.less | 5 | ||||
| -rw-r--r-- | less/variables.less | 18 |
3 files changed, 16 insertions, 11 deletions
diff --git a/less/buttons.less b/less/buttons.less index 582350386..61d0bc7bf 100644 --- a/less/buttons.less +++ b/less/buttons.less @@ -76,7 +76,7 @@ line-height: normal; .border-radius(5px); } -.btn-large .icon { +.btn-large [class^="icon-"] { margin-top: 1px; } @@ -86,7 +86,7 @@ font-size: @baseFontSize - 2px; line-height: @baseLineHeight - 2px; } -.btn-small .icon { +.btn-small [class^="icon-"] { margin-top: -1px; } diff --git a/less/sprites.less b/less/sprites.less index 921c662d7..ce7668844 100644 --- a/less/sprites.less +++ b/less/sprites.less @@ -18,15 +18,16 @@ display: inline-block; width: 14px; height: 14px; + line-height: 14px; vertical-align: text-top; - background-image: url(../img/glyphicons-halflings.png); + background-image: url(@iconSpritePath); background-position: 14px 14px; background-repeat: no-repeat; .ie7-restore-right-whitespace(); } .icon-white { - background-image: url(../img/glyphicons-halflings-white.png); + background-image: url(@iconWhiteSpritePath); } .icon-glass { background-position: 0 0; } diff --git a/less/variables.less b/less/variables.less index f01c232e4..9f58d730e 100644 --- a/less/variables.less +++ b/less/variables.less @@ -47,15 +47,19 @@ // Z-index master list // Used for a bird's eye view of components dependent on the z-axis // Try to avoid customizing these :) -@zindexDropdown: 1000; -@zindexPopover: 1010; -@zindexTooltip: 1020; -@zindexFixedNavbar: 1030; -@zindexModalBackdrop: 1040; -@zindexModal: 1050; +@zindexDropdown: 1000; +@zindexPopover: 1010; +@zindexTooltip: 1020; +@zindexFixedNavbar: 1030; +@zindexModalBackdrop: 1040; +@zindexModal: 1050; + +// Sprite icons path +@iconSpritePath: "../img/glyphicons-halflings.png"; +@iconWhiteSpritePath: "../img/glyphicons-halflings-white.png"; // Input placeholder text color -@placeholderText: @grayLight; +@placeholderText: @grayLight; // Navbar @navbarHeight: 40px; |