diff --git a/bigbluebutton-html5/imports/ui/components/dropdown/component.jsx b/bigbluebutton-html5/imports/ui/components/dropdown/component.jsx index 213e3da18a..43e8c9d210 100755 --- a/bigbluebutton-html5/imports/ui/components/dropdown/component.jsx +++ b/bigbluebutton-html5/imports/ui/components/dropdown/component.jsx @@ -157,7 +157,9 @@ class Dropdown extends Component { aria-live={otherProps['aria-live']} aria-relevant={otherProps['aria-relevant']} aria-haspopup={otherProps['aria-haspopup']} - aria-label={otherProps['aria-label']}> + aria-label={otherProps['aria-label']} + tabIndex={-1} + > {trigger} {content} { this.state.isOpen ? diff --git a/bigbluebutton-html5/imports/ui/components/user-list/styles.scss b/bigbluebutton-html5/imports/ui/components/user-list/styles.scss index 0cb3a86db8..c87daee02b 100755 --- a/bigbluebutton-html5/imports/ui/components/user-list/styles.scss +++ b/bigbluebutton-html5/imports/ui/components/user-list/styles.scss @@ -10,7 +10,7 @@ $unread-messages-bg: $color-danger; $user-list-bg: #F3F6F9; $user-list-text: $color-gray; -$list-item-bg-hover: darken($user-list-bg, 7%); +$list-item-bg-hover: darken(#F3F6F9, 7%); $user-thumbnail-border: $color-gray-light; $user-thumbnail-text: $user-thumbnail-border; @@ -50,12 +50,6 @@ $user-icons-color-hover: $color-gray; border-bottom-left-radius: 5px; cursor: pointer; - &:hover, - &:focus { - background-color: $list-item-bg-hover; - outline: none; - } - &:first-child { margin-top: 0; } diff --git a/bigbluebutton-html5/imports/ui/stylesheets/variables/focus.scss b/bigbluebutton-html5/imports/ui/stylesheets/variables/focus.scss index 45624c88ed..56f8b7a18a 100644 --- a/bigbluebutton-html5/imports/ui/stylesheets/variables/focus.scss +++ b/bigbluebutton-html5/imports/ui/stylesheets/variables/focus.scss @@ -2,17 +2,15 @@ $focus-border-size: 3px; $color-primary: #0F70D7 !default; $user-list-bg: #F3F6F9; $color-white: #FFF; +$list-item-bg-hover: darken(#F3F6F9, 7%); .customListFocus { border: $focus-border-size solid $user-list-bg; border-radius: $focus-border-size; - &, - &:active { - &:focus { - outline: none !important; - border: $focus-border-size solid $color-primary; - } + &:focus { + outline: none !important; + border: $focus-border-size solid $color-primary; } } @@ -21,6 +19,10 @@ $color-white: #FFF; border: $focus-border-size solid $user-list-bg; border-radius: $focus-border-size; + &:hover { + background-color: $list-item-bg-hover; + } + &, &:active { &:focus {