Skip to content

Commit

Permalink
Merge branch 'main' into optional-right-columns
Browse files Browse the repository at this point in the history
  • Loading branch information
richardTowers authored Oct 18, 2024
2 parents cab6479 + b076720 commit 6def00f
Show file tree
Hide file tree
Showing 58 changed files with 1,655 additions and 188 deletions.
2 changes: 1 addition & 1 deletion .nycrc
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"all": true,
"branches": 95,
"branches": 90,
"lines": 95,
"check-coverage": true,
"compact": false,
Expand Down
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
source "https://rubygems.org"
ruby "~> 3.2.0"

gem "rails", "7.2.1"
gem "rails", "7.2.1.1"

gem "addressable"
gem "bootsnap", require: false
Expand Down
125 changes: 64 additions & 61 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,29 +1,29 @@
GEM
remote: https://rubygems.org/
specs:
actioncable (7.2.1)
actionpack (= 7.2.1)
activesupport (= 7.2.1)
actioncable (7.2.1.1)
actionpack (= 7.2.1.1)
activesupport (= 7.2.1.1)
nio4r (~> 2.0)
websocket-driver (>= 0.6.1)
zeitwerk (~> 2.6)
actionmailbox (7.2.1)
actionpack (= 7.2.1)
activejob (= 7.2.1)
activerecord (= 7.2.1)
activestorage (= 7.2.1)
activesupport (= 7.2.1)
actionmailbox (7.2.1.1)
actionpack (= 7.2.1.1)
activejob (= 7.2.1.1)
activerecord (= 7.2.1.1)
activestorage (= 7.2.1.1)
activesupport (= 7.2.1.1)
mail (>= 2.8.0)
actionmailer (7.2.1)
actionpack (= 7.2.1)
actionview (= 7.2.1)
activejob (= 7.2.1)
activesupport (= 7.2.1)
actionmailer (7.2.1.1)
actionpack (= 7.2.1.1)
actionview (= 7.2.1.1)
activejob (= 7.2.1.1)
activesupport (= 7.2.1.1)
mail (>= 2.8.0)
rails-dom-testing (~> 2.2)
actionpack (7.2.1)
actionview (= 7.2.1)
activesupport (= 7.2.1)
actionpack (7.2.1.1)
actionview (= 7.2.1.1)
activesupport (= 7.2.1.1)
nokogiri (>= 1.8.5)
racc
rack (>= 2.2.4, < 3.2)
Expand All @@ -32,35 +32,35 @@ GEM
rails-dom-testing (~> 2.2)
rails-html-sanitizer (~> 1.6)
useragent (~> 0.16)
actiontext (7.2.1)
actionpack (= 7.2.1)
activerecord (= 7.2.1)
activestorage (= 7.2.1)
activesupport (= 7.2.1)
actiontext (7.2.1.1)
actionpack (= 7.2.1.1)
activerecord (= 7.2.1.1)
activestorage (= 7.2.1.1)
activesupport (= 7.2.1.1)
globalid (>= 0.6.0)
nokogiri (>= 1.8.5)
actionview (7.2.1)
activesupport (= 7.2.1)
actionview (7.2.1.1)
activesupport (= 7.2.1.1)
builder (~> 3.1)
erubi (~> 1.11)
rails-dom-testing (~> 2.2)
rails-html-sanitizer (~> 1.6)
activejob (7.2.1)
activesupport (= 7.2.1)
activejob (7.2.1.1)
activesupport (= 7.2.1.1)
globalid (>= 0.3.6)
activemodel (7.2.1)
activesupport (= 7.2.1)
activerecord (7.2.1)
activemodel (= 7.2.1)
activesupport (= 7.2.1)
activemodel (7.2.1.1)
activesupport (= 7.2.1.1)
activerecord (7.2.1.1)
activemodel (= 7.2.1.1)
activesupport (= 7.2.1.1)
timeout (>= 0.4.0)
activestorage (7.2.1)
actionpack (= 7.2.1)
activejob (= 7.2.1)
activerecord (= 7.2.1)
activesupport (= 7.2.1)
activestorage (7.2.1.1)
actionpack (= 7.2.1.1)
activejob (= 7.2.1.1)
activerecord (= 7.2.1.1)
activesupport (= 7.2.1.1)
marcel (~> 1.0)
activesupport (7.2.1)
activesupport (7.2.1.1)
base64
bigdecimal
concurrent-ruby (~> 1.0, >= 1.3.1)
Expand Down Expand Up @@ -98,6 +98,7 @@ GEM
rack-test (>= 0.6.3)
regexp_parser (>= 1.5, < 3.0)
xpath (~> 3.2)
chartkick (5.1.1)
climate_control (1.2.0)
coderay (1.1.3)
concurrent-ruby (1.3.4)
Expand Down Expand Up @@ -130,7 +131,7 @@ GEM
i18n (>= 1.8.11, < 2)
ffi (1.16.3)
find_a_port (1.0.1)
gds-api-adapters (96.0.3)
gds-api-adapters (97.0.0)
addressable
link_header
null_logger
Expand Down Expand Up @@ -160,7 +161,8 @@ GEM
govuk_personalisation (1.0.0)
plek (>= 1.9.0)
rails (>= 6, < 8)
govuk_publishing_components (44.1.0)
govuk_publishing_components (44.4.1)
chartkick
govuk_app_config
govuk_personalisation (>= 0.7.0)
kramdown
Expand Down Expand Up @@ -231,16 +233,17 @@ GEM
marcel (1.0.4)
matrix (0.4.2)
method_source (1.0.0)
mime-types (3.5.2)
mime-types (3.6.0)
logger
mime-types-data (~> 3.2015)
mime-types-data (3.2024.0903)
mime-types-data (3.2024.1001)
mini_mime (1.1.5)
mini_portile2 (2.8.7)
minitest (5.25.1)
msgpack (1.7.2)
multi_xml (0.7.1)
bigdecimal (~> 3.1)
net-imap (0.4.16)
net-imap (0.5.0)
date
net-protocol
net-pop (0.1.2)
Expand Down Expand Up @@ -505,7 +508,7 @@ GEM
puma (6.4.3)
nio4r (~> 2.0)
racc (1.8.1)
rack (3.1.7)
rack (3.1.8)
rack-proxy (0.7.7)
rack
rack-session (2.0.0)
Expand All @@ -515,20 +518,20 @@ GEM
rackup (2.1.0)
rack (>= 3)
webrick (~> 1.8)
rails (7.2.1)
actioncable (= 7.2.1)
actionmailbox (= 7.2.1)
actionmailer (= 7.2.1)
actionpack (= 7.2.1)
actiontext (= 7.2.1)
actionview (= 7.2.1)
activejob (= 7.2.1)
activemodel (= 7.2.1)
activerecord (= 7.2.1)
activestorage (= 7.2.1)
activesupport (= 7.2.1)
rails (7.2.1.1)
actioncable (= 7.2.1.1)
actionmailbox (= 7.2.1.1)
actionmailer (= 7.2.1.1)
actionpack (= 7.2.1.1)
actiontext (= 7.2.1.1)
actionview (= 7.2.1.1)
activejob (= 7.2.1.1)
activemodel (= 7.2.1.1)
activerecord (= 7.2.1.1)
activestorage (= 7.2.1.1)
activesupport (= 7.2.1.1)
bundler (>= 1.15.0)
railties (= 7.2.1)
railties (= 7.2.1.1)
rails-controller-testing (1.0.5)
actionpack (>= 5.0.1.rc1)
actionview (>= 5.0.1.rc1)
Expand All @@ -548,9 +551,9 @@ GEM
csv (~> 3.2)
i18n-tasks
rails-i18n
railties (7.2.1)
actionpack (= 7.2.1)
activesupport (= 7.2.1)
railties (7.2.1.1)
actionpack (= 7.2.1.1)
activesupport (= 7.2.1.1)
irb (~> 1.13)
rackup (>= 1.0.0)
rake (>= 12.2)
Expand Down Expand Up @@ -696,7 +699,7 @@ GEM
websocket-extensions (0.1.5)
xpath (3.2.0)
nokogiri (~> 1.8)
zeitwerk (2.6.18)
zeitwerk (2.7.0)

PLATFORMS
ruby
Expand Down Expand Up @@ -726,7 +729,7 @@ DEPENDENCIES
pact_broker-client
plek
pry-byebug
rails (= 7.2.1)
rails (= 7.2.1.1)
rails-controller-testing
rails-i18n
rails_translation_manager
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
26 changes: 26 additions & 0 deletions app/assets/javascripts/modules/app-b-main-navigation.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
window.GOVUK = window.GOVUK || {}
window.GOVUK.Modules = window.GOVUK.Modules || {};

(function (Modules) {
'use strict'

function AppBMainNavigation (module) {
this.module = module
this.module.button = this.module.querySelector('button')
this.module.nav = this.module.querySelector('#app-b-main-nav__nav')
this.module.nav.classList.add('app-b-main-nav__nav--hidden')
this.module.button.classList.remove('js-app-b-main-nav__button')
}

AppBMainNavigation.prototype.init = function () {
this.module.button.addEventListener('click', this.toggleMenu.bind(this))
}

AppBMainNavigation.prototype.toggleMenu = function (e) {
var ariaExpanded = this.module.button.getAttribute('aria-expanded') === 'true'
this.module.nav.classList.toggle('app-b-main-nav__nav--hidden')
this.module.button.setAttribute('aria-expanded', `${!ariaExpanded}`)
}

Modules.AppBMainNavigation = AppBMainNavigation
})(window.GOVUK.Modules)
3 changes: 1 addition & 2 deletions app/assets/stylesheets/components/_subscribe.scss
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,11 @@
}

.app-c-subscribe__link {
@include govuk-font($size: 19, $weight: bold);

display: block;
background: url("calendars/icon-calendar.png") no-repeat scroll 0 0;
min-height: 2.5em;
padding: 0 0 0 3em;
@include govuk-font($size: 19, $weight: bold);

@include govuk-device-pixel-ratio {
background-image: url("calendars/icon-calendar-2x.png");
Expand Down
2 changes: 1 addition & 1 deletion app/assets/stylesheets/views/_cookie-settings.scss
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
}

.cookie-settings__confirmation {
@include govuk-font(19);
display: none;
margin-top: govuk-spacing(3);
@include govuk-font(19);
}

.cookie-settings__gov-services {
Expand Down
13 changes: 7 additions & 6 deletions app/assets/stylesheets/views/_homepage.scss
Original file line number Diff line number Diff line change
Expand Up @@ -15,38 +15,38 @@
}

.homepage__ready-call-to-action {
@include govuk-font(19, $weight: bold);
margin-bottom: 0;
@include govuk-font(19, $weight: bold);
}

.home-services {
padding-top: govuk-spacing(5);
}

.home-services__heading {
@include govuk-font(19, $weight: bold);
margin: 0 0 govuk-spacing(1);
@include govuk-font(19, $weight: bold);
}

.home-services__para {
@include govuk-font(16);
margin: 0 0 govuk-spacing(3);
min-height: 40px;
@include govuk-font(16);
}

.home-info {
@include govuk-font(24);
margin: govuk-spacing(2) 0 govuk-spacing(4);
@include govuk-font(24);
}

.home-more__title {
@include govuk-font(36, $weight: bold);
margin: 0 0 govuk-spacing(4);
@include govuk-font(36, $weight: bold);
}

.home-more__subtitle {
@include govuk-font(24, $weight: bold);
margin: 0 0 govuk-spacing(2);
@include govuk-font(24, $weight: bold);
}

.home-more__list {
Expand Down Expand Up @@ -184,6 +184,7 @@

.homepage.global-bar-present .homepage-header {
@include govuk-responsive-padding(7, "top");

@media (min-width: 1281px) { // stylelint-disable-line media-feature-range-notation
padding-top: govuk-spacing(8);
}
Expand Down
24 changes: 24 additions & 0 deletions app/assets/stylesheets/views/_landing_page.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
@import "govuk_publishing_components/individual_component_support";

.landing-page-header {
// I've used the hex value for the background colour as it doesn't exist in the colour palette
background-color: #231F20;
}

.landing-page-header__blue-bar {
background-color: govuk-colour("blue");
height: govuk-spacing(2);
}

.landing-page-header__org {
padding-top: govuk-spacing(2);
padding-bottom: govuk-spacing(6);

// I've added this styling here rather than in the gem because it's application specific
// and it would introduce further work to make this variation work in the gem without
// affecting the other variants.
// TODO add this as a variant in the components gem.
.gem-c-organisation-logo__link:link:not(:hover) {
text-decoration: none;
}
}
Loading

0 comments on commit 6def00f

Please sign in to comment.