diff options
| author | Phil Hughes <me@iamphill.com> | 2018-09-04 11:30:46 +0300 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2018-09-07 13:28:02 +0300 |
| commit | cfb67193bf7cc9377d82cc6fa99d232627a64600 (patch) | |
| tree | ae738c3d84f2364a8a6e26ba635b1e523ea961b7 /app/assets | |
| parent | 93e84c8f28f9bad8c09a720ce008dba1f50aadcd (diff) | |
fixed discard modal not showing
Diffstat (limited to 'app/assets')
3 files changed, 11 insertions, 10 deletions
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 fb8392d2e1b..62469e9f98a 100644 --- a/app/assets/javascripts/ide/components/commit_sidebar/stage_button.vue +++ b/app/assets/javascripts/ide/components/commit_sidebar/stage_button.vue @@ -46,7 +46,7 @@ export default { :aria-label="__('Stage changes')" :title="__('Stage changes')" type="button" - class="btn btn-blank d-flex align-items-center" + class="btn btn-blank align-items-center" data-container="body" data-boundary="viewport" data-placement="bottom" @@ -63,7 +63,7 @@ export default { :aria-label="__('Discard changes')" :title="__('Discard changes')" type="button" - class="btn btn-blank d-flex align-items-center" + class="btn btn-blank align-items-center" data-container="body" data-boundary="viewport" data-placement="bottom" 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 95c80c31d41..18830ab81ff 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 d-flex align-items-center" + class="btn btn-blank align-items-center" data-container="body" data-boundary="viewport" data-placement="bottom" diff --git a/app/assets/stylesheets/page_bundles/ide.scss b/app/assets/stylesheets/page_bundles/ide.scss index 2eadc55bdfd..35ba1fca2b7 100644 --- a/app/assets/stylesheets/page_bundles/ide.scss +++ b/app/assets/stylesheets/page_bundles/ide.scss @@ -657,7 +657,9 @@ $ide-tree-text-start: $ide-activity-bar-width + $ide-tree-padding; outline: 0; .multi-file-discard-btn { - display: flex; + > .btn { + display: flex; + } } } @@ -678,16 +680,15 @@ $ide-tree-text-start: $ide-activity-bar-width + $ide-tree-padding; } .multi-file-discard-btn { - display: none; + > .btn { + display: none; + width: 32px; + height: 32px; + } svg { top: 0; } - - .btn { - width: 32px; - height: 32px; - } } .multi-file-commit-form { |