diff options
| author | tauriedavis <taurie@gitlab.com> | 2017-01-09 12:52:28 -0800 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-01-10 14:31:18 -0600 |
| commit | f1e21ae7643ca36a8835873594a0f72915660ec3 (patch) | |
| tree | 4ecb7d0bb8526ab7494353d1537d9db32ab0d49b | |
| parent | 6ff989cd6d8bb35f237bd2fb398c8b2276189f29 (diff) | |
| download | gitlab-ce-26504-mr-discussion-btn.tar.gz | |
26504 Fix styling of MR jump to discussion button26504-mr-discussion-btn
| -rw-r--r-- | app/assets/stylesheets/framework/sidebar.scss | 4 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/notes.scss | 9 | ||||
| -rw-r--r-- | changelogs/unreleased/26504-mr-discussion-btn.yml | 4 |
3 files changed, 10 insertions, 7 deletions
diff --git a/app/assets/stylesheets/framework/sidebar.scss b/app/assets/stylesheets/framework/sidebar.scss index a8641e83154..838f5442fff 100644 --- a/app/assets/stylesheets/framework/sidebar.scss +++ b/app/assets/stylesheets/framework/sidebar.scss @@ -183,7 +183,9 @@ &.right-sidebar-expanded { .line-resolve-all-container { - display: none; + @media (min-width: $sidebar-breakpoint) { + display: none; + } } } } diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss index ad4c31ca29e..e2a0253da38 100644 --- a/app/assets/stylesheets/pages/notes.scss +++ b/app/assets/stylesheets/pages/notes.scss @@ -526,8 +526,9 @@ ul.notes { } .line-resolve-all { + vertical-align: middle; display: inline-block; - padding: 5px 10px; + padding: 6px 10px; background-color: $gray-light; border: 1px solid $border-color; border-radius: $border-radius-default; @@ -535,18 +536,14 @@ ul.notes { &.has-next-btn { border-top-right-radius: 0; border-bottom-right-radius: 0; + border-right: 0; } .line-resolve-btn { - vertical-align: middle; margin-right: 5px; } } -.line-resolve-text { - vertical-align: middle; -} - .line-resolve-btn { display: inline-block; position: relative; diff --git a/changelogs/unreleased/26504-mr-discussion-btn.yml b/changelogs/unreleased/26504-mr-discussion-btn.yml new file mode 100644 index 00000000000..dec74ec61b1 --- /dev/null +++ b/changelogs/unreleased/26504-mr-discussion-btn.yml @@ -0,0 +1,4 @@ +--- +title: 26504 Fix styling of MR jump to discussion button +merge_request: +author: |