mirror_css/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-12 00:24:03 +02:00
Code Issues Releases Wiki Activity

buttons and icons updated for improved placement and variable support for icon paths

Browse Source
This commit is contained in:
Mark Otto
2012-02-04 22:22:19 -08:00
parent 81d1f3b96e
commit 7e81f84b29
5 changed files with 21 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
docs/assets/bootstrap.zip
View File

Binary file not shown.

9
docs/assets/css/bootstrap.css vendored
View File

@@ -1122,8 +1122,9 @@ table .span12 {
display: inline-block; display: inline-block;
width: 14px; width: 14px;
height: 14px; height: 14px;
line-height: 14px;
vertical-align: text-top; vertical-align: text-top;
background-image: url(../img/glyphicons-halflings.png); background-image: url("../img/glyphicons-halflings.png");
background-position: 14px 14px; background-position: 14px 14px;
background-repeat: no-repeat; background-repeat: no-repeat;
*margin-right: .3em; *margin-right: .3em;
@@ -1132,7 +1133,7 @@ table .span12 {
*margin-left: 0; *margin-left: 0;
} }
.icon-white { .icon-white {
background-image: url(../img/glyphicons-halflings-white.png); background-image: url("../img/glyphicons-halflings-white.png");
} }
.icon-glass { .icon-glass {
background-position: 0 0; background-position: 0 0;
@@ -1733,7 +1734,7 @@ table .span12 {
-moz-border-radius: 5px; -moz-border-radius: 5px;
border-radius: 5px; border-radius: 5px;
} }
.btn-large .icon { .btn-large [class^="icon-"] {
margin-top: 1px; margin-top: 1px;
} }
.btn-small { .btn-small {
@@ -1741,7 +1742,7 @@ table .span12 {
font-size: 11px; font-size: 11px;
line-height: 16px; line-height: 16px;
} }
.btn-small .icon { .btn-small [class^="icon-"] {
margin-top: -1px; margin-top: -1px;
} }
.btn-primary, .btn-primary,

4
less/buttons.less
View File

@@ -76,7 +76,7 @@
line-height: normal; line-height: normal;
.border-radius(5px); .border-radius(5px);
} }
.btn-large .icon { .btn-large [class^="icon-"] {
margin-top: 1px; margin-top: 1px;
} }
@@ -86,7 +86,7 @@
font-size: @baseFontSize - 2px; font-size: @baseFontSize - 2px;
line-height: @baseLineHeight - 2px; line-height: @baseLineHeight - 2px;
} }
.btn-small .icon { .btn-small [class^="icon-"] {
margin-top: -1px; margin-top: -1px;
} }

5
less/sprites.less
View File

@@ -18,15 +18,16 @@
display: inline-block; display: inline-block;
width: 14px; width: 14px;
height: 14px; height: 14px;
line-height: 14px;
vertical-align: text-top; vertical-align: text-top;
background-image: url(../img/glyphicons-halflings.png); background-image: url(@iconSpritePath);
background-position: 14px 14px; background-position: 14px 14px;
background-repeat: no-repeat; background-repeat: no-repeat;
.ie7-restore-right-whitespace(); .ie7-restore-right-whitespace();
} }
.icon-white { .icon-white {
background-image: url(../img/glyphicons-halflings-white.png); background-image: url(@iconWhiteSpritePath);
} }
.icon-glass { background-position: 0 0; } .icon-glass { background-position: 0 0; }

18
less/variables.less
View File

@@ -47,15 +47,19 @@
// Z-index master list // Z-index master list
// Used for a bird's eye view of components dependent on the z-axis // Used for a bird's eye view of components dependent on the z-axis
// Try to avoid customizing these :) // Try to avoid customizing these :)
@zindexDropdown: 1000; @zindexDropdown: 1000;
@zindexPopover: 1010; @zindexPopover: 1010;
@zindexTooltip: 1020; @zindexTooltip: 1020;
@zindexFixedNavbar: 1030; @zindexFixedNavbar: 1030;
@zindexModalBackdrop: 1040; @zindexModalBackdrop: 1040;
@zindexModal: 1050; @zindexModal: 1050;
// Sprite icons path
@iconSpritePath: "../img/glyphicons-halflings.png";
@iconWhiteSpritePath: "../img/glyphicons-halflings-white.png";
// Input placeholder text color // Input placeholder text color
@placeholderText: @grayLight; @placeholderText: @grayLight;
// Navbar // Navbar
@navbarHeight: 40px; @navbarHeight: 40px;