diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index 5b64692b7..aac24c497 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -40,7 +40,6 @@ // = require recapitulatif // = require search // = require siret -// = require stats // = require support_navigator_banner // = require switch_menu // = require typeahead diff --git a/app/assets/stylesheets/stats.scss b/app/assets/stylesheets/new_design/stats.scss similarity index 96% rename from app/assets/stylesheets/stats.scss rename to app/assets/stylesheets/new_design/stats.scss index 42fef6ac1..5b32a7a24 100644 --- a/app/assets/stylesheets/stats.scss +++ b/app/assets/stylesheets/new_design/stats.scss @@ -1,5 +1,3 @@ -@import "card"; - $dark-grey: #333333; $light-grey: #999999; $blue: rgba(61, 149, 236, 1); @@ -12,8 +10,9 @@ $new-h1-margin-bottom: 4 * $default-space; .new-h1 { color: $dark-grey; text-align: center; - margin-top: 0; margin-bottom: $new-h1-margin-bottom; + font-weight: bold; + font-size: 41px; } $statistiques-padding-top: $default-space * 2; @@ -33,6 +32,7 @@ $statistiques-padding-top: $default-space * 2; $stat-card-margin-bottom: 3 * $default-space; .stat-card { + padding: 15px; margin-bottom: $stat-card-margin-bottom; border-radius: 5px; box-shadow: none; @@ -49,7 +49,7 @@ $stat-card-half-horizontal-spacing: 4 * $default-space; .stat-card-title { color: $dark-grey; font-size: 26px; - font-weight: 500; + font-weight: bold; width: 200px; } diff --git a/app/assets/stylesheets/new_design/utils.scss b/app/assets/stylesheets/new_design/utils.scss index 04a4559bf..958f8ff9c 100644 --- a/app/assets/stylesheets/new_design/utils.scss +++ b/app/assets/stylesheets/new_design/utils.scss @@ -13,3 +13,7 @@ .center { text-align: center; } + +.hidden { + display: none; +} diff --git a/app/controllers/stats_controller.rb b/app/controllers/stats_controller.rb index 66d1bf202..629b2dad7 100644 --- a/app/controllers/stats_controller.rb +++ b/app/controllers/stats_controller.rb @@ -1,4 +1,5 @@ class StatsController < ApplicationController + layout "new_application" def index procedures = Procedure.where(:published => true) diff --git a/app/views/stats/index.html.haml b/app/views/stats/index.html.haml index c3d40561a..9b0a389b1 100644 --- a/app/views/stats/index.html.haml +++ b/app/views/stats/index.html.haml @@ -4,7 +4,7 @@ .stat-cards - .card.stat-card.stat-card-half.pull-left + .stat-card.stat-card-half.pull-left %ul.segmented-control.pull-right %li.segmented-control-item.segmented-control-item-active{ :onclick => "TPS.toggleChart(event, '.cumulative-procedures-chart');" } Cumul @@ -21,7 +21,7 @@ = line_chart @procedures_30_days_flow, :colors => ["rgba(61, 149, 236, 1)"] - .card.stat-card.stat-card-half.pull-left + .stat-card.stat-card-half.pull-left %ul.segmented-control.pull-right %li.segmented-control-item.segmented-control-item-active{ :onclick => "TPS.toggleChart(event, '.cumulative-dossiers-chart');" } Cumul @@ -38,12 +38,12 @@ = line_chart @dossiers_30_days_flow, :colors => ["rgba(61, 149, 236, 1)"] - .card.stat-card.stat-card-half.big-number-card.pull-left + .stat-card.stat-card-half.big-number-card.pull-left %span.big-number-card-title TOTAL PROCÉDURES DÉMATÉRIALISÉES %span.big-number-card-number = number_with_delimiter(@procedures_count) - .card.stat-card.stat-card-half.big-number-card.pull-left + .stat-card.stat-card-half.big-number-card.pull-left %span.big-number-card-title TOTAL DOSSIERS DÉPOSÉS %span.big-number-card-number = number_with_delimiter(@dossiers_count)