diff options
| author | Mark Otto <[email protected]> | 2012-10-02 15:41:31 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-10-02 15:41:31 -0700 |
| commit | 7732d8b9b06d359be7096880135f9ff546a898a2 (patch) | |
| tree | 9e599e550cef58ec65d2717dd74fb116ade2c683 | |
| parent | 3bb9e0d7538f1899ed8681b6ca2ced65822a155a (diff) | |
| parent | 630a88d3ce0dde6365e224d84353d3cf24defc18 (diff) | |
| download | bootstrap-7732d8b9b06d359be7096880135f9ff546a898a2.tar.xz bootstrap-7732d8b9b06d359be7096880135f9ff546a898a2.zip | |
Merge branch '2.1.2-wip' into exploratory
| -rw-r--r-- | docs/assets/css/bootstrap.css | 4 | ||||
| -rw-r--r-- | docs/components.html | 2 | ||||
| -rw-r--r-- | docs/templates/pages/components.mustache | 2 | ||||
| -rw-r--r-- | less/pagination.less | 2 | ||||
| -rw-r--r-- | less/sprites.less | 4 |
5 files changed, 9 insertions, 5 deletions
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 8afd89b4c..2e9ca173e 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -1899,7 +1899,9 @@ table [class*=span] { .dropdown-menu > li > a:hover > [class^="icon-"], .dropdown-menu > li > a:hover > [class*=" icon-"], .dropdown-menu > .active > a > [class^="icon-"], -.dropdown-menu > .active > a > [class*=" icon-"] { +.dropdown-menu > .active > a > [class*=" icon-"], +.dropdown-submenu:hover > a > [class^="icon-"], +.dropdown-submenu:hover > a > [class*=" icon-"] { background-image: url("../img/glyphicons-halflings-white.png"); } diff --git a/docs/components.html b/docs/components.html index 40a902067..9ffe5ec45 100644 --- a/docs/components.html +++ b/docs/components.html @@ -717,7 +717,7 @@ </pre> <h3>Disabled state</h3> - <p>For any nav component (tabs, pills, or list), add <code>.disabled</code> for <strong>gray links and no hover effects</strong>. Links will remain clickable, however, unless custom JavaScript is implemented to prevent those clicks.</p> + <p>For any nav component (tabs, pills, or list), add <code>.disabled</code> for <strong>gray links and no hover effects</strong>. Links will remain clickable, however, unless you remove the <code>href</code> attribute. Alternatively, you could implement custom JavaScript to prevent those clicks.</p> <div class="bs-docs-example"> <ul class="nav nav-pills"> <li><a href="#">Clickable link</a></li> diff --git a/docs/templates/pages/components.mustache b/docs/templates/pages/components.mustache index 05a16a51c..cc4a0431d 100644 --- a/docs/templates/pages/components.mustache +++ b/docs/templates/pages/components.mustache @@ -648,7 +648,7 @@ </pre> <h3>{{_i}}Disabled state{{/i}}</h3> - <p>{{_i}}For any nav component (tabs, pills, or list), add <code>.disabled</code> for <strong>gray links and no hover effects</strong>. Links will remain clickable, however, unless custom JavaScript is implemented to prevent those clicks.{{/i}}</p> + <p>{{_i}}For any nav component (tabs, pills, or list), add <code>.disabled</code> for <strong>gray links and no hover effects</strong>. Links will remain clickable, however, unless you remove the <code>href</code> attribute. Alternatively, you could implement custom JavaScript to prevent those clicks.{{/i}}</p> <div class="bs-docs-example"> <ul class="nav nav-pills"> <li><a href="#">{{_i}}Clickable link{{/i}}</a></li> diff --git a/less/pagination.less b/less/pagination.less index ac70c85a9..0056b3c9c 100644 --- a/less/pagination.less +++ b/less/pagination.less @@ -33,7 +33,7 @@ .pagination ul > li > a:hover, .pagination ul > .active > a, .pagination ul > .active > span { - background-color: #f5f5f5; + background-color: @paginationActiveBackground; } .pagination ul > .active > a, .pagination ul > .active > span { diff --git a/less/sprites.less b/less/sprites.less index 910a1156e..bb8147fa8 100644 --- a/less/sprites.less +++ b/less/sprites.less @@ -38,7 +38,9 @@ .dropdown-menu > li > a:hover > [class^="icon-"], .dropdown-menu > li > a:hover > [class*=" icon-"], .dropdown-menu > .active > a > [class^="icon-"], -.dropdown-menu > .active > a > [class*=" icon-"] { +.dropdown-menu > .active > a > [class*=" icon-"], +.dropdown-submenu:hover > a > [class^="icon-"], +.dropdown-submenu:hover > a > [class*=" icon-"] { background-image: url("@{iconWhiteSpritePath}"); } |