diff options
| author | Phil Hughes <me@iamphill.com> | 2016-03-29 12:57:10 +0100 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2016-03-31 16:25:41 +0100 |
| commit | a103fcb7cb14b3bf9f7af44409c79331274e9adc (patch) | |
| tree | fa551ad2dcee46fd4f6a595da729fe870c7b0274 | |
| parent | 29872c39055d55118cc8b9249caeb659041fea97 (diff) | |
| download | gitlab-ce-a103fcb7cb14b3bf9f7af44409c79331274e9adc.tar.gz | |
Moved back some css classes
| -rw-r--r-- | app/assets/javascripts/gl_dropdown.js.coffee | 6 | ||||
| -rw-r--r-- | app/assets/stylesheets/framework/dropdowns.scss | 11 |
2 files changed, 5 insertions, 12 deletions
diff --git a/app/assets/javascripts/gl_dropdown.js.coffee b/app/assets/javascripts/gl_dropdown.js.coffee index 1937e5367db..5a555175291 100644 --- a/app/assets/javascripts/gl_dropdown.js.coffee +++ b/app/assets/javascripts/gl_dropdown.js.coffee @@ -326,8 +326,8 @@ class GitLabDropdown ).join('') noResults: -> - html = "<li class='dropdown-menu-empty-link is-focused'>" - html += "<a href='#'>" + html = "<li class='dropdown-menu-empty-link'>" + html += "<a href='#' class='is-focused'>" html += "No matching results." html += "</a>" html += "</li>" @@ -433,7 +433,7 @@ class GitLabDropdown # Update the class for the row at the specific index $listItem = $listItems.eq(index) - $listItem.addClass "is-focused" + $listItem.find('a:first-child').addClass "is-focused" # Dropdown content scroll area $dropdownContent = $listItem.closest('.dropdown-content') diff --git a/app/assets/stylesheets/framework/dropdowns.scss b/app/assets/stylesheets/framework/dropdowns.scss index fe03c040e68..82dc1acbd01 100644 --- a/app/assets/stylesheets/framework/dropdowns.scss +++ b/app/assets/stylesheets/framework/dropdowns.scss @@ -104,14 +104,6 @@ padding: 0 10px; } - .is-focused { - a { - background-color: $dropdown-link-hover-bg; - text-decoration: none; - outline: 0; - } - } - .divider { height: 1px; margin: 8px 10px; @@ -140,7 +132,8 @@ overflow: hidden; &:hover, - &:focus { + &:focus, + &.is-focused { background-color: $dropdown-link-hover-bg; text-decoration: none; outline: 0; |