summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorFatih Acet <acetfatih@gmail.com>2017-01-19 17:17:25 +0000
committerFatih Acet <acetfatih@gmail.com>2017-01-19 17:17:25 +0000
commit639b880e702f35819439c234dbda3168787f29fd (patch)
tree0f4c210218b4eb8ea23959749036b4cf668bfc0d /app
parentaab60054e879c4c8c14f0e0d1d0059da92b5e345 (diff)
parent6359a3fc444fee39893a69b6dee8be81321296d4 (diff)
downloadgitlab-ce-639b880e702f35819439c234dbda3168787f29fd.tar.gz
Merge branch 'button-alignment' into 'master'
Fix small button alignment issues See merge request !8631
Diffstat (limited to 'app')
-rw-r--r--app/assets/stylesheets/pages/notes.scss1
-rw-r--r--app/assets/stylesheets/pages/projects.scss2
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;
}
}