diff options
author | Phil Hughes <me@iamphill.com> | 2019-03-20 14:36:16 +0300 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2019-03-20 14:36:16 +0300 |
commit | dfd097534b83272c9936be0bc222facd8e126559 (patch) | |
tree | 9457d20026d7cf8c2044df2abae9300082ece19d /app/assets | |
parent | fd037945ec9c0e7f30893f59dd795acfc65f2459 (diff) | |
parent | 6b195fd0a600d5390eaf0011ef41a579b016a85e (diff) |
Merge branch '10533-blank-css' into 'master'
Removes EE differences for blank.scss
Closes gitlab-ee#10533
See merge request gitlab-org/gitlab-ce!26354
Diffstat (limited to 'app/assets')
-rw-r--r-- | app/assets/stylesheets/framework/blank.scss | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/app/assets/stylesheets/framework/blank.scss b/app/assets/stylesheets/framework/blank.scss index 91dbb2a6365..cbd390e7145 100644 --- a/app/assets/stylesheets/framework/blank.scss +++ b/app/assets/stylesheets/framework/blank.scss @@ -69,6 +69,7 @@ @include media-breakpoint-up(sm) { display: flex; + height: 100%; align-items: center; padding: 50px 30px; } @@ -99,3 +100,30 @@ } } } + +@include media-breakpoint-up(lg) { + .column-large { + flex: 2; + } + + .column-small { + flex: 1; + margin-bottom: 15px; + + .blank-state { + max-width: 400px; + flex-wrap: wrap; + margin-left: 15px; + } + + .blank-state-icon { + margin-bottom: 30px; + } + } +} + +@include media-breakpoint-down(xs) { + .blank-state-icon svg { + width: 315px; + } +} |