Merge pull request #231 from ukparliament/integrate-design-system

Integrate design system

Author: j-corry

.tool-versions

@@ -1 +1 @@
-ruby-4.0.1
+ ruby 4.0.1

Gemfile

@@ -8,7 +8,8 @@ gem 'bundler-audit'
 gem 'cgi'
 gem 'fiddle'
 gem "pg"
-gem "sprockets-rails"
+gem "propshaft"
+gem "library_design", github: "ukparliament/design-assets", glob: 'library_design/*.gemspec', tag: "0.6.4"
 gem "importmap-rails"
 gem "font-awesome-rails"
 gem "haml"

Gemfile.lock

@@ -1,3 +1,12 @@
+GIT
+  remote: https://github.com/ukparliament/design-assets.git
+  revision: 88687369f401dc8f5c666712d37eda3da567ee15
+  tag: 0.6.4
+  glob: library_design/*.gemspec
+  specs:
+    library_design (0.6.4)
+      rack-cors (~> 3.0.0)
+
 GEM
   remote: https://rubygems.org/
   specs:
@@ -176,12 +185,19 @@ GEM
       prettyprint
     prettyprint (0.2.0)
     prism (1.8.0)
+    propshaft (1.3.1)
+      actionpack (>= 7.0.0)
+      activesupport (>= 7.0.0)
+      rack
     psych (5.3.1)
       date
       stringio
     public_suffix (6.0.1)
     racc (1.8.1)
-    rack (3.2.4)
+    rack (3.2.5)
+    rack-cors (3.0.0)
+      logger
+      rack (>= 3.0.14)
     rack-session (2.1.1)
       base64 (>= 0.1.0)
       rack (>= 3.0.0)
@@ -263,14 +279,6 @@ GEM
       simplecov_json_formatter (~> 0.1)
     simplecov-html (0.13.1)
     simplecov_json_formatter (0.1.4)
-    sprockets (4.2.2)
-      concurrent-ruby (~> 1.0)
-      logger
-      rack (>= 2.2.4, < 4)
-    sprockets-rails (3.5.2)
-      actionpack (>= 6.1)
-      activesupport (>= 6.1)
-      sprockets (>= 3.0.0)
     stimulus-rails (1.3.4)
       railties (>= 6.0.0)
     stringio (3.2.0)
@@ -316,14 +324,15 @@ DEPENDENCIES
   haml
   importmap-rails
   jbuilder
+  library_design!
   passenger (>= 6)
   pg
+  propshaft
   rails (= 8.1.2)
   rails-controller-testing
   rspec-rails
   selenium-webdriver
   simplecov
-  sprockets-rails
   stimulus-rails
   turbo-rails
   tzinfo-data

app/assets/config/manifest.js

@@ -1,17 +1,10 @@
-/*
- * This is a manifest file that'll be compiled into application.css, which will include all the files
- * listed below.
- *
- * Any CSS (and SCSS, if configured) file within this directory, lib/assets/stylesheets, or any plugin's
- * vendor/assets/stylesheets directory can be referenced here using a relative path.
- *
- * You're free to add application-wide styles to this file and they'll appear at the bottom of the
- * compiled file so the styles you add here take precedence over styles defined in any other CSS
- * files in this directory. Styles in this file should be added after the last require_* statement.
- * It is generally better to create a new file per style scope.
- *
- *= require_tree .
- *= require_self
- */
-
+/*override margins set by design system*/
+/* reset bottom margin for last child paragraph */
+p:last-child {
+    margin-bottom: 18px;
+}
 
+/* only remove bottom margin for last direct child of a container */
+.container-sm > p:last-child {
+    margin-bottom: 0;
+}