diff options
| author | Mark Otto <[email protected]> | 2012-02-18 20:06:38 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-02-18 20:06:38 -0800 |
| commit | bbb2fb33957da815e88efa0797df5817268ce812 (patch) | |
| tree | 66fbbf04be1a2db9d9c26df052a3a02d60de10b5 | |
| parent | fed3b59e46d9c6c889159ac9cf5c685b3278cd5f (diff) | |
| download | bootstrap-bbb2fb33957da815e88efa0797df5817268ce812.tar.xz bootstrap-bbb2fb33957da815e88efa0797df5817268ce812.zip | |
fix right aligned dropdowns
| -rw-r--r-- | docs/assets/bootstrap.zip | bin | 53351 -> 53344 bytes | |||
| -rw-r--r-- | docs/assets/css/bootstrap.css | 8 | ||||
| -rw-r--r-- | less/dropdowns.less | 6 | ||||
| -rw-r--r-- | less/navbar.less | 2 |
4 files changed, 10 insertions, 6 deletions
diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip Binary files differindex 04d93735d..011a9e8a3 100644 --- a/docs/assets/bootstrap.zip +++ b/docs/assets/bootstrap.zip diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 33ab32b09..71ab7a9d4 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -1641,6 +1641,10 @@ table .span12 { .dropdown.open .dropdown-menu { display: block; } +.pull-right .dropdown-menu { + left: auto; + right: 0; +} .typeahead { margin-top: 2px; -webkit-border-radius: 4px; @@ -2709,10 +2713,6 @@ button.btn.small, input[type="submit"].btn.small { .navbar .nav .active > .dropdown-toggle:hover { color: #ffffff; } -.navbar .nav.pull-right .dropdown-menu { - left: auto; - right: 0; -} .navbar .nav.pull-right .dropdown-menu:before { left: auto; right: 12px; diff --git a/less/dropdowns.less b/less/dropdowns.less index 1ec06b04a..1b445844c 100644 --- a/less/dropdowns.less +++ b/less/dropdowns.less @@ -123,6 +123,12 @@ } } +// Right aligned dropdowns +.pull-right .dropdown-menu { + left: auto; + right: 0; +} + // Typeahead .typeahead { margin-top: 2px; // give it some space to breathe diff --git a/less/navbar.less b/less/navbar.less index 16553c1ff..b656cba48 100644 --- a/less/navbar.less +++ b/less/navbar.less @@ -286,8 +286,6 @@ // Right aligned menus need alt position .navbar .nav.pull-right .dropdown-menu { - left: auto; - right: 0; &:before { left: auto; right: 12px; |
