1.7.0 release

.github/workflows/test.yml

@@ -7,205 +7,11 @@ on:
   pull_request:
     branches:
       - '1.x'
-
-env:
-  LOCALGOV_DRUPAL_PROJECT: localgovdrupal/localgov_base
-  LOCALGOV_DRUPAL_PROJECT_PATH: web/themes/contrib/localgov_base
+  workflow_dispatch:
 
 jobs:
-
-  build:
-    name: Install LocalGov Drupal
-    runs-on: ubuntu-latest
-
-    strategy:
-      fail-fast: false
-      matrix:
-        localgov-version:
-          - '3.x'
-        drupal-version:
-          - '~10.0'
-        php-version:
-          - '8.1'
-          - '8.2'
-
-    steps:
-
-      - name: Save git branch and git repo names to env if this is not a pull request
-        if: github.event_name != 'pull_request'
-        run: |
-          echo "GIT_BASE=${GITHUB_REF#refs/heads/}" >> $GITHUB_ENV
-          echo "GIT_BRANCH=${GITHUB_REF#refs/heads/}" >> $GITHUB_ENV
-          echo "HEAD_USER=localgovdrupal" >> $GITHUB_ENV
-
-      - name: Save git branch and git repo names to env if this is a pull request
-        if: github.event_name == 'pull_request'
-        run: |
-          echo "GIT_BASE=${GITHUB_BASE_REF}" >> $GITHUB_ENV
-          echo "GIT_BRANCH=${GITHUB_HEAD_REF}" >> $GITHUB_ENV
-          export HEAD="${{ github.event.pull_request.head.label }}"
-          echo "HEAD_USER=${HEAD%%:*}" >> $GITHUB_ENV
-
-      - name: Set composer branch reference for version branches
-        if: endsWith(github.ref, '.x')
-        run: echo "COMPOSER_REF=${GIT_BRANCH}-dev" >> $GITHUB_ENV
-
-      - name: Set composer branch reference for non-version branches
-        if: endsWith(github.ref, '.x') == false
-        run: echo "COMPOSER_REF=dev-${GIT_BRANCH}" >> $GITHUB_ENV
-
-      - name: Get the latest tagged release for branch version
-        run: |
-          LATEST_RELEASE=$(curl -H "Accept: application/vnd.github.v3+json" https://api.github.com/repos/${GITHUB_REPOSITORY}/git/matching-refs/tags/${GIT_BASE%'.x'} | grep -Po '(?<=refs/tags/)[^"]+' | tail -1)
-          if [ -z $LATEST_RELEASE ]; then LATEST_RELEASE=1; fi
-          echo "LATEST_RELEASE=${LATEST_RELEASE}" >> $GITHUB_ENV
-
-      - name: Cached workspace
-        uses: actions/cache@v2
-        with:
-          path: ./html
-          key: localgov-build-${{ matrix.localgov-version }}-${{ matrix.drupal-version }}-${{ matrix.php-version }}-${{ github.run_id }}-${{ secrets.CACHE_VERSION }}
-
-      - name: Setup PHP
-        uses: shivammathur/setup-php@v2
-        with:
-          php-version: ${{ matrix.php-version }}
-
-      - name: Clone drupal_container
-        uses: actions/checkout@v2
-        with:
-          repository: localgovdrupal/drupal-container
-          ref: php${{ matrix.php-version }}
-
-      - name: Create LocalGov Drupal project
-        run: |
-          composer create-project --stability dev --no-install localgovdrupal/localgov-project ./html "${{ matrix.localgov-version }}"
-          composer --working-dir=./html require --no-install localgovdrupal/localgov:${{ matrix.localgov-version }}-dev
-          composer --working-dir=./html require --no-install drupal/core-recommended:${{ matrix.drupal-version }} drupal/core-composer-scaffold:${{ matrix.drupal-version }} drupal/core-project-message:${{ matrix.drupal-version }} drupal/core-dev:${{ matrix.drupal-version }}
-          composer --working-dir=./html install
-
-      - name: Obtain the test target using Composer
-        if: env.HEAD_USER == 'localgovdrupal'
-        run: |
-          composer --working-dir=html config repositories.1 vcs git@github.com:${LOCALGOV_DRUPAL_PROJECT}.git
-          composer global config github-oauth.github.com ${{ github.token }}
-          composer --working-dir=./html require --with-all-dependencies ${LOCALGOV_DRUPAL_PROJECT}:"${COMPOSER_REF} as ${LATEST_RELEASE}"
-
-      - name: Obtain the test target using Git
-        if: env.HEAD_USER != 'localgovdrupal'
-        uses: actions/checkout@v2
-        with:
-          path: ${{ env.LOCALGOV_DRUPAL_PROJECT_PATH }}
-
-  phpcs:
-    name: Coding standards checks
-    needs: build
-    runs-on: ubuntu-latest
-
-    strategy:
-      fail-fast: false
-      matrix:
-        localgov-version:
-          - '3.x'
-        drupal-version:
-          - '~10.0'
-        php-version:
-          - '8.1'
-          - '8.2'
-
-    steps:
-
-      - name: Cached workspace
-        uses: actions/cache@v2
-        with:
-          path: ./html
-          key: localgov-build-${{ matrix.localgov-version }}-${{ matrix.drupal-version }}-${{ matrix.php-version }}-${{ github.run_id }}-${{ secrets.CACHE_VERSION }}
-          restore-keys: |
-            localgov-build-${{ matrix.localgov-version }}-${{ matrix.drupal-version }}-${{ matrix.php-version }}-
-
-      - name: Setup PHP
-        uses: shivammathur/setup-php@v2
-        with:
-          php-version: ${{ matrix.php-version }}
-
-      - name: Run coding standards checks
-        run: |
-          cd html
-          ./bin/phpcs -p ${LOCALGOV_DRUPAL_PROJECT_PATH}
-
-  phpstan:
-    name: Deprecated code checks
-    needs: build
-    runs-on: ubuntu-latest
-
-    strategy:
-      fail-fast: false
-      matrix:
-        localgov-version:
-          - '3.x'
-        drupal-version:
-          - '~10.0'
-        php-version:
-          - '8.1'
-          - '8.2'
-
-    steps:
-
-      - name: Cached workspace
-        uses: actions/cache@v2
-        with:
-          path: ./html
-          key: localgov-build-${{ matrix.localgov-version }}-${{ matrix.drupal-version }}-${{ matrix.php-version }}-${{ github.run_id }}-${{ secrets.CACHE_VERSION }}
-          restore-keys: |
-            localgov-build-${{ matrix.localgov-version }}-${{ matrix.drupal-version }}-${{ matrix.php-version }}-
-
-      - name: Setup PHP
-        uses: shivammathur/setup-php@v2
-        with:
-          php-version: ${{ matrix.php-version }}
-
-      - name: Run deprecated code checks
-        run: |
-          cd html
-          ./bin/phpstan analyse -c ./phpstan.neon ${LOCALGOV_DRUPAL_PROJECT_PATH}
-  phpunit:
-    name: PHPUnit tests
-    needs: build
-    runs-on: ubuntu-latest
-
-    strategy:
-      fail-fast: false
-      matrix:
-        localgov-version:
-          - '3.x'
-        drupal-version:
-          - '~10.0'
-        php-version:
-          - '8.1'
-          - '8.2'
-
-    steps:
-
-      - name: Clone Drupal container
-        uses: actions/checkout@v2
-        with:
-          repository: localgovdrupal/drupal-container
-          ref: php${{ matrix.php-version }}
-
-      - name: Cached workspace
-        uses: actions/cache@v2
-        with:
-          path: ./html
-          key: localgov-build-${{ matrix.localgov-version }}-${{ matrix.drupal-version }}-${{ matrix.php-version }}-${{ github.run_id }}-${{ secrets.CACHE_VERSION }}
-          restore-keys: |
-            localgov-build-${{ matrix.localgov-version }}-${{ matrix.drupal-version }}-${{ matrix.php-version }}-
-
-      - name: Start Docker environment
-        run: docker-compose -f docker-compose.yml up -d
-
-      - name: Run PHPUnit tests
-        run: |
-          mkdir -p ./html/web/sites/simpletest && chmod 777 ./html/web/sites/simpletest
-          sed -i "s#http://localgov.lndo.site#http://drupal#" ./html/phpunit.xml.dist
-          docker exec -t drupal bash -c 'chown docker:docker -R /var/www/html'
-          docker exec -u docker -t drupal bash -c "cd /var/www/html && ./bin/paratest --processes=4 /var/www/html/${{ env.LOCALGOV_DRUPAL_PROJECT_PATH }}"
+  tests:
+    uses: localgovdrupal/localgov_shared_workflows/.github/workflows/test-module.yml@1.x
+    with:
+      project: 'localgovdrupal/localgov_base'
+      project_path: 'web/themes/contrib/localgov_base'

config/install/localgov_base.settings.yml

@@ -2,3 +2,4 @@ localgov_base_remove_css: FALSE
 localgov_base_remove_js: FALSE
 localgov_base_add_unpublished_background_colour: TRUE
 localgov_base_add_draft_note_to_unpublished_content: FALSE
+localgov_base_header_behaviour: 'default'

config/schema/localgov_base.schema.yml

@@ -14,3 +14,12 @@ localgov_base.settings:
     localgov_base_add_draft_note_to_unpublished_content:
       type: boolean
       label: 'Add "[Draft]" to title of unpublished content.'
+    localgov_base_header_behaviour:
+      type: enum
+      label: 'Header behaviour'
+      description: 'Choose whether the header should be sticky or not.'
+      default: 'default'
+      options:
+        'default': 'Default - scrolls away with the page'
+        'sticky': 'Sticky - remains at the top of the page'
+        'appears_on_scroll': 'Scroll - appears when scrolling up'

css/base/base.css

@@ -16,6 +16,10 @@ html {
   margin-top: 0; /* Removing top margin, for better vertical rhythm layout */
 }
 
+dialog {
+  margin: auto;
+}
+
 body {
   margin: 0;
   color: var(--color-text);
@@ -158,6 +162,13 @@ ol ul {
   margin-bottom: 0;
 }
 
+blockquote:not(.pull-out-quote__content) {
+  padding-inline-start: var(--quote-padding);
+  padding-left: var(--quote-padding-left);
+  border-inline-start: var(--quote-border);
+  border-color: var(--color-accent);
+}
+
 sub,
 sup {
   position: relative;

css/base/ckeditor5.css

@@ -52,7 +52,7 @@
   position: relative;
   top: 7px;
   margin-left: 0.5rem;
-  content: "\203A";
+  content: "\203A" / "";
   font-size: 2.875rem;
 }
 

css/base/variables.css

@@ -141,6 +141,9 @@ body {
 
   /* Animation */
   --transition-time: 0.3s;
+
+  /* Dialog */
+  --dialog-backdrop-color: rgba(0, 0, 0, 0.8);
 }
 
 /*
@@ -540,4 +543,8 @@ body {
   --add-to-calendar-dialog-backdrop-opacity: 0.75;
   --add-to-calendar--icon-color: var(--color-white);
   --add-to-calendar--icon-color-hover: var(--color-accent);
+
+  /* Accordion */
+  --accordion-icon-closed: "+";
+  --accordion-icon-opened: "-";
 }

css/components/accordion.css

@@ -0,0 +1,33 @@
+/**
+ * @file
+ * Style rules for accordions.
+ */
+
+/* Default */
+.accordion-pane__title button {
+  display: inline-flex;
+  align-items: center;
+  justify-content: space-between;
+}
+
+.accordion-pane__title button:hover,
+.accordion-pane__title button:focus {
+  text-decoration: none;
+}
+
+.accordion-icon {
+  display: block;
+}
+
+span.accordion-icon::after {
+  display: block;
+  font-size: 150%;
+}
+
+.accordion-pane__title button[aria-expanded="false"] > .accordion-icon::after {
+  content: var(--accordion-icon-closed);
+}
+
+.accordion-pane__title button[aria-expanded="true"] > .accordion-icon::after {
+  content: var(--accordion-icon-opened);
+}

css/components/alert-banner.css

@@ -8,6 +8,14 @@
   background-color: var(--alert-banner-bg-color);
 }
 
+dialog.localgov-alert-banner {
+  margin: auto;
+}
+
+dialog.localgov-alert-banner::backdrop {
+  background-color: var(--dialog-backdrop-color);
+}
+
 .localgov-alert-banner,
 .localgov-alert-banner a {
   color: var(--alert-banner-color);

css/components/back-to-top.css

@@ -0,0 +1,41 @@
+.back-to-top {
+  background: var(--button-link-bg-color);
+  border: 3px solid var(--color-white);
+  bottom: 2em;
+  color: var(--button-link-color);
+  display: flex;
+  font-weight: bold;
+  gap: var(--spacing-small);
+  padding: var(--button-link-padding);
+  position: fixed;
+  right: 2em;
+  text-decoration: none;
+  transition: var(--transition-time);
+  opacity: 1;
+}
+
+.back-to-top[hidden] {
+  opacity: 0;
+}
+
+.back-to-top:hover,
+.back-to-top:focus {
+  text-decoration: underline;
+}
+
+.back-to-top__icon svg path {
+  fill: currentcolor;
+}
+
+.back-to-top-target {
+  max-height: 1px;
+  max-width: 1px;
+  overflow: hidden;
+}
+
+@media screen and (min-width: 48rem) {
+  .back-to-top {
+    bottom: 5em;
+    right: 5em;
+  }
+}

css/components/header.css

@@ -104,7 +104,7 @@
 .lgd-header__toggle-icon::after {
   display: inline-block;
   margin-left: var(--spacing-smaller);
-  content: "\203A";
+  content: "\203A" / "";
   transition: var(--transition-time);
   transform: rotate(90deg);
   font-size: var(--font-size-larger);

css/components/pager.css

@@ -14,3 +14,7 @@
 .pager__item::marker {
   color: transparent;
 }
+
+.pager__item > a {
+  padding-inline: var(--spacing-smaller);
+}

css/components/quote.css

@@ -5,7 +5,7 @@
   padding: var(--quote-padding);
   padding-left: var(--quote-padding-left);
   border-color: var(--quote-border-color);
-  border-left: var(--quote-border);
+  border-inline-start: var(--quote-border);
   background-color: var(--quote-bg-color);
 }