diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 8afd89b4..2e9ca173 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 40a90206..9ffe5ec4 100644
--- a/docs/components.html
+++ b/docs/components.html
@@ -717,7 +717,7 @@
Disabled state
- For any nav component (tabs, pills, or list), add .disabled for gray links and no hover effects. Links will remain clickable, however, unless custom JavaScript is implemented to prevent those clicks.
+ For any nav component (tabs, pills, or list), add .disabled for gray links and no hover effects. Links will remain clickable, however, unless you remove the href attribute. Alternatively, you could implement custom JavaScript to prevent those clicks.
- Clickable link
diff --git a/docs/templates/pages/components.mustache b/docs/templates/pages/components.mustache
index 05a16a51..cc4a0431 100644
--- a/docs/templates/pages/components.mustache
+++ b/docs/templates/pages/components.mustache
@@ -648,7 +648,7 @@
{{_i}}Disabled state{{/i}}
- {{_i}}For any nav component (tabs, pills, or list), add .disabled for gray links and no hover effects. Links will remain clickable, however, unless custom JavaScript is implemented to prevent those clicks.{{/i}}
+ {{_i}}For any nav component (tabs, pills, or list), add .disabled for gray links and no hover effects. Links will remain clickable, however, unless you remove the href attribute. Alternatively, you could implement custom JavaScript to prevent those clicks.{{/i}}
- {{_i}}Clickable link{{/i}}
diff --git a/less/pagination.less b/less/pagination.less
index ac70c85a..0056b3c9 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 910a1156..bb8147fa 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}");
}