diff options
| author | Phil Hughes <me@iamphill.com> | 2018-06-13 16:20:43 +0100 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2018-06-14 15:42:56 +0100 |
| commit | b084dceb7952cf4674c5bcb67935d99319006ee4 (patch) | |
| tree | 7dc159111ee9fc9a914bf2d51a68e2d6224c9e6f | |
| parent | 664003f5099a95419df1dc8f6006d97c37a00d57 (diff) | |
| download | gitlab-ce-b084dceb7952cf4674c5bcb67935d99319006ee4.tar.gz | |
alignment updates
added tooltip to more actions
4 files changed, 11 insertions, 6 deletions
diff --git a/app/assets/javascripts/ide/components/commit_sidebar/list_item.vue b/app/assets/javascripts/ide/components/commit_sidebar/list_item.vue index 5390b21cb57..5cda7967130 100644 --- a/app/assets/javascripts/ide/components/commit_sidebar/list_item.vue +++ b/app/assets/javascripts/ide/components/commit_sidebar/list_item.vue @@ -100,7 +100,7 @@ export default { @dblclick="fileAction" @click="openFileInEditor" > - <span class="multi-file-commit-list-file-path"> + <span class="multi-file-commit-list-file-path d-flex align-items-center"> <icon :name="iconName" :size="16" diff --git a/app/assets/javascripts/ide/components/commit_sidebar/stage_button.vue b/app/assets/javascripts/ide/components/commit_sidebar/stage_button.vue index 60d0023d121..458ee3eaedc 100644 --- a/app/assets/javascripts/ide/components/commit_sidebar/stage_button.vue +++ b/app/assets/javascripts/ide/components/commit_sidebar/stage_button.vue @@ -32,7 +32,7 @@ export default { :aria-label="__('Stage changes')" :title="__('Stage changes')" type="button" - class="btn btn-blank append-right-5" + class="btn btn-blank append-right-5 d-flex align-items-center" data-container="body" @click.stop="stageChange(path)" > @@ -43,8 +43,9 @@ export default { </button> <button v-tooltip + :title="__('More actions')" type="button" - class="btn btn-blank" + class="btn btn-blank d-flex align-items-center" data-container="body" data-toggle="dropdown" > diff --git a/app/assets/javascripts/ide/components/commit_sidebar/unstage_button.vue b/app/assets/javascripts/ide/components/commit_sidebar/unstage_button.vue index 34b366f63ac..9285f892f57 100644 --- a/app/assets/javascripts/ide/components/commit_sidebar/unstage_button.vue +++ b/app/assets/javascripts/ide/components/commit_sidebar/unstage_button.vue @@ -32,7 +32,7 @@ export default { :aria-label="__('Unstage changes')" :title="__('Unstage changes')" type="button" - class="btn btn-blank" + class="btn btn-blank d-flex align-items-center" data-container="body" @click="unstageChange(path)" > diff --git a/app/assets/stylesheets/pages/repo.scss b/app/assets/stylesheets/pages/repo.scss index 94c8910fa97..0a56153203c 100644 --- a/app/assets/stylesheets/pages/repo.scss +++ b/app/assets/stylesheets/pages/repo.scss @@ -621,9 +621,13 @@ } .multi-file-discard-btn { - top: 0; + top: 4px; right: 8px; - bottom: 0; + bottom: 4px; + + svg { + top: 0; + } } .multi-file-commit-form { |