Merge branch '2.0.2-wip' of github.com:twitter/bootstrap into 2.0.2-wip
Conflicts: docs/assets/bootstrap.zip
This commit is contained in:
commit
adbbf17ee4
6 changed files with 30 additions and 5 deletions
|
|
@ -46,7 +46,6 @@
|
|||
float: left;
|
||||
display: none; // none by default, but block on "open" of the menu
|
||||
min-width: 160px;
|
||||
_width: 160px;
|
||||
padding: 4px 0;
|
||||
margin: 0; // override default ul
|
||||
list-style: none;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue