Fixes margins for project buttons

Adds changelog entry

Fix margins with pinned sidebar

Fix scss linter errors

Adds MR ID to changelog entry
This commit is contained in:
Filipa Lacerda 2016-11-18 16:28:25 +00:00
parent 1e8cb595bf
commit 6e431c6ce2
2 changed files with 31 additions and 3 deletions

View file

@ -145,10 +145,12 @@
} }
} }
.project-repo-buttons,
.group-buttons { .group-buttons {
margin-top: 15px; margin-top: 15px;
}
.project-repo-buttons,
.group-buttons {
.btn { .btn {
@include btn-gray; @include btn-gray;
padding: 3px 10px; padding: 3px 10px;
@ -184,6 +186,12 @@
margin-left: 10px; margin-left: 10px;
} }
.download-button {
@media (max-width: $screen-lg-min) {
margin-left: 0;
}
}
.count-buttons { .count-buttons {
display: inline-block; display: inline-block;
vertical-align: top; vertical-align: top;
@ -468,6 +476,20 @@ a.deploy-project-label {
} }
} }
.page-sidebar-pinned {
.project-stats .nav > li.right {
@media (min-width: $screen-lg-min) {
float: none;
}
}
.download-button {
@media (min-width: $screen-lg-min) {
margin-left: 0;
}
}
}
.project-stats { .project-stats {
font-size: 0; font-size: 0;
border-bottom: 1px solid $border-color; border-bottom: 1px solid $border-color;
@ -485,9 +507,11 @@ a.deploy-project-label {
} }
&.right { &.right {
@media (min-width: $screen-md-min) { vertical-align: top;
margin-top: 0;
@media (min-width: $screen-lg-min) {
float: right; float: right;
margin-top: 0;
} }
} }
} }

View file

@ -0,0 +1,4 @@
---
title: Fix Margins look weird in Project page with pinned sidebar in project stats bar
merge_request: 7580
author: