diff --git a/app/frontend/styles/_data_box.scss b/app/frontend/styles/_data_box.scss index f9003f99e..9bfb861ed 100644 --- a/app/frontend/styles/_data_box.scss +++ b/app/frontend/styles/_data_box.scss @@ -1,53 +1,5 @@ -.app-data-box-group { - @include govuk-font($size: 19); - font-weight: bold; - white-space: nowrap; -} - -@media (min-width: 54.0625em) { - .app-data-box-group-one-third { - display: flex; - justify-content: space-between; - column-gap: govuk-spacing(4); - width: 100%; - min-width: 733.33px; - } -} -@media (min-width: 54.0625em) { - .app-data-box-one-third { - width: 33.3333333%; - float: left; - } -} -@media (min-width: 54.0625em) { - .app-data-box__underline { - min-width: 733.33px; - } -} -@media (min-width: 54.0625em) { - .app-data-box-group-one-half { - display: flex; - justify-content: space-between; - column-gap: govuk-spacing(4); - width: 100%; - min-width: 733.33px; - } -} -@media (min-width: 54.0625em) { - .app-data-box-one-half { - width: 50%; - float: left; - } -} -@media (min-width: 54.0625em) { - .app-data-box-one-half__underline { - min-width: 733.33px; - } -} - .app-data-box__upper { @include govuk-responsive-margin(2, "bottom"); - @include govuk-responsive-padding(4); background-color: govuk-colour("light-grey"); color: govuk-colour("blue"); @@ -55,11 +7,16 @@ .app-data-box__lower { @include govuk-responsive-margin(4, "bottom"); - @include govuk-responsive-padding(4); background-color: govuk-colour("blue"); } +.app-data-box { + @include govuk-responsive-padding(4); + font-weight: bold; + white-space: nowrap; +} + .app-data-box__count { font-size: 48px; color: govuk-colour("blue"); diff --git a/app/views/home/_data_box.html.erb b/app/views/home/_data_box.html.erb index 38efb5195..fdd13d1a6 100644 --- a/app/views/home/_data_box.html.erb +++ b/app/views/home/_data_box.html.erb @@ -1,9 +1,9 @@ -
+
<%= govuk_link_to data_subheading(@current_user, type), data_path(@current_user, type), class: "govuk-link--no-visited-state" %>
-
+
<%= govuk_link_to view_all_text(type), view_all_path(type), class: "govuk-link--inverse" %>
diff --git a/app/views/home/index.html.erb b/app/views/home/index.html.erb index 6aaa65349..b5bbb139e 100644 --- a/app/views/home/index.html.erb +++ b/app/views/home/index.html.erb @@ -1,48 +1,43 @@
-
<%= "Welcome back, #{@current_user.name}" %>

<%= heading_for_user_role(@current_user) %>

-
+
<% if @current_user.support? || (@current_user.data_coordinator? && @current_user.sales_logs.present?) %> -
-
- <%= render partial: "home/data_box", locals: { type: "lettings" } %> +
+ <%= render partial: "home/data_box", locals: { type: "lettings" } %> +
+
+ <%= render partial: "home/data_box", locals: { type: "sales" } %> +
+
+ <%= render partial: "home/data_box", locals: { type: "schemes" } %> +
+ <% else %> +
+ <%= render partial: "home/data_box", locals: { type: "lettings" } %> +
+ <% if @current_user.data_coordinator? %> +
+ <%= render partial: "home/data_box", locals: { type: "schemes" } %>
-
+ <% elsif @current_user.sales_logs.present? %> +
<%= render partial: "home/data_box", locals: { type: "sales" } %>
-
- <%= render partial: "home/data_box", locals: { type: "schemes" } %> + <% else %> +
+ <%= render partial: "home/data_box", locals: { type: "misc" } %>
-
- <% else %> -
-
- <%= render partial: "home/data_box", locals: { type: "lettings" } %> -
- <% if @current_user.data_coordinator? %> -
- <%= render partial: "home/data_box", locals: { type: "schemes" } %> -
- <% elsif @current_user.sales_logs.present? %> -
- <%= render partial: "home/data_box", locals: { type: "sales" } %> -
- <% else %> -
- <%= render partial: "home/data_box", locals: { type: "misc" } %> -
- <% end %> -
+ <% end %> <% end %>
-
+