kotovalexarian-likes-github/twbs--bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2022-11-09 12:25:43 -05:00
Code Releases 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
Show stats 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;
width: 14px;
height: 14px;
line-height: 14px;
vertical-align: text-top;
background-image: url(../img/glyphicons-halflings.png);
background-image: url("../img/glyphicons-halflings.png");
background-position: 14px 14px;
background-repeat: no-repeat;
*margin-right: .3em;
@ -1132,7 +1133,7 @@ table .span12 {
*margin-left: 0;
}
.icon-white {
background-image: url(../img/glyphicons-halflings-white.png);
background-image: url("../img/glyphicons-halflings-white.png");
}
.icon-glass {
background-position: 0 0;
@ -1733,7 +1734,7 @@ table .span12 {
-moz-border-radius: 5px;
border-radius: 5px;
}
.btn-large .icon {
.btn-large [class^="icon-"] {
margin-top: 1px;
}
.btn-small {
@ -1741,7 +1742,7 @@ table .span12 {
font-size: 11px;
line-height: 16px;
}
.btn-small .icon {
.btn-small [class^="icon-"] {
margin-top: -1px;
}
.btn-primary,

4
less/buttons.less
View file

@ -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;
}

5
less/sprites.less
View file

@ -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; }

18
less/variables.less
View file

@ -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;