summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFatih Acet <acetfatih@gmail.com>2016-09-16 20:22:48 +0300
committerFatih Acet <acetfatih@gmail.com>2016-09-16 20:22:48 +0300
commit40c17f2dd9ac5279c0019c9fdcb34aaa55331260 (patch)
treeb710098407061421c6637c3d8f44b0965f3a64b3
parent5fe993b30d1f1fc0e37c7303f671a09f7b26148b (diff)
downloadgitlab-ce-40c17f2dd9ac5279c0019c9fdcb34aaa55331260.tar.gz
Fix layout for cycle analytics.
-rw-r--r--app/assets/stylesheets/pages/cycle_analytics.scss2
-rw-r--r--app/views/projects/cycle_analytics/show.html.haml78
2 files changed, 41 insertions, 39 deletions
diff --git a/app/assets/stylesheets/pages/cycle_analytics.scss b/app/assets/stylesheets/pages/cycle_analytics.scss
index 306212990e1..16a9b0eebfc 100644
--- a/app/assets/stylesheets/pages/cycle_analytics.scss
+++ b/app/assets/stylesheets/pages/cycle_analytics.scss
@@ -26,7 +26,7 @@
.dropdown {
position: relative;
- top: 10px;
+ top: 13px;
}
}
diff --git a/app/views/projects/cycle_analytics/show.html.haml b/app/views/projects/cycle_analytics/show.html.haml
index 4dd9847b42d..33c403118c1 100644
--- a/app/views/projects/cycle_analytics/show.html.haml
+++ b/app/views/projects/cycle_analytics/show.html.haml
@@ -8,49 +8,51 @@
.content-block
= icon("spinner spin", "v-if" => "isLoading")
- .row
- %template{"v-for" => "info in analytics.summary"}
- .col-md-3.column
- %span.header {{info.value}}
- %br
- %span.text {{info.desc}}
-
- .col-md-3.column
- .dropdown.inline.js-ca-dropdown
- %button.dropdown-menu-toggle{"aria-expanded" => "false", "data-toggle" => "dropdown", :type => "button"}
- %span.dropdown-label Last 30 days
- %i.fa.fa-chevron-down
- %ul.dropdown-menu.dropdown-menu-align-right
- %li
- %a{'href' => "#", 'data-value' => '30days'}
- Last 30 days
- %li
- %a{'href' => "#", 'data-value' => '90days'}
- Last 90 days
+ .container-fluid
+ .row
+ %template{"v-for" => "info in analytics.summary"}
+ .col-xs-3.column
+ %span.header {{info.value}}
+ %br
+ %span.text {{info.desc}}
+
+ .col-xs-3.column
+ .dropdown.inline.js-ca-dropdown
+ %button.dropdown-menu-toggle{"aria-expanded" => "false", "data-toggle" => "dropdown", :type => "button"}
+ %span.dropdown-label Last 30 days
+ %i.fa.fa-chevron-down
+ %ul.dropdown-menu.dropdown-menu-align-right
+ %li
+ %a{'href' => "#", 'data-value' => '30days'}
+ Last 30 days
+ %li
+ %a{'href' => "#", 'data-value' => '90days'}
+ Last 90 days
.bordered-box
= icon("spinner spin", "v-if" => "isLoading")
%ul.content-list{{"v-if" => "!notAvailable"}}
%li{"v-for" => "info in analytics.data"}
- .row
- .col-md-10
- %span
- {{info.title}}
- %br
- %span
- {{info.desc}}
- .col-md-2
- %span
- {{info.value}}
-
-
- .content-block{{"v-if" => "notAvailable"}}
- .inner-content
- = custom_icon('icon_cycle_analytics_splash')
- %h4
- Set up your deploys to environment!
- %p
- Cycle Analytics will give an overview on how much time it takes to go from an idea to production in your project.
+ .container-fluid
+ .row
+ .col-xs-10
+ %span
+ {{info.title}}
+ %br
+ %span
+ {{info.desc}}
+ .col-xs-2
+ %span
+ {{info.value}}
+
+
+ .content-block{{"v-if" => "notAvailable"}}
+ .inner-content
+ = custom_icon('icon_cycle_analytics_splash')
+ %h4
+ Set up your deploys to environment!
+ %p
+ Cycle Analytics will give an overview on how much time it takes to go from an idea to production in your project.
= button_tag 'Set up', class: 'btn btn-create btn-block'