summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacob Schatz <jschatz@gitlab.com>2016-06-16 18:47:48 +0000
committerJacob Schatz <jschatz@gitlab.com>2016-06-16 18:47:48 +0000
commit38d0b5b54e486a338050fcb3997fce51102de26c (patch)
treef966450b0d97864ac425a1c55d4f0b2db70584be
parentaf1574e0418fb048f87b474f1da8bd7a07480300 (diff)
parent10ae756a8623170ef5ca924364231a4ce341ce23 (diff)
downloadgitlab-ce-38d0b5b54e486a338050fcb3997fce51102de26c.tar.gz
Merge branch 'media-query-bug' into 'master'
Fix project header alignment media query bug ## What does this MR do? Fixes media query bug on project header ## Screenshots (if relevant) ![Screen_Shot_2016-06-15_at_3.22.20_PM](/uploads/3d84f8ffb88c316f317048e15ffea4f3/Screen_Shot_2016-06-15_at_3.22.20_PM.png) See merge request !4689
-rw-r--r--app/assets/stylesheets/pages/projects.scss6
1 files changed, 3 insertions, 3 deletions
diff --git a/app/assets/stylesheets/pages/projects.scss b/app/assets/stylesheets/pages/projects.scss
index c85d23a31f0..855d86cb238 100644
--- a/app/assets/stylesheets/pages/projects.scss
+++ b/app/assets/stylesheets/pages/projects.scss
@@ -28,7 +28,7 @@
.container-fluid {
position: relative;
- @media (min-width: $screen-md-max) {
+ @media (min-width: $screen-lg-min) {
.row {
display: flex;
-ms-flex-align: center;
@@ -224,7 +224,7 @@
right: 16px;
bottom: 0;
- @media (max-width: $screen-lg-min) {
+ @media (max-width: $screen-md-max) {
top: 0;
}
@@ -233,7 +233,7 @@
right: 0;
bottom: 61px;
- @media (max-width: $screen-lg-min) {
+ @media (max-width: $screen-md-max) {
position: relative;
bottom: 0;
margin-right: 10px;