summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFilipa Lacerda <filipa@gitlab.com>2016-11-18 16:28:25 +0000
committerFilipa Lacerda <filipa@gitlab.com>2016-11-18 16:47:27 +0000
commit6e431c6ce253d77f775a4a16c30d347896d4ccb0 (patch)
treecd3f70f2596f4c846d02e800017fa3055b0473f9
parent1e8cb595bf2fc84c85198cf8dc43d16e587c57df (diff)
downloadgitlab-ce-24070-project-margins.tar.gz
Fixes margins for project buttons24070-project-margins
Adds changelog entry Fix margins with pinned sidebar Fix scss linter errors Adds MR ID to changelog entry
-rw-r--r--app/assets/stylesheets/pages/projects.scss30
-rw-r--r--changelogs/unreleased/24070-project-margins.yml4
2 files changed, 31 insertions, 3 deletions
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: