diff options
| author | Clement Ho <clemmakesapps@gmail.com> | 2017-08-11 21:55:37 +0000 |
|---|---|---|
| committer | Clement Ho <clemmakesapps@gmail.com> | 2017-08-11 21:55:37 +0000 |
| commit | 1c874f71e31fdf2bbc9120fe2111b2daea320e86 (patch) | |
| tree | fba05e368202d653b146c2ce83176597a94a6db7 | |
| parent | f8fa7a050ed7388345d5f8e8520461f447a00694 (diff) | |
| parent | e184dfc3c02e942fae0cc264770ffaa4b0201616 (diff) | |
| download | gitlab-ce-1c874f71e31fdf2bbc9120fe2111b2daea320e86.tar.gz | |
Merge branch '36166_confi_polish_one' into 'master'
fix confidential border issue as well as confidential styles leaking on new MR
Closes gitlab-ee#3121
See merge request !13388
| -rw-r--r-- | app/assets/stylesheets/pages/note_form.scss | 20 | ||||
| -rw-r--r-- | app/views/projects/_md_preview.html.haml | 4 | ||||
| -rw-r--r-- | spec/features/issues_spec.rb | 1 |
3 files changed, 5 insertions, 20 deletions
diff --git a/app/assets/stylesheets/pages/note_form.scss b/app/assets/stylesheets/pages/note_form.scss index c90642178fc..b4468d6d0a2 100644 --- a/app/assets/stylesheets/pages/note_form.scss +++ b/app/assets/stylesheets/pages/note_form.scss @@ -108,6 +108,7 @@ background-color: $orange-50; border-radius: $border-radius-default $border-radius-default 0 0; border: 1px solid $border-gray-normal; + border-bottom: none; padding: 3px 12px; margin: auto; align-items: center; @@ -132,22 +133,9 @@ } } -.not-confidential { - padding: 0; - border-top: none; -} - -.right-sidebar-expanded { - .md-area { - border-radius: 0; - border-top: none; - } -} - -.right-sidebar-collapsed { - .confidential-issue-warning { - border-bottom: none; - } +.confidential-issue-warning + .md-area { + border-top-left-radius: 0; + border-top-right-radius: 0; } .discussion-form { diff --git a/app/views/projects/_md_preview.html.haml b/app/views/projects/_md_preview.html.haml index 6e13bf47ff6..97041b87c48 100644 --- a/app/views/projects/_md_preview.html.haml +++ b/app/views/projects/_md_preview.html.haml @@ -1,11 +1,9 @@ - referenced_users = local_assigns.fetch(:referenced_users, nil) - if defined?(@issue) && @issue.confidential? - %li.confidential-issue-warning + .confidential-issue-warning = confidential_icon(@issue) %span This is a confidential issue. Your comment will not be visible to the public. -- else - %li.confidential-issue-warning.not-confidential .md-area .md-header diff --git a/spec/features/issues_spec.rb b/spec/features/issues_spec.rb index a5bb642221c..3c8e37ff920 100644 --- a/spec/features/issues_spec.rb +++ b/spec/features/issues_spec.rb @@ -729,7 +729,6 @@ describe 'Issues' do visit project_issue_path(project, issue) expect(page).not_to have_css('.is-confidential') - expect(page).to have_css('.is-not-confidential') end end end |