From 6e431c6ce253d77f775a4a16c30d347896d4ccb0 Mon Sep 17 00:00:00 2001
From: Filipa Lacerda <filipa@gitlab.com>
Date: Fri, 18 Nov 2016 16:28:25 +0000
Subject: Fixes margins for project buttons

Adds changelog entry

Fix margins with pinned sidebar

Fix scss linter errors

Adds MR ID to changelog entry
---
 app/assets/stylesheets/pages/projects.scss      | 30 ++++++++++++++++++++++---
 changelogs/unreleased/24070-project-margins.yml |  4 ++++
 2 files changed, 31 insertions(+), 3 deletions(-)
 create mode 100644 changelogs/unreleased/24070-project-margins.yml

diff --git a/app/assets/stylesheets/pages/projects.scss b/app/assets/stylesheets/pages/projects.scss
index ad46a2a9128..42f2028fe64 100644
--- a/app/assets/stylesheets/pages/projects.scss
+++ b/app/assets/stylesheets/pages/projects.scss
@@ -145,10 +145,12 @@
   }
 }
 
-.project-repo-buttons,
 .group-buttons {
   margin-top: 15px;
+}
 
+.project-repo-buttons,
+.group-buttons {
   .btn {
     @include btn-gray;
     padding: 3px 10px;
@@ -184,6 +186,12 @@
     margin-left: 10px;
   }
 
+  .download-button {
+    @media (max-width: $screen-lg-min) {
+      margin-left: 0;
+    }
+  }
+
   .count-buttons {
     display: inline-block;
     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 {
   font-size: 0;
   border-bottom: 1px solid $border-color;
@@ -485,9 +507,11 @@ a.deploy-project-label {
     }
 
     &.right {
-      @media (min-width: $screen-md-min) {
+      vertical-align: top;
+      margin-top: 0;
+
+      @media (min-width: $screen-lg-min) {
         float: right;
-        margin-top: 0;
       }
     }
   }
diff --git a/changelogs/unreleased/24070-project-margins.yml b/changelogs/unreleased/24070-project-margins.yml
new file mode 100644
index 00000000000..cbc2b0269f0
--- /dev/null
+++ b/changelogs/unreleased/24070-project-margins.yml
@@ -0,0 +1,4 @@
+---
+title: Fix Margins look weird in Project page with pinned sidebar in project stats bar
+merge_request: 7580
+author:
-- 
cgit v1.2.1


From b025e36f6933c9372b12a7eba64ffb3ad16803a2 Mon Sep 17 00:00:00 2001
From: Filipa Lacerda <filipa@gitlab.com>
Date: Fri, 18 Nov 2016 18:07:18 +0000
Subject: Fix after review

---
 app/assets/stylesheets/pages/projects.scss | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/assets/stylesheets/pages/projects.scss b/app/assets/stylesheets/pages/projects.scss
index 42f2028fe64..19a7a97ea0d 100644
--- a/app/assets/stylesheets/pages/projects.scss
+++ b/app/assets/stylesheets/pages/projects.scss
@@ -145,12 +145,14 @@
   }
 }
 
-.group-buttons {
-  margin-top: 15px;
+.nav > .project-repo-buttons {
+  margin-top: 0;
 }
 
 .project-repo-buttons,
 .group-buttons {
+  margin-top: 15px;
+
   .btn {
     @include btn-gray;
     padding: 3px 10px;
-- 
cgit v1.2.1