diff options
| author | Clement Ho <ClemMakesApps@gmail.com> | 2017-09-19 10:04:32 -0500 |
|---|---|---|
| committer | Clement Ho <ClemMakesApps@gmail.com> | 2017-09-19 10:04:32 -0500 |
| commit | 50d591c68e8311fb426c98fed6bc5266ec6cd7e6 (patch) | |
| tree | 773637942eff94723805e13d519d7cb8dfb66238 | |
| parent | 09c7b555fc06e92aa28e580d8f78dd4671ea820a (diff) | |
| download | gitlab-ce-50d591c68e8311fb426c98fed6bc5266ec6cd7e6.tar.gz | |
Use btn-transparent
| -rw-r--r-- | app/assets/javascripts/image_diff/components/image_replaced.vue | 8 | ||||
| -rw-r--r-- | app/assets/stylesheets/framework/buttons.scss | 9 |
2 files changed, 7 insertions, 10 deletions
diff --git a/app/assets/javascripts/image_diff/components/image_replaced.vue b/app/assets/javascripts/image_diff/components/image_replaced.vue index 1327d3cd909..1af8d870768 100644 --- a/app/assets/javascripts/image_diff/components/image_replaced.vue +++ b/app/assets/javascripts/image_diff/components/image_replaced.vue @@ -63,10 +63,10 @@ :added="images.added" :deleted="images.deleted" /> - <div class="btn-group btn-group-gray-link"> + <div class="btn-group btn-group-dark-lines"> <button type="button" - class="btn btn-link" + class="btn btn-link btn-transparent" :class="{ active: isCurrentViewTwoUp }" @click="goToView(viewTypes.TWO_UP, $event)" > @@ -74,7 +74,7 @@ </button> <button type="button" - class="btn btn-link" + class="btn btn-link btn-transparent" :class="{ active: isCurrentViewSwipe }" @click="goToView(viewTypes.SWIPE, $event)" > @@ -82,7 +82,7 @@ </button> <button type="button" - class="btn btn-link" + class="btn btn-link btn-transparent" :class="{ active: isCurrentViewOnionSkin }" @click="goToView(viewTypes.ONION_SKIN, $event)" > diff --git a/app/assets/stylesheets/framework/buttons.scss b/app/assets/stylesheets/framework/buttons.scss index 1a72cc75a5a..ddc763e033c 100644 --- a/app/assets/stylesheets/framework/buttons.scss +++ b/app/assets/stylesheets/framework/buttons.scss @@ -280,16 +280,13 @@ } } -.btn-group.btn-group-gray-link .btn { - background-color: transparent; - box-shadow: none; - border-color: transparent; +.btn-group-dark-lines .btn { border-right: 1px solid $diff-view-modes-border; padding: 0 $gl-padding; - color: $diff-view-modes-color; &.active { - color: $black; + text-decoration: underline; + background-color: transparent; } &:last-child { |