root
/
bootstrap
mirror of https://github.com/twbs/bootstrap.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Refactor .list-inline and .list-unstyled 

* Instead of shared and separate CSS, isolate by class for easier mixin-ability
* .list-unstyled is now used as a mixin in .list-inline
This commit is contained in:
Mark Otto 2013-03-27 15:42:11 -07:00
parent 5b298a2aaf
commit f0f33eb9a3
2 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -546,7 +546,11 @@ li {
line-height: 20px; line-height: 20px;
} }
.list-unstyled, .list-unstyled {
margin-left: 0;
list-style: none;
}
.list-inline { .list-inline {
margin-left: 0; margin-left: 0;
list-style: none; list-style: none;

12
less/type.less
View File

@ -126,18 +126,20 @@ li {
} }
// List options // List options
// Unstyled keeps list items block level, just removes list-style // Unstyled keeps list items block level, just removes list-style
.list-unstyled, .list-unstyled {
// Inline turns list items into inline-block
.list-inline {
margin-left: 0; margin-left: 0;
list-style: none; list-style: none;
} }
// Single-line list items // Inline turns list items into inline-block
.list-inline > li { .list-inline {
.list-unstyled();
> li {
display: inline-block; display: inline-block;
padding-left: 5px; padding-left: 5px;
padding-right: 5px; padding-right: 5px;
}
} }
// Description Lists // Description Lists