diff --git a/Gemfile b/Gemfile index b05c0df..0c360a8 100644 --- a/Gemfile +++ b/Gemfile @@ -49,10 +49,10 @@ gem "bootsnap", require: false # Use Active Storage variants [https://guides.rubyonrails.org/active_storage_overview.html#transforming-images] gem "image_processing", "~> 1.2" -group :development, :test do - # See https://guides.rubyonrails.org/debugging_rails_applications.html#debugging-with-the-debug-gem - gem "debug", platforms: %i[ mri windows ] -end +# group :development, :test do +# # See https://guides.rubyonrails.org/debugging_rails_applications.html#debugging-with-the-debug-gem +# gem "debug", platforms: %i[ mri windows ] +# end group :development do # Use console on exceptions pages [https://github.com/rails/web-console] @@ -65,8 +65,8 @@ group :development do # gem "spring" end -group :test do - # Use system testing [https://guides.rubyonrails.org/testing.html#system-testing] - gem "capybara" - gem "selenium-webdriver" -end +# group :test do +# # Use system testing [https://guides.rubyonrails.org/testing.html#system-testing] +# gem "capybara" +# gem "selenium-webdriver" +# end diff --git a/Gemfile.lock b/Gemfile.lock index e261ebb..2a0d210 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,35 +1,35 @@ GEM remote: https://rubygems.org/ specs: - actioncable (7.1.3.2) - actionpack (= 7.1.3.2) - activesupport (= 7.1.3.2) + actioncable (7.1.3.3) + actionpack (= 7.1.3.3) + activesupport (= 7.1.3.3) nio4r (~> 2.0) websocket-driver (>= 0.6.1) zeitwerk (~> 2.6) - actionmailbox (7.1.3.2) - actionpack (= 7.1.3.2) - activejob (= 7.1.3.2) - activerecord (= 7.1.3.2) - activestorage (= 7.1.3.2) - activesupport (= 7.1.3.2) + actionmailbox (7.1.3.3) + actionpack (= 7.1.3.3) + activejob (= 7.1.3.3) + activerecord (= 7.1.3.3) + activestorage (= 7.1.3.3) + activesupport (= 7.1.3.3) mail (>= 2.7.1) net-imap net-pop net-smtp - actionmailer (7.1.3.2) - actionpack (= 7.1.3.2) - actionview (= 7.1.3.2) - activejob (= 7.1.3.2) - activesupport (= 7.1.3.2) + actionmailer (7.1.3.3) + actionpack (= 7.1.3.3) + actionview (= 7.1.3.3) + activejob (= 7.1.3.3) + activesupport (= 7.1.3.3) mail (~> 2.5, >= 2.5.4) net-imap net-pop net-smtp rails-dom-testing (~> 2.2) - actionpack (7.1.3.2) - actionview (= 7.1.3.2) - activesupport (= 7.1.3.2) + actionpack (7.1.3.3) + actionview (= 7.1.3.3) + activesupport (= 7.1.3.3) nokogiri (>= 1.8.5) racc rack (>= 2.2.4) @@ -37,35 +37,35 @@ GEM rack-test (>= 0.6.3) rails-dom-testing (~> 2.2) rails-html-sanitizer (~> 1.6) - actiontext (7.1.3.2) - actionpack (= 7.1.3.2) - activerecord (= 7.1.3.2) - activestorage (= 7.1.3.2) - activesupport (= 7.1.3.2) + actiontext (7.1.3.3) + actionpack (= 7.1.3.3) + activerecord (= 7.1.3.3) + activestorage (= 7.1.3.3) + activesupport (= 7.1.3.3) globalid (>= 0.6.0) nokogiri (>= 1.8.5) - actionview (7.1.3.2) - activesupport (= 7.1.3.2) + actionview (7.1.3.3) + activesupport (= 7.1.3.3) builder (~> 3.1) erubi (~> 1.11) rails-dom-testing (~> 2.2) rails-html-sanitizer (~> 1.6) - activejob (7.1.3.2) - activesupport (= 7.1.3.2) + activejob (7.1.3.3) + activesupport (= 7.1.3.3) globalid (>= 0.3.6) - activemodel (7.1.3.2) - activesupport (= 7.1.3.2) - activerecord (7.1.3.2) - activemodel (= 7.1.3.2) - activesupport (= 7.1.3.2) + activemodel (7.1.3.3) + activesupport (= 7.1.3.3) + activerecord (7.1.3.3) + activemodel (= 7.1.3.3) + activesupport (= 7.1.3.3) timeout (>= 0.4.0) - activestorage (7.1.3.2) - actionpack (= 7.1.3.2) - activejob (= 7.1.3.2) - activerecord (= 7.1.3.2) - activesupport (= 7.1.3.2) + activestorage (7.1.3.3) + actionpack (= 7.1.3.3) + activejob (= 7.1.3.3) + activerecord (= 7.1.3.3) + activesupport (= 7.1.3.3) marcel (~> 1.0) - activesupport (7.1.3.2) + activesupport (7.1.3.3) base64 bigdecimal concurrent-ruby (~> 1.0, >= 1.0.2) @@ -88,16 +88,7 @@ GEM bootsnap (1.18.3) msgpack (~> 1.2) builder (3.2.4) - capybara (3.40.0) - addressable - matrix - mini_mime (>= 0.1.3) - nokogiri (~> 1.11) - rack (>= 1.6.0) - rack-test (>= 0.6.3) - regexp_parser (>= 1.5, < 3.0) - xpath (~> 3.2) - concurrent-ruby (1.2.3) + concurrent-ruby (1.3.1) connection_pool (2.4.1) crass (1.0.6) css_parser (1.17.1) @@ -106,9 +97,6 @@ GEM date_validator (0.12.0) activemodel (>= 3) activesupport (>= 3) - debug (1.9.2) - irb (~> 1.10) - reline (>= 0.3.8) dkim (1.1.0) dotenv (3.1.2) dotenv-rails (3.1.2) @@ -157,10 +145,9 @@ GEM net-pop net-smtp marcel (1.0.4) - matrix (0.4.2) mini_magick (4.12.0) mini_mime (1.1.5) - minitest (5.22.3) + minitest (5.23.1) mobility (1.3.0.rc3) i18n (>= 0.6.10, < 2) request_store (~> 1.0) @@ -176,17 +163,17 @@ GEM net-smtp (0.5.0) net-protocol nio4r (2.7.3) - nokogiri (1.16.4-aarch64-linux) + nokogiri (1.16.5-aarch64-linux) racc (~> 1.4) - nokogiri (1.16.4-arm-linux) + nokogiri (1.16.5-arm-linux) racc (~> 1.4) - nokogiri (1.16.4-arm64-darwin) + nokogiri (1.16.5-arm64-darwin) racc (~> 1.4) - nokogiri (1.16.4-x86-linux) + nokogiri (1.16.5-x86-linux) racc (~> 1.4) - nokogiri (1.16.4-x86_64-darwin) + nokogiri (1.16.5-x86_64-darwin) racc (~> 1.4) - nokogiri (1.16.4-x86_64-linux) + nokogiri (1.16.5-x86_64-linux) racc (~> 1.4) pg (1.5.6) pg_search (2.3.6) @@ -200,7 +187,7 @@ GEM actionmailer (>= 3) net-smtp premailer (~> 1.7, >= 1.7.9) - propshaft (0.8.0) + propshaft (0.9.0) actionpack (>= 7.0.0) activesupport (>= 7.0.0) rack @@ -210,7 +197,7 @@ GEM public_suffix (5.0.5) puma (6.4.2) nio4r (~> 2.0) - racc (1.7.3) + racc (1.8.0) rack (3.0.11) rack-session (2.0.0) rack (>= 3.0.0) @@ -219,20 +206,20 @@ GEM rackup (2.1.0) rack (>= 3) webrick (~> 1.8) - rails (7.1.3.2) - actioncable (= 7.1.3.2) - actionmailbox (= 7.1.3.2) - actionmailer (= 7.1.3.2) - actionpack (= 7.1.3.2) - actiontext (= 7.1.3.2) - actionview (= 7.1.3.2) - activejob (= 7.1.3.2) - activemodel (= 7.1.3.2) - activerecord (= 7.1.3.2) - activestorage (= 7.1.3.2) - activesupport (= 7.1.3.2) + rails (7.1.3.3) + actioncable (= 7.1.3.3) + actionmailbox (= 7.1.3.3) + actionmailer (= 7.1.3.3) + actionpack (= 7.1.3.3) + actiontext (= 7.1.3.3) + actionview (= 7.1.3.3) + activejob (= 7.1.3.3) + activemodel (= 7.1.3.3) + activerecord (= 7.1.3.3) + activestorage (= 7.1.3.3) + activesupport (= 7.1.3.3) bundler (>= 1.15.0) - railties (= 7.1.3.2) + railties (= 7.1.3.3) rails-dom-testing (2.2.0) activesupport (>= 5.0.0) minitest @@ -240,35 +227,27 @@ GEM rails-html-sanitizer (1.6.0) loofah (~> 2.21) nokogiri (~> 1.14) - railties (7.1.3.2) - actionpack (= 7.1.3.2) - activesupport (= 7.1.3.2) + railties (7.1.3.3) + actionpack (= 7.1.3.3) + activesupport (= 7.1.3.3) irb rackup (>= 1.0.0) rake (>= 12.2) thor (~> 1.0, >= 1.2.2) zeitwerk (~> 2.6) rake (13.2.1) - rdoc (6.6.3.1) + rdoc (6.7.0) psych (>= 4.0.0) redis (5.2.0) redis-client (>= 0.22.0) - redis-client (0.22.1) + redis-client (0.22.2) connection_pool - regexp_parser (2.9.1) - reline (0.5.6) + reline (0.5.8) io-console (~> 0.5) request_store (1.7.0) rack (>= 1.4) - rexml (3.2.6) ruby-vips (2.2.1) ffi (~> 1.12) - rubyzip (2.3.2) - selenium-webdriver (4.20.1) - base64 (~> 0.2) - rexml (~> 3.2, >= 3.2.5) - rubyzip (>= 1.2.2, < 3.0) - websocket (~> 1.0) sidekiq (7.2.4) concurrent-ruby (< 2) connection_pool (>= 2.3.0) @@ -291,13 +270,10 @@ GEM bindex (>= 0.4.0) railties (>= 6.0.0) webrick (1.8.1) - websocket (1.2.10) websocket-driver (0.7.6) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) - xpath (3.2.0) - nokogiri (~> 1.8) - zeitwerk (2.6.13) + zeitwerk (2.6.15) PLATFORMS aarch64-linux @@ -312,9 +288,7 @@ DEPENDENCIES ancestry bcrypt (~> 3.1.7) bootsnap - capybara date_validator - debug dkim dotenv-rails image_processing (~> 1.2) @@ -329,7 +303,6 @@ DEPENDENCIES puma (>= 5.0) rails (~> 7.1.3, >= 7.1.3.2) redis (>= 4.0.1) - selenium-webdriver sidekiq stimulus-rails turbo-rails @@ -339,4 +312,4 @@ RUBY VERSION ruby 3.3.0p0 BUNDLED WITH - 2.5.9 + 2.5.10 diff --git a/app/assets/images/ikea-foundation-logo.svg b/app/assets/images/ikea-foundation-logo.svg new file mode 100644 index 0000000..8b660a0 --- /dev/null +++ b/app/assets/images/ikea-foundation-logo.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index 7cad32c..b4b04bc 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -113,7 +113,7 @@ header { margin: 1rem; & svg { - width: 59px; + width: 70px; height: auto; } @@ -173,7 +173,7 @@ main { .msg__container { max-width: 440px; - margin: 60px auto 40px auto; + margin: 40px auto 40px auto; container-type: inline-size; container-name: startbar; } @@ -352,13 +352,22 @@ input[type=range] { } .link__container { - max-width: 900px; + max-width: 800px; margin-left: auto; margin-right: auto; container-type: inline-size; container-name: link; } + +.link__branding { + + & svg { + width: 70px; + height: auto; + } +} + ul.card__stack { max-width: 270px; aspect-ratio: 0.72972972972973; @@ -447,9 +456,6 @@ ul.card__stack { } - - - .link__body, .link__learn-more { font-size: var(--fs-base); line-height: 1.4; @@ -457,7 +463,7 @@ ul.card__stack { .link__learn-more { font-weight: 700; - margin-bottom: 20px; + margin-top: 20px; border-top: 1px solid var(--clr-black); border-bottom: 1px solid var(--clr-black); @@ -554,7 +560,7 @@ ul.card__stack { margin-bottom: 40px; & img { - aspect-ratio: 0.725; + aspect-ratio: 0.615101289134438; } } @@ -571,12 +577,12 @@ ul.card__stack { grid-row: 1 / span 2; } - .link__body { + .link__body-container { grid-column: 1; grid-row: 1; } - .link__learn-more { + .link__branding { grid-column: 1; grid-row: 2; } @@ -585,6 +591,10 @@ ul.card__stack { @media (min-width: 815px) { header { margin: 4rem 4rem 2rem 4rem; + + & svg { + width: 80px; + } } .icon__container img:nth-child(4) { diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index ec07c92..78d9a22 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -16,7 +16,7 @@