github/bootstrap
1
1
Fork 0
mirror of https://github.com/jasny/bootstrap.git synced 2026-04-24 03:00:49 -04:00
Code Issues Packages Projects Releases Wiki Activity

fixing up buttons and examples of implementing icons

Browse Source
This commit is contained in:
Mark Otto
2012-01-27 19:49:56 -08:00
parent a624ac1edf
commit d02c6957d4
6 changed files with 177 additions and 210 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6,7 +6,7 @@
* http://www.apache.org/licenses/LICENSE-2.0
*
* Designed and built with all the love in the world @twitter by @mdo and @fat.
* Date: Fri Jan 27 18:48:54 PST 2012
* Date: Fri Jan 27 19:45:56 PST 2012
*/
article,
aside,
@@ -2691,6 +2691,10 @@ button.btn.small, input[type=submit].btn.small {
.btn-group + .btn-group {
margin-left: 5px;
}
.btn-toolbar {
margin-top: 9px;
margin-bottom: 9px;
}
.btn-toolbar .btn-group {
display: inline-block;
*display: inline;
@@ -2769,9 +2773,13 @@ button.btn.small, input[type=submit].btn.small {
box-shadow: inset 0 1px 6px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
}
.btn .caret {
margin-top: 6px;
margin-top: 7px;
margin-left: 0;
}
.btn:hover .caret, .open.btn-group .caret {
opacity: 1;
filter: alpha(opacity=100);
}
.primary .caret,
.danger .caret,
.info .caret,