add new image card

alphagov · Sep 18, 2023 · fa35c9c · fa35c9c
1 parent 0801ecd
commit fa35c9c
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 26 deletions.
diff --git a/Gemfile b/Gemfile
@@ -10,7 +10,7 @@ gem "gds-api-adapters"
 gem "govuk_ab_testing"
 gem "govuk_app_config"
 gem "govuk_personalisation"
-gem "govuk_publishing_components"
+gem "govuk_publishing_components", path: '../govuk_publishing_components/'
 gem "htmlentities"
 gem "invalid_utf8_rejector"
 gem "plek"

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,3 +1,15 @@
+PATH
+  remote: ../govuk_publishing_components
+  specs:
+    govuk_publishing_components (35.15.3)
+      govuk_app_config
+      govuk_personalisation (>= 0.7.0)
+      kramdown
+      plek
+      rails (>= 6)
+      rouge
+      sprockets (>= 3)
+
 GEM
   remote: https://rubygems.org/
   specs:
@@ -152,14 +164,6 @@ GEM
     govuk_personalisation (0.14.0)
       plek (>= 1.9.0)
       rails (>= 6, < 8)
-    govuk_publishing_components (35.15.2)
-      govuk_app_config
-      govuk_personalisation (>= 0.7.0)
-      kramdown
-      plek
-      rails (>= 6)
-      rouge
-      sprockets (>= 3)
     govuk_schemas (4.6.0)
       json-schema (>= 2.8, < 4.1)
     govuk_test (3.0.1)
@@ -682,7 +686,7 @@ DEPENDENCIES
   govuk_ab_testing
   govuk_app_config
   govuk_personalisation
-  govuk_publishing_components
+  govuk_publishing_components!
   govuk_schemas
   govuk_test
   htmlentities

diff --git a/app/assets/stylesheets/views/_homepage.scss b/app/assets/stylesheets/views/_homepage.scss
@@ -14,19 +14,6 @@
   }
 }
 
-.homepage__services-and-information {
-  @include govuk-media-query($from: desktop) {
-    width: 55%;
-  }
-}
-
-.homepage__promotion-slots {
-  @include govuk-media-query($from: desktop) {
-    width: 45%;
-    padding-left: 0;
-  }
-}
-
 .homepage-inverse-header__title {
   @include govuk-typography-weight-bold;
   color: govuk-colour("white");

diff --git a/app/assets/stylesheets/views/_homepage_new.scss b/app/assets/stylesheets/views/_homepage_new.scss
@@ -14,6 +14,19 @@
   }
 }
 
+.homepage__services-and-information {
+  @include govuk-media-query($from: desktop) {
+    width: 55%;
+  }
+}
+
+.homepage__promotion-slots {
+  @include govuk-media-query($from: desktop) {
+    width: 45%;
+    padding-left: 0;
+  }
+}
+
 .homepage-inverse-header__title {
   @include govuk-typography-weight-bold;
   color: govuk-colour("white");

diff --git a/app/views/homepage/new/_body.html.erb b/app/views/homepage/new/_body.html.erb
@@ -1,10 +1,10 @@
 <div class="govuk-grid-row">
-  <div class="govuk-grid-column-full govuk-grid-column-two-thirds-from-desktop">
+  <div class="govuk-grid-column-full homepage__services-and-information">
     <%= render "homepage/services_and_information" %>
   </div>
-  <div class="govuk-grid-column-full govuk-grid-column-one-third-from-desktop">
+  <div class="govuk-grid-column-full homepage__promotion-slots">
     <%= render "homepage/new/promotion-slots" %>
   </div>
 </div>
-<%= render "homepage/new/government_activity" %>
+<%= render "homepage/government_activity" %>
 <%= render "homepage/more_on_govuk" %>