summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-03-19 16:04:12 +0000
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-03-19 16:04:12 +0000
commit83982e93292b456dfa1ea7e5b899020331e8f2a1 (patch)
treefd285b7191d5effb71f7d063178eec1d446154f6
parent8b723776ac98dc84d4e0f93302602e3949fda5c6 (diff)
parent575ae806477edeb4e4c662560fb4ebca0773edad (diff)
downloadgitlab-ce-83982e93292b456dfa1ea7e5b899020331e8f2a1.tar.gz
Merge branch 'fix/navbar-toggle-margin' into 'master'
fix(style): align navbar-toggle Changes: - change `.navbar-toggle` from `margin: 0 -15px 0 0;` to `margin: 0;` ## Before: - 320x480 ![Screen_Shot_2015-03-19_at_03.43.53](https://gitlab.com/kingcody/gitlab-ce/uploads/376727af07cf62eec5609c01bbbdaacf/Screen_Shot_2015-03-19_at_03.43.53.png) - 360x640 ![Screen_Shot_2015-03-19_at_03.44.04](https://gitlab.com/kingcody/gitlab-ce/uploads/d5318de4f45687154d90c54f0bece2aa/Screen_Shot_2015-03-19_at_03.44.04.png) ## After: - 320x480 ![Screen_Shot_2015-03-19_at_03.45.21](https://gitlab.com/kingcody/gitlab-ce/uploads/20f526c9ef19c2c30add001b15c06358/Screen_Shot_2015-03-19_at_03.45.21.png) - 360x640 ![Screen_Shot_2015-03-19_at_03.45.27](https://gitlab.com/kingcody/gitlab-ce/uploads/e60e9dde1f86d89adf36480e7fcc611d/Screen_Shot_2015-03-19_at_03.45.27.png) See merge request !402
-rw-r--r--CHANGELOG1
-rw-r--r--app/assets/stylesheets/pages/header.scss2
2 files changed, 2 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG
index e0b15e93c6b..0b9a3513043 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -7,6 +7,7 @@ v 7.10.0 (unreleased)
- List new commits for newly pushed branch in activity view.
- Add changelog, license and contribution guide links to project sidebar.
- Improve diff UI
+ - Fix alignment of navbar toggle button (Cody Mize)
- Identical look of selectboxes in UI
v 7.9.0 (unreleased)
diff --git a/app/assets/stylesheets/pages/header.scss b/app/assets/stylesheets/pages/header.scss
index 26b4d04106e..dde19b801f8 100644
--- a/app/assets/stylesheets/pages/header.scss
+++ b/app/assets/stylesheets/pages/header.scss
@@ -31,7 +31,7 @@ header {
.navbar-toggle {
color: $style_color;
- margin: 0 -15px 0 0;
+ margin: 0;
padding: 10px;
border-radius: 0;