Commit d10e1ab4 authored by Tim Hockin's avatar Tim Hockin

Merge pull request #8548 from bcbroussard/web-ui-menu

Added Hover to Views Menu in Web UI
parents 57df04ed edc6c029
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -7709,7 +7709,10 @@ function SelectProvider($$interimElementProvider) { ...@@ -7709,7 +7709,10 @@ function SelectProvider($$interimElementProvider) {
var focusedNode = centeredNode || optionNodes[0]; var focusedNode = centeredNode || optionNodes[0];
if (focusedNode) { if (focusedNode) {
opts.focusedNode = focusedNode; opts.focusedNode = focusedNode;
focusedNode.focus(); // This is commented out to fix an issue where the first option remains in focus
// even after you mouseover to a different option.
// It is fixed in the compiled source and is here for reference.
// focusedNode.focus();
} }
if (isScrollable) { if (isScrollable) {
......
...@@ -543,7 +543,7 @@ function SelectProvider($$interimElementProvider) { ...@@ -543,7 +543,7 @@ function SelectProvider($$interimElementProvider) {
contentEl: element.find('md-content'), contentEl: element.find('md-content'),
backdrop: opts.hasBackdrop && angular.element('<md-backdrop class="md-select-backdrop">') backdrop: opts.hasBackdrop && angular.element('<md-backdrop class="md-select-backdrop">')
}); });
var optionNodes = []; var optionNodes = [];
configureAria(); configureAria();
...@@ -757,7 +757,10 @@ function SelectProvider($$interimElementProvider) { ...@@ -757,7 +757,10 @@ function SelectProvider($$interimElementProvider) {
var focusedNode = centeredNode || optionNodes[0]; var focusedNode = centeredNode || optionNodes[0];
if (focusedNode) { if (focusedNode) {
opts.focusedNode = focusedNode; opts.focusedNode = focusedNode;
focusedNode.focus(); // This is commented out to fix an issue where the first option remains in focus
// even after you mouseover to a different option.
// It is fixed in the compiled source and is here for reference.
// focusedNode.focus();
} }
if (isScrollable) { if (isScrollable) {
......
...@@ -407,6 +407,17 @@ md-toolbar h1 { ...@@ -407,6 +407,17 @@ md-toolbar h1 {
vertical-align: middle; vertical-align: middle;
padding: 2px; padding: 2px;
} }
md-select-menu.md-default-theme md-option:focus:not([selected]) {
background: #eeeeee;
}
md-select-menu md-option {
transition: box-shadow 0.4s cubic-bezier(0.25, 0.8, 0.25, 1), background-color 0.4s cubic-bezier(0.25, 0.8, 0.25, 1), -webkit-transform 0.4s cubic-bezier(0.25, 0.8, 0.25, 1);
transition: box-shadow 0.4s cubic-bezier(0.25, 0.8, 0.25, 1), background-color 0.4s cubic-bezier(0.25, 0.8, 0.25, 1), transform 0.4s cubic-bezier(0.25, 0.8, 0.25, 1);
}
md-select-menu md-option:not([disabled]):hover,
md-select-menu md-option:not([disabled]):focus {
background-color: rgba(158, 158, 158, 0.2);
}
.dashboard .body-wrapper { .dashboard .body-wrapper {
padding: 25px; padding: 25px;
} }
......
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -454,3 +454,20 @@ md-toolbar h1 { ...@@ -454,3 +454,20 @@ md-toolbar h1 {
line-height: 40px; vertical-align: middle; line-height: 40px; vertical-align: middle;
padding: 2px; padding: 2px;
} }
md-select-menu.md-default-theme md-option:focus:not([selected]) {
background: rgb(238,238,238);
}
md-select-menu {
md-option {
&:not([disabled]):hover, &:not([disabled]):focus {
background-color: rgba(158,158,158,0.2);
// background: transparent;
}
transition: box-shadow 0.4s cubic-bezier(0.25, 0.8, 0.25, 1), background-color 0.4s cubic-bezier(0.25, 0.8, 0.25, 1), -webkit-transform 0.4s cubic-bezier(0.25, 0.8, 0.25, 1);
transition: box-shadow 0.4s cubic-bezier(0.25, 0.8, 0.25, 1), background-color 0.4s cubic-bezier(0.25, 0.8, 0.25, 1), transform 0.4s cubic-bezier(0.25, 0.8, 0.25, 1);
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment