Commit c15e2244 authored by Annabel Dunstone Gray's avatar Annabel Dunstone Gray

Merge branch 'cycle-anyltics-landing-box-fix' into 'master'

Fixed cycle analytics intro box styling regression

Closes #31844

See merge request !11111
parents b9a1b0d1 6f7933b3
...@@ -3,6 +3,25 @@ ...@@ -3,6 +3,25 @@
margin: 24px auto 0; margin: 24px auto 0;
position: relative; position: relative;
.landing {
margin-top: 10px;
.inner-content {
white-space: normal;
h4,
p {
margin: 7px 0 0;
max-width: 480px;
padding: 0 $gl-padding;
@media (max-width: $screen-sm-min) {
margin: 0 auto;
}
}
}
}
.col-headers { .col-headers {
ul { ul {
margin: 0; margin: 0;
......
...@@ -9,17 +9,17 @@ ...@@ -9,17 +9,17 @@
#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) } }
- if @cycle_analytics_no_data - if @cycle_analytics_no_data
.bordered-box.landing.content-block{ "v-if" => "!isOverviewDialogDismissed" } .landing.content-block{ "v-if" => "!isOverviewDialogDismissed" }
= icon("times", class: "dismiss-icon", "@click" => "dismissOverviewDialog()") %button.dismiss-button{ type: 'button', 'aria-label': 'Dismiss Cycle Analytics introduction box' }
.row = icon("times", "@click" => "dismissOverviewDialog()")
.col-sm-3.col-xs-12.svg-container .svg-container
= custom_icon('icon_cycle_analytics_splash') = custom_icon('icon_cycle_analytics_splash')
.col-sm-8.col-xs-12.inner-content .inner-content
%h4 %h4
{{ __('Introducing Cycle Analytics') }} {{ __('Introducing Cycle Analytics') }}
%p %p
{{ __('Cycle Analytics gives an overview of how much time it takes to go from idea to production in your project.') }} {{ __('Cycle Analytics gives an overview of how much time it takes to go from idea to production in your project.') }}
%p
= link_to _('Read more'), help_page_path('user/project/cycle_analytics'), target: '_blank', class: 'btn' = link_to _('Read more'), help_page_path('user/project/cycle_analytics'), target: '_blank', class: 'btn'
= icon("spinner spin", "v-show" => "isLoading") = icon("spinner spin", "v-show" => "isLoading")
.wrapper{ "v-show" => "!isLoading && !hasError" } .wrapper{ "v-show" => "!isLoading && !hasError" }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment