From 9c4a4af921a0ae00501b1b552ca58ed527dca091 Mon Sep 17 00:00:00 2001 From: Dan Chadwick Date: Sat, 17 Aug 2024 14:32:37 -0400 Subject: [PATCH] Updates. --- composer.json | 1 + composer.lock | 123 +++++++++++++++++- web/themes/custom/dchadwick/css/style.css | 28 ++-- .../src/sass/partials/recent-fights.scss | 2 +- .../dchadwick/templates/system/page.html.twig | 6 +- 5 files changed, 143 insertions(+), 17 deletions(-) diff --git a/composer.json b/composer.json index 47d5f6e..e4e9d05 100644 --- a/composer.json +++ b/composer.json @@ -25,6 +25,7 @@ "drupal/core-recommended": "^10.2", "drupal/devel_entity_updates": "^4.1", "drupal/field_group": "^3.4", + "drupal/gin": "^3.0@RC", "drupal/google_tag": "^2.0", "drupal/jsonapi_permission_access": "1.0.1", "drupal/layout_builder_styles": "^2.0", diff --git a/composer.lock b/composer.lock index cc7e0ba..88c3abf 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "f6050eda3b19724d4a51c9e596553fec", + "content-hash": "54a0447fd219727c24bcd1da34fde1d6", "packages": [ { "name": "asm89/stack-cors", @@ -2294,6 +2294,127 @@ "issues": "https://www.drupal.org/project/issues/field_group" } }, + { + "name": "drupal/gin", + "version": "3.0.0-rc13", + "source": { + "type": "git", + "url": "https://git.drupalcode.org/project/gin.git", + "reference": "8.x-3.0-rc13" + }, + "dist": { + "type": "zip", + "url": "https://ftp.drupal.org/files/projects/gin-8.x-3.0-rc13.zip", + "reference": "8.x-3.0-rc13", + "shasum": "7b8e9d7ae6fe6de7de0bba930200fe80b437eefe" + }, + "require": { + "drupal/core": "^9 || ^10 || ^11", + "drupal/gin_toolbar": "^1.0@beta" + }, + "type": "drupal-theme", + "extra": { + "drupal": { + "version": "8.x-3.0-rc13", + "datestamp": "1720416342", + "security-coverage": { + "status": "not-covered", + "message": "RC releases are not covered by Drupal security advisories." + } + } + }, + "notification-url": "https://packages.drupal.org/8/downloads", + "scripts": { + "phpcs": [ + "phpcs -s --runtime-set ignore_warnings_on_exit 1 --runtime-set ignore_errors_on_exit 0 'web/modules/custom'" + ] + }, + "license": [ + "GPL-2.0-or-later" + ], + "authors": [ + { + "name": "Sascha Eggenberger (saschaeggi)", + "homepage": "https://www.drupal.org/u/saschaeggi", + "role": "Maintainer" + } + ], + "description": "For a better Admin and Content Editor Experience.", + "homepage": "https://www.drupal.org/project/gin", + "support": { + "source": "https://git.drupalcode.org/project/gin", + "issues": "https://www.drupal.org/project/issues/gin" + }, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/saschaeggi" + }, + { + "type": "other", + "url": "https://paypal.me/saschaeggi" + } + ] + }, + { + "name": "drupal/gin_toolbar", + "version": "1.0.0-rc6", + "source": { + "type": "git", + "url": "https://git.drupalcode.org/project/gin_toolbar.git", + "reference": "8.x-1.0-rc6" + }, + "dist": { + "type": "zip", + "url": "https://ftp.drupal.org/files/projects/gin_toolbar-8.x-1.0-rc6.zip", + "reference": "8.x-1.0-rc6", + "shasum": "542def14b9a5435efb4e021d384fa3f7b0fc6e78" + }, + "require": { + "drupal/core": "^9 || ^10 || ^11" + }, + "type": "drupal-module", + "extra": { + "drupal": { + "version": "8.x-1.0-rc6", + "datestamp": "1718368950", + "security-coverage": { + "status": "not-covered", + "message": "RC releases are not covered by Drupal security advisories." + } + } + }, + "notification-url": "https://packages.drupal.org/8/downloads", + "license": [ + "GPL-2.0+" + ], + "authors": [ + { + "name": "Sascha Eggenberger (saschaeggi)", + "homepage": "https://www.drupal.org/u/saschaeggi", + "role": "Maintainer" + } + ], + "description": "Gin Toolbar for Frontend use", + "homepage": "https://www.drupal.org/project/gin_toolbar", + "keywords": [ + "Drupal" + ], + "support": { + "source": "http://cgit.drupalcode.org/gin_toolbar", + "issues": "https://www.drupal.org/project/issues/gin_toolbar" + }, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/saschaeggi" + }, + { + "type": "other", + "url": "https://paypal.me/saschaeggi" + } + ] + }, { "name": "drupal/google_tag", "version": "2.0.4", diff --git a/web/themes/custom/dchadwick/css/style.css b/web/themes/custom/dchadwick/css/style.css index 37ffcb8..4c44d2d 100644 --- a/web/themes/custom/dchadwick/css/style.css +++ b/web/themes/custom/dchadwick/css/style.css @@ -243,7 +243,7 @@ table.cols-5 td.incorrect { justify-content: space-evenly; } -#block-dchadwick-recentfightsblock h2 { +#block-dchadwick-recentfightsblock h2, .block-recent-fights-block h2 { text-transform: uppercase; font-size: 2.4rem; text-align: center; @@ -251,49 +251,53 @@ table.cols-5 td.incorrect { margin: 50px 0; } @media screen and (min-width: 1024px) { - #block-dchadwick-recentfightsblock .card { + #block-dchadwick-recentfightsblock .card, .block-recent-fights-block .card { flex: 1 0 21%; } } -#block-dchadwick-recentfightsblock .fightcard-img { +#block-dchadwick-recentfightsblock .fightcard-img, .block-recent-fights-block .fightcard-img { height: 60px; border-radius: 50%; } -#block-dchadwick-recentfightsblock .card-header { +#block-dchadwick-recentfightsblock .card-header, .block-recent-fights-block .card-header { display: flex; justify-content: space-evenly; align-items: center; flex-flow: wrap; } -#block-dchadwick-recentfightsblock .card-body { +#block-dchadwick-recentfightsblock .card-body, .block-recent-fights-block .card-body { text-align: center; } -#block-dchadwick-recentfightsblock .card-body h4 { +#block-dchadwick-recentfightsblock .card-body h4, .block-recent-fights-block .card-body h4 { font-size: 1.2rem; } @media screen and (max-width: 767px) { - #block-dchadwick-recentfightsblock .card-body h4 { + #block-dchadwick-recentfightsblock .card-body h4, .block-recent-fights-block .card-body h4 { font-size: 0.8rem; } } -#block-dchadwick-recentfightsblock .card-footer { +#block-dchadwick-recentfightsblock .card-footer, .block-recent-fights-block .card-footer { display: flex; } -#block-dchadwick-recentfightsblock .card-footer button { +#block-dchadwick-recentfightsblock .card-footer button, .block-recent-fights-block .card-footer button { background: #fffaf3; border: 1px solid #6e6a86; flex-grow: 1; } -#block-dchadwick-recentfightsblock .card-footer button:hover { +#block-dchadwick-recentfightsblock .card-footer button:hover, .block-recent-fights-block .card-footer button:hover { background: #191724; } -#block-dchadwick-recentfightsblock .card-footer button:hover a { +#block-dchadwick-recentfightsblock .card-footer button:hover a, .block-recent-fights-block .card-footer button:hover a { color: #f6c177; } -#block-dchadwick-recentfightsblock .card-footer button a { +#block-dchadwick-recentfightsblock .card-footer button a, .block-recent-fights-block .card-footer button a { color: #6e6a86; } +html { + font-size: 100%; +} + body { background: #faf4ed; color: #6e6a86; diff --git a/web/themes/custom/dchadwick/src/sass/partials/recent-fights.scss b/web/themes/custom/dchadwick/src/sass/partials/recent-fights.scss index 1e4074f..9b81bd9 100644 --- a/web/themes/custom/dchadwick/src/sass/partials/recent-fights.scss +++ b/web/themes/custom/dchadwick/src/sass/partials/recent-fights.scss @@ -7,7 +7,7 @@ } -#block-dchadwick-recentfightsblock { +#block-dchadwick-recentfightsblock, .block-recent-fights-block { h2 { text-transform: uppercase; diff --git a/web/themes/custom/dchadwick/templates/system/page.html.twig b/web/themes/custom/dchadwick/templates/system/page.html.twig index 7e0897c..bc1a623 100644 --- a/web/themes/custom/dchadwick/templates/system/page.html.twig +++ b/web/themes/custom/dchadwick/templates/system/page.html.twig @@ -15,9 +15,9 @@