summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2016-08-31 15:59:44 +0000
committerAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2016-08-31 15:59:44 +0000
commit08ab410f223ef937822cbd647750e18ab69ed669 (patch)
treeb2625de8b55394846f5f33de2aeb28bd84be3028
parentd87cca179dcf55ec435e9b7c2d44e9544554d34c (diff)
parentf0866b28d384f569345eccb6e64ad93d29a3e570 (diff)
downloadgitlab-ce-08ab410f223ef937822cbd647750e18ab69ed669.tar.gz
Merge branch 'fix-repo-title-alignment' into 'master'
Fix repo title alignment ## What does this MR do? Adds an extra pixel margin to the hamburger button so that it matches the baseline of the repo title ## Are there points in the code the reviewer needs to double check? Shouldn't be any :smile: ## Why was this MR needed? Resolve UI Inconsistency ## What are the relevant issue numbers? Closes #21408 ## Screenshots (if relevant) Before: ![Screen_Shot_2016-08-25_at_8.44.11_PM](/uploads/e18241f3f025c501427f28d9040ca898/Screen_Shot_2016-08-25_at_8.44.11_PM.png) After: ![Screen_Shot_2016-08-25_at_8.43.45_PM](/uploads/03eca5df535af12eff7b79109a6b6f23/Screen_Shot_2016-08-25_at_8.43.45_PM.png) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - Tests - [x] All builds are passing - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !6046
-rw-r--r--CHANGELOG1
-rw-r--r--app/assets/stylesheets/framework/header.scss2
2 files changed, 2 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG
index c6923e8b3b2..08562b1a5a0 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -35,6 +35,7 @@ v 8.12.0 (unreleased)
- Remove redundant pipeline tooltips (ClemMakesApps)
- Add delimiter to project stars and forks count (ClemMakesApps)
- Fix badge count alignment (ClemMakesApps)
+ - Fix repo title alignment (ClemMakesApps)
- Fix branch title trailing space on hover (ClemMakesApps)
- Award emoji tooltips containing more than 10 usernames are now truncated !4780 (jlogandavison)
- Fix duplicate "me" in award emoji tooltip !5218 (jlogandavison)
diff --git a/app/assets/stylesheets/framework/header.scss b/app/assets/stylesheets/framework/header.scss
index afe4a276ae5..2b4fc0fb068 100644
--- a/app/assets/stylesheets/framework/header.scss
+++ b/app/assets/stylesheets/framework/header.scss
@@ -84,7 +84,7 @@ header {
.side-nav-toggle {
position: absolute;
left: -10px;
- margin: 6px 0;
+ margin: 7px 0;
font-size: 18px;
padding: 6px 10px;
border: none;