diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2017-01-19 17:17:25 +0000 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2017-01-21 22:03:18 -0800 |
| commit | 09404b07ac73f0312765510642a3a3d3c1671950 (patch) | |
| tree | 2b707e256e7b4f161f0dff67628735bf430f0f03 | |
| parent | e18d79f27f60cc9c44e70a1502ca2433d45ade6c (diff) | |
| download | gitlab-ce-09404b07ac73f0312765510642a3a3d3c1671950.tar.gz | |
Merge branch 'button-alignment' into 'master'
Fix small button alignment issues
See merge request !8631
| -rw-r--r-- | app/assets/stylesheets/pages/notes.scss | 1 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/projects.scss | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss index e2a0253da38..cbe38b60d60 100644 --- a/app/assets/stylesheets/pages/notes.scss +++ b/app/assets/stylesheets/pages/notes.scss @@ -515,7 +515,6 @@ ul.notes { .line-resolve-all-container { .btn-group { - margin-top: -1px; margin-left: -4px; } diff --git a/app/assets/stylesheets/pages/projects.scss b/app/assets/stylesheets/pages/projects.scss index 131cf23299a..cd0839e58ea 100644 --- a/app/assets/stylesheets/pages/projects.scss +++ b/app/assets/stylesheets/pages/projects.scss @@ -198,7 +198,7 @@ margin: 15px 5px 0 0; input { - height: 28px; + height: 27px; } } |