diff options
author | Fatih Acet <acetfatih@gmail.com> | 2017-11-29 12:43:25 +0300 |
---|---|---|
committer | Fatih Acet <acetfatih@gmail.com> | 2017-11-29 12:43:25 +0300 |
commit | e74ef3acea2c8f6fdb81524b78970a5fc57f845c (patch) | |
tree | a81c73eabaa5005d6f4876054b57c3814d8519e9 /app/assets | |
parent | 59f93de0ba7c12575f95e4b7e6c313a09f98d52c (diff) | |
parent | 27d64f5baa3c05d39e8b8e0827df3bd1f39539b5 (diff) |
Merge branch 'backport-border-inline-edit' into 'master'
Backport - Add border for epic edit button
See merge request gitlab-org/gitlab-ce!15637
Diffstat (limited to 'app/assets')
-rw-r--r-- | app/assets/javascripts/issue_show/components/title.vue | 2 | ||||
-rw-r--r-- | app/assets/stylesheets/framework/animations.scss | 2 | ||||
-rw-r--r-- | app/assets/stylesheets/framework/buttons.scss | 11 | ||||
-rw-r--r-- | app/assets/stylesheets/pages/issuable.scss | 5 | ||||
-rw-r--r-- | app/assets/stylesheets/pages/notes.scss | 5 |
5 files changed, 16 insertions, 9 deletions
diff --git a/app/assets/javascripts/issue_show/components/title.vue b/app/assets/javascripts/issue_show/components/title.vue index 00002709ac6..a363d06d950 100644 --- a/app/assets/javascripts/issue_show/components/title.vue +++ b/app/assets/javascripts/issue_show/components/title.vue @@ -79,7 +79,7 @@ v-tooltip v-if="showInlineEditButton && canUpdate" type="button" - class="btn-blank btn-edit note-action-button" + class="btn btn-default btn-edit btn-svg" v-html="pencilIcon" title="Edit title and description" data-placement="bottom" diff --git a/app/assets/stylesheets/framework/animations.scss b/app/assets/stylesheets/framework/animations.scss index 374988bb590..728f9a27aca 100644 --- a/app/assets/stylesheets/framework/animations.scss +++ b/app/assets/stylesheets/framework/animations.scss @@ -125,7 +125,7 @@ @include transition(border-color); } -.note-action-button .link-highlight, +.note-action-button, .toolbar-btn, .dropdown-toggle-caret { @include transition(color); diff --git a/app/assets/stylesheets/framework/buttons.scss b/app/assets/stylesheets/framework/buttons.scss index fcb6611ae31..cdc2aa196dd 100644 --- a/app/assets/stylesheets/framework/buttons.scss +++ b/app/assets/stylesheets/framework/buttons.scss @@ -131,6 +131,13 @@ } } +@mixin btn-svg { + height: $gl-padding; + width: $gl-padding; + top: 0; + vertical-align: text-top; +} + .btn { @include btn-default; @include btn-white; @@ -429,3 +436,7 @@ text-decoration: none; } } + +.btn-svg svg { + @include btn-svg; +} diff --git a/app/assets/stylesheets/pages/issuable.scss b/app/assets/stylesheets/pages/issuable.scss index 7131c18ce3d..63c51747f92 100644 --- a/app/assets/stylesheets/pages/issuable.scss +++ b/app/assets/stylesheets/pages/issuable.scss @@ -70,14 +70,13 @@ .title { padding: 0; - margin-bottom: 16px; + margin-bottom: $gl-padding; border-bottom: 0; } .btn-edit { margin-left: auto; - // Set height to match title height - height: 2em; + height: $gl-padding * 2; } // Border around images in issue and MR descriptions. diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss index 9d5930e3966..4fe182c9fce 100644 --- a/app/assets/stylesheets/pages/notes.scss +++ b/app/assets/stylesheets/pages/notes.scss @@ -543,10 +543,7 @@ ul.notes { } svg { - height: 16px; - width: 16px; - top: 0; - vertical-align: text-top; + @include btn-svg; } .award-control-icon-positive, |