diff options
author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-05-15 20:43:42 +0300 |
---|---|---|
committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-05-15 20:43:42 +0300 |
commit | aab904f7437c13bc9b9496ac800eccd57d612ccf (patch) | |
tree | 6fb7ea6a012f1e18aa6c26b513d9766d81a38e1d /app/assets/stylesheets/pages/notes.scss | |
parent | 84199f19197583da44471a6b7f91694b7f4645df (diff) | |
parent | 2ac9fcbd09c4a3efc1b8c3e943c078eefb0e479e (diff) |
Merge branch '31106-tabs-alignment' into 'master'
fix Resolved Discussions counter wrapping to next line
Closes #31106
See merge request !10775
Diffstat (limited to 'app/assets/stylesheets/pages/notes.scss')
-rw-r--r-- | app/assets/stylesheets/pages/notes.scss | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss index 0600bb1cb1a..5b6aa9d74f6 100644 --- a/app/assets/stylesheets/pages/notes.scss +++ b/app/assets/stylesheets/pages/notes.scss @@ -609,6 +609,15 @@ ul.notes { } .line-resolve-all-container { + @media (min-width: $screen-sm-min) { + margin-right: 0; + padding-left: $gl-padding; + } + + > div { + white-space: nowrap; + } + .btn-group { margin-left: -4px; } |