diff options
| author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-06-20 15:19:16 +0000 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-06-20 15:19:16 +0000 |
| commit | d5b83afc7b045a4efea14ce5ad95c30bb28639fa (patch) | |
| tree | 5e69f5f6d4fd2ce61ad06eb79da2cbf153753013 | |
| parent | 33f60884734ce6b956d963e3b9e0f0504b39f02d (diff) | |
| parent | 0f62f31f460997033f5adc0b496e5caf5dc52ba0 (diff) | |
| download | gitlab-ce-d5b83afc7b045a4efea14ce5ad95c30bb28639fa.tar.gz | |
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
| -rw-r--r-- | app/assets/stylesheets/framework/blocks.scss | 2 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/cycle_analytics.scss | 2 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/groups.scss | 2 |
3 files changed, 2 insertions, 4 deletions
diff --git a/app/assets/stylesheets/framework/blocks.scss b/app/assets/stylesheets/framework/blocks.scss index fefe5575d9b..95a08c960ea 100644 --- 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; diff --git a/app/assets/stylesheets/pages/cycle_analytics.scss b/app/assets/stylesheets/pages/cycle_analytics.scss index 7bec4bd5f56..3039732ca5b 100644 --- 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; diff --git a/app/assets/stylesheets/pages/groups.scss b/app/assets/stylesheets/pages/groups.scss index 72d73b89a2a..6f6c6839975 100644 --- 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; |