summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFilipa Lacerda <filipa@gitlab.com>2016-09-22 19:48:23 +0100
committerFilipa Lacerda <filipa@gitlab.com>2016-09-22 19:48:23 +0100
commit2c2b487dc377962e241c09b30bf722b32315224f (patch)
tree3f24d3e98b62a39308359c77fb4456ebd1b1f058
parent43701de5f29e501f4b4c27b59474eee4190b8378 (diff)
downloadgitlab-ce-filipa-22444.tar.gz
Improvements after reviewfilipa-22444
-rw-r--r--app/assets/stylesheets/framework/variables.scss1
-rw-r--r--app/assets/stylesheets/pages/cycle_analytics.scss4
-rw-r--r--app/views/projects/cycle_analytics/show.html.haml2
3 files changed, 3 insertions, 4 deletions
diff --git a/app/assets/stylesheets/framework/variables.scss b/app/assets/stylesheets/framework/variables.scss
index 0270da77450..14ec310de2d 100644
--- a/app/assets/stylesheets/framework/variables.scss
+++ b/app/assets/stylesheets/framework/variables.scss
@@ -273,7 +273,6 @@ $calendar-unselectable-bg: $gray-light;
* Cycle Analytics
*/
$cycle-analytics-box-padding: 30px;
-$cycle-analytics-box-margin-bottom: 16px;
$cycle-analytics-box-text-color: #8c8c8c;
/*
diff --git a/app/assets/stylesheets/pages/cycle_analytics.scss b/app/assets/stylesheets/pages/cycle_analytics.scss
index 1df89436d88..fec34287e35 100644
--- a/app/assets/stylesheets/pages/cycle_analytics.scss
+++ b/app/assets/stylesheets/pages/cycle_analytics.scss
@@ -81,7 +81,7 @@
}
.landing {
- margin-bottom: $cycle-analytics-box-margin-bottom;
+ margin-bottom: $gl-padding;
overflow: hidden;
.dismiss-icon {
@@ -114,7 +114,7 @@
p {
color: $cycle-analytics-box-text-color;
- margin-bottom: $cycle-analytics-box-margin-bottom;
+ margin-bottom: $gl-padding;
}
}
}
diff --git a/app/views/projects/cycle_analytics/show.html.haml b/app/views/projects/cycle_analytics/show.html.haml
index 9d17b14e601..ddd636c2b96 100644
--- a/app/views/projects/cycle_analytics/show.html.haml
+++ b/app/views/projects/cycle_analytics/show.html.haml
@@ -2,7 +2,7 @@
- page_title "Cycle Analytics"
= render "projects/pipelines/head"
-#cycle-analytics{class: container_class , "v-cloak" => "true", data: { request_path: project_cycle_analytics_path(@project)}}
+#cycle-analytics{class: container_class, "v-cloak" => "true", data: { request_path: project_cycle_analytics_path(@project)}}
.bordered-box.landing.content-block{"v-if" => "!isHelpDismissed"}
= icon('times', class: 'dismiss-icon', "@click": "dismissLanding()")