Merge branch '33363-user-customize-callout-has-no-top-margin-on-projects-page' into 'master'

Resolve "User customize callout has no top-margin on projects page" Closes #33592 and #33363 See merge request !12090

Merge branch '33363-user-customize-callout-has-no-top-margin-on-projects-page' into 'master'
d5b83afc · Annabel Dunstone Gray · 33f60884 · 0f62f31f · d5b83afc · d5b83afc
Commit d5b83afc authored Jun 20, 2017 by Annabel Dunstone Gray
Showing with 2 additions and 4 deletions

blocks.scss app/assets/stylesheets/framework/blocks.scss +1 -1

cycle_analytics.scss app/assets/stylesheets/pages/cycle_analytics.scss +1 -1

groups.scss app/assets/stylesheets/pages/groups.scss +0 -2

No files found.
--- a/app/assets/stylesheets/framework/blocks.scss
+++ b/app/assets/stylesheets/framework/blocks.scss
@@ -254,7 +254,7 @@
 }

 .landing {
-  margin-bottom: $gl-padding;
+  margin: $gl-padding auto;
  overflow: hidden;
  display: flex;
  position: relative;

--- a/app/assets/stylesheets/pages/cycle_analytics.scss
+++ b/app/assets/stylesheets/pages/cycle_analytics.scss
@@ -4,7 +4,7 @@
  position: relative;

  .landing {
-    margin-top: 10px;
+    margin-top: 0;

    .inner-content {
      white-space: normal;

--- a/app/assets/stylesheets/pages/groups.scss
+++ b/app/assets/stylesheets/pages/groups.scss
@@ -90,8 +90,6 @@
 }

 .explore-groups.landing {
-  margin-top: 10px;
-
  .inner-content {
    padding: 0;