summaryrefslogtreecommitdiff
path: root/app/assets
diff options
context:
space:
mode:
authorBryce Johnson <bryce@gitlab.com>2017-06-19 14:59:17 -0400
committerBryce Johnson <bryce@gitlab.com>2017-06-21 12:50:59 -0400
commit9f0b85bf2683ef0825018c7b754c23369a513956 (patch)
tree5a673f13c3742e8d4552f13e52399a30d703a4bd /app/assets
parent043f8c260f49bb14f1c40ec563179c12c3df7828 (diff)
downloadgitlab-ce-9f0b85bf2683ef0825018c7b754c23369a513956.tar.gz
Revert to using links instead of buttons in Issuable Index tabs.
Diffstat (limited to 'app/assets')
-rw-r--r--app/assets/javascripts/filtered_search/filtered_search_manager.js1
-rw-r--r--app/assets/stylesheets/framework/nav.scss27
2 files changed, 3 insertions, 25 deletions
diff --git a/app/assets/javascripts/filtered_search/filtered_search_manager.js b/app/assets/javascripts/filtered_search/filtered_search_manager.js
index 8f547bd8f1f..c7c8d42e677 100644
--- a/app/assets/javascripts/filtered_search/filtered_search_manager.js
+++ b/app/assets/javascripts/filtered_search/filtered_search_manager.js
@@ -487,6 +487,7 @@ class FilteredSearchManager {
}
searchState(e) {
+ e.preventDefault();
const target = e.currentTarget;
// remove focus outline after click
target.blur();
diff --git a/app/assets/stylesheets/framework/nav.scss b/app/assets/stylesheets/framework/nav.scss
index 3787ef370b2..28b2a7cfacd 100644
--- a/app/assets/stylesheets/framework/nav.scss
+++ b/app/assets/stylesheets/framework/nav.scss
@@ -45,8 +45,7 @@
li {
display: flex;
- a,
- .btn-link {
+ a {
padding: $gl-btn-padding;
padding-bottom: 11px;
font-size: 14px;
@@ -68,29 +67,7 @@
}
}
- .btn-link {
- padding-top: 16px;
- padding-left: 15px;
- padding-right: 15px;
- border-left: none;
- border-right: none;
- border-top: none;
- border-radius: 0;
-
- &:hover,
- &:active,
- &:focus {
- background-color: transparent;
- }
-
- &:active {
- outline: 0;
- box-shadow: none;
- }
- }
-
- &.active a,
- &.active .btn-link {
+ &.active a {
border-bottom: 2px solid $link-underline-blue;
color: $black;
font-weight: 600;