diff --git a/assets-src/styles/sass/00-settings/_colors.scss b/assets-src/styles/sass/00-settings/_colors.scss index 9990bb64..55b839d7 100644 --- a/assets-src/styles/sass/00-settings/_colors.scss +++ b/assets-src/styles/sass/00-settings/_colors.scss @@ -24,7 +24,7 @@ $teal: #39cccc; $aqua: #7fdbff; $blue: #0073d8; $navy: #001f3f; -$purple: #920ba6; +$purple: #75336c; $fuchsia: #f012be; $grey: #aaa; $mercury-grey: #e5e5e5; @@ -38,21 +38,17 @@ $red: #e93737; $light-red: #ec7070; $coral: #fc7750; $light-coral: #fea78d; -$deep-yellow: #f9c818; $yellow: #f9dc4a; $deep-green: #0a4343; $teal-green: #237978; $aqua: #1bc0d7; $light-blue: #cbe0fb; -$sky-blue: #6bc8fe; -$azure: #0075ff; $w3c-blue: #005a9c; -$blue: #005797; -$deep-blue: #024488; +$deep-blue: #002a56; $pink: #ddb0c8; $light-pink: #eeccdc; $storm-gray: #545454; -$twiki-gray: #bdbdbd; +$twiki-gray: #cac9c9; $mist-gray: #f8f8fb; @@ -63,12 +59,12 @@ $border-color: $twiki-gray; $input-border-color: $storm-gray; $focus-color: $yellow; -$link-color: $blue; +$link-color: $w3c-blue; $link-color--visited: $purple; $link-color--hover: $deep-blue; $success-color: #046704; -$info-color: $w3c-blue; +$info-color: $deep-blue; $warning-color: #c28605; $error-color: #a82615; diff --git a/assets-src/styles/sass/50-core-components/_cards.scss b/assets-src/styles/sass/50-core-components/_cards.scss index 3a957789..5c6a1245 100644 --- a/assets-src/styles/sass/50-core-components/_cards.scss +++ b/assets-src/styles/sass/50-core-components/_cards.scss @@ -39,7 +39,7 @@ } &.talk { - border-color: $deep-yellow; + border-color: $deep-blue; } &.workshop { diff --git a/assets-src/styles/sass/50-core-components/_evangelists.scss b/assets-src/styles/sass/50-core-components/_evangelists.scss index dc6c5019..e44744ae 100644 --- a/assets-src/styles/sass/50-core-components/_evangelists.scss +++ b/assets-src/styles/sass/50-core-components/_evangelists.scss @@ -30,7 +30,7 @@ } .component--evangelists__list { - background-color: $w3c-blue; + background-color: $deep-blue; border-radius: rem(6); color: $white; overflow: hidden; diff --git a/assets-src/styles/sass/50-core-components/_logo.scss b/assets-src/styles/sass/50-core-components/_logo.scss index 0808cbcd..c0a4a921 100755 --- a/assets-src/styles/sass/50-core-components/_logo.scss +++ b/assets-src/styles/sass/50-core-components/_logo.scss @@ -3,15 +3,9 @@ \*------------------------------------*/ .logo { - display: block; - height: rem(44); - position: relative; - width: rem(66); - - @include mq($bp-tab-large) { - height: rem(52); - width: rem(78); - } + display: block; + position: relative; + width: clamp(3.75rem, 2.51rem + 6.198vw, 7.5rem); } .logo--member { diff --git a/assets-src/styles/sass/50-core-components/_navigation.scss b/assets-src/styles/sass/50-core-components/_navigation.scss index d138a9f8..5a01cf7f 100644 --- a/assets-src/styles/sass/50-core-components/_navigation.scss +++ b/assets-src/styles/sass/50-core-components/_navigation.scss @@ -7,24 +7,18 @@ } #global-nav { - border-bottom: solid 1px $border-color; display: block; - padding-bottom: rem(18); - padding-top: rem(18); - - @include mq($max-width) { - padding-bottom: 0; - padding-top: rem(20); - } + padding-bottom: em(26); + padding-top: em(26); } .global-nav__inner { align-items: center; display: flex; flex-wrap: wrap; + gap: em(48); @include mq($max-width) { - align-items: flex-end; flex-wrap: nowrap; position: relative; } @@ -108,13 +102,11 @@ li.top-nav-item + li.top-nav-item { } @include mq($max-width) { - margin-inline-end: rem(25); - padding-bottom: rem(5); position: relative; - + &::before { background-color: $w3c-blue; - bottom: 0; + bottom: rem(-3); content:''; display: none; height: rem(3); diff --git a/assets-src/styles/sass/50-core-components/_quotes.scss b/assets-src/styles/sass/50-core-components/_quotes.scss index 295a5a37..72034084 100644 --- a/assets-src/styles/sass/50-core-components/_quotes.scss +++ b/assets-src/styles/sass/50-core-components/_quotes.scss @@ -4,7 +4,7 @@ .component--quote { @include txt-saturn; - color: $w3c-blue; + color: $purple; font-weight: bold; margin-inline-end: 0; margin-inline-start: rem(10); @@ -12,7 +12,7 @@ position: relative; &::before { - background-color: $w3c-blue; + background-color: $purple; border-radius: rem(5); left: rem(-10); width: rem(10); diff --git a/assets-src/styles/sass/50-core-components/_slide.scss b/assets-src/styles/sass/50-core-components/_slide.scss index a83e7f7c..83d7a627 100644 --- a/assets-src/styles/sass/50-core-components/_slide.scss +++ b/assets-src/styles/sass/50-core-components/_slide.scss @@ -40,7 +40,7 @@ } &::before { - background-color: $w3c-blue; + background-color: $purple; border-radius: rem(5); content: ''; height: 100%; diff --git a/assets-src/styles/sass/50-core-components/_toc.scss b/assets-src/styles/sass/50-core-components/_toc.scss index 9be5eb22..e49c7175 100644 --- a/assets-src/styles/sass/50-core-components/_toc.scss +++ b/assets-src/styles/sass/50-core-components/_toc.scss @@ -17,7 +17,7 @@ // Only apply the border to the top level list .toc > ul { - border-inline-start: solid 3px $deep-yellow; + border-inline-start: solid 3px $w3c-blue; } .toc ul { diff --git a/assets-src/styles/sass/50-core-components/_you-may-also-like.scss b/assets-src/styles/sass/50-core-components/_you-may-also-like.scss index 5fe27cf2..c44eb674 100644 --- a/assets-src/styles/sass/50-core-components/_you-may-also-like.scss +++ b/assets-src/styles/sass/50-core-components/_you-may-also-like.scss @@ -3,7 +3,7 @@ \*------------------------------------*/ .crosslinks { - background-color: $w3c-blue; + background-color: $deep-blue; color: $white; padding-bottom: rem(50); padding-top: rem(50); diff --git a/assets-src/styles/sass/80-templates/_event.scss b/assets-src/styles/sass/80-templates/_event.scss index 4cc112cb..14c11333 100644 --- a/assets-src/styles/sass/80-templates/_event.scss +++ b/assets-src/styles/sass/80-templates/_event.scss @@ -32,7 +32,7 @@ } &.talk::before { - background-color: $deep-yellow; + background-color: $deep-blue; } &.workshop::before { diff --git a/composer.lock b/composer.lock index bd77854e..c79709e6 100644 --- a/composer.lock +++ b/composer.lock @@ -813,12 +813,12 @@ }, "type": "library", "extra": { + "thanks": { + "url": "https://github.com/symfony/contracts", + "name": "symfony/contracts" + }, "branch-alias": { "dev-main": "3.5-dev" - }, - "thanks": { - "name": "symfony/contracts", - "url": "https://github.com/symfony/contracts" } }, "autoload": { @@ -1043,12 +1043,12 @@ }, "type": "library", "extra": { + "thanks": { + "url": "https://github.com/symfony/contracts", + "name": "symfony/contracts" + }, "branch-alias": { "dev-main": "3.5-dev" - }, - "thanks": { - "name": "symfony/contracts", - "url": "https://github.com/symfony/contracts" } }, "autoload": { @@ -1266,12 +1266,12 @@ }, "type": "library", "extra": { + "thanks": { + "url": "https://github.com/symfony/contracts", + "name": "symfony/contracts" + }, "branch-alias": { "dev-main": "3.5-dev" - }, - "thanks": { - "name": "symfony/contracts", - "url": "https://github.com/symfony/contracts" } }, "autoload": { @@ -1391,16 +1391,16 @@ }, { "name": "symfony/finder", - "version": "v7.2.0", + "version": "v7.2.2", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", - "reference": "6de263e5868b9a137602dd1e33e4d48bfae99c49" + "reference": "87a71856f2f56e4100373e92529eed3171695cfb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/6de263e5868b9a137602dd1e33e4d48bfae99c49", - "reference": "6de263e5868b9a137602dd1e33e4d48bfae99c49", + "url": "https://api.github.com/repos/symfony/finder/zipball/87a71856f2f56e4100373e92529eed3171695cfb", + "reference": "87a71856f2f56e4100373e92529eed3171695cfb", "shasum": "" }, "require": { @@ -1435,7 +1435,7 @@ "description": "Finds files and directories via an intuitive fluent interface", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/finder/tree/v7.2.0" + "source": "https://github.com/symfony/finder/tree/v7.2.2" }, "funding": [ { @@ -1451,7 +1451,7 @@ "type": "tidelift" } ], - "time": "2024-10-23T06:56:12+00:00" + "time": "2024-12-30T19:00:17+00:00" }, { "name": "symfony/form", @@ -1552,16 +1552,16 @@ }, { "name": "symfony/framework-bundle", - "version": "v6.4.13", + "version": "v6.4.17", "source": { "type": "git", "url": "https://github.com/symfony/framework-bundle.git", - "reference": "e8b0bd921f9bd35ea4d1508067c3f3f6e2036418" + "reference": "17d8ae2e7aa77154f942e8ac48849ac718b0963f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/framework-bundle/zipball/e8b0bd921f9bd35ea4d1508067c3f3f6e2036418", - "reference": "e8b0bd921f9bd35ea4d1508067c3f3f6e2036418", + "url": "https://api.github.com/repos/symfony/framework-bundle/zipball/17d8ae2e7aa77154f942e8ac48849ac718b0963f", + "reference": "17d8ae2e7aa77154f942e8ac48849ac718b0963f", "shasum": "" }, "require": { @@ -1681,7 +1681,7 @@ "description": "Provides a tight integration between Symfony components and the Symfony full-stack framework", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/framework-bundle/tree/v6.4.13" + "source": "https://github.com/symfony/framework-bundle/tree/v6.4.17" }, "funding": [ { @@ -1697,20 +1697,20 @@ "type": "tidelift" } ], - "time": "2024-10-25T15:07:50+00:00" + "time": "2024-12-19T14:08:41+00:00" }, { "name": "symfony/http-foundation", - "version": "v7.2.0", + "version": "v7.2.2", "source": { "type": "git", "url": "https://github.com/symfony/http-foundation.git", - "reference": "e88a66c3997859532bc2ddd6dd8f35aba2711744" + "reference": "62d1a43796ca3fea3f83a8470dfe63a4af3bc588" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-foundation/zipball/e88a66c3997859532bc2ddd6dd8f35aba2711744", - "reference": "e88a66c3997859532bc2ddd6dd8f35aba2711744", + "url": "https://api.github.com/repos/symfony/http-foundation/zipball/62d1a43796ca3fea3f83a8470dfe63a4af3bc588", + "reference": "62d1a43796ca3fea3f83a8470dfe63a4af3bc588", "shasum": "" }, "require": { @@ -1759,7 +1759,7 @@ "description": "Defines an object-oriented layer for the HTTP specification", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/http-foundation/tree/v7.2.0" + "source": "https://github.com/symfony/http-foundation/tree/v7.2.2" }, "funding": [ { @@ -1775,20 +1775,20 @@ "type": "tidelift" } ], - "time": "2024-11-13T18:58:46+00:00" + "time": "2024-12-30T19:00:17+00:00" }, { "name": "symfony/http-kernel", - "version": "v6.4.16", + "version": "v6.4.17", "source": { "type": "git", "url": "https://github.com/symfony/http-kernel.git", - "reference": "8838b5b21d807923b893ccbfc2cbeda0f1bc00f0" + "reference": "c5647393c5ce11833d13e4b70fff4b571d4ac710" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-kernel/zipball/8838b5b21d807923b893ccbfc2cbeda0f1bc00f0", - "reference": "8838b5b21d807923b893ccbfc2cbeda0f1bc00f0", + "url": "https://api.github.com/repos/symfony/http-kernel/zipball/c5647393c5ce11833d13e4b70fff4b571d4ac710", + "reference": "c5647393c5ce11833d13e4b70fff4b571d4ac710", "shasum": "" }, "require": { @@ -1873,7 +1873,7 @@ "description": "Provides a structured process for converting a Request into a Response", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/http-kernel/tree/v6.4.16" + "source": "https://github.com/symfony/http-kernel/tree/v6.4.17" }, "funding": [ { @@ -1889,7 +1889,7 @@ "type": "tidelift" } ], - "time": "2024-11-27T12:49:36+00:00" + "time": "2024-12-31T14:49:31+00:00" }, { "name": "symfony/intl", @@ -2753,22 +2753,22 @@ }, { "name": "symfony/property-info", - "version": "v7.2.1", + "version": "v7.2.2", "source": { "type": "git", "url": "https://github.com/symfony/property-info.git", - "reference": "65fb9be15380f949d72ff405473cce733364b8b4" + "reference": "1dfeb0dac7a99f7b3be42db9ccc299c5a6483fcf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/property-info/zipball/65fb9be15380f949d72ff405473cce733364b8b4", - "reference": "65fb9be15380f949d72ff405473cce733364b8b4", + "url": "https://api.github.com/repos/symfony/property-info/zipball/1dfeb0dac7a99f7b3be42db9ccc299c5a6483fcf", + "reference": "1dfeb0dac7a99f7b3be42db9ccc299c5a6483fcf", "shasum": "" }, "require": { "php": ">=8.2", "symfony/string": "^6.4|^7.0", - "symfony/type-info": "^7.1" + "symfony/type-info": "~7.1.9|^7.2.2" }, "conflict": { "phpdocumentor/reflection-docblock": "<5.2", @@ -2816,7 +2816,7 @@ "validator" ], "support": { - "source": "https://github.com/symfony/property-info/tree/v7.2.1" + "source": "https://github.com/symfony/property-info/tree/v7.2.2" }, "funding": [ { @@ -2832,7 +2832,7 @@ "type": "tidelift" } ], - "time": "2024-12-07T08:50:44+00:00" + "time": "2024-12-31T11:04:50+00:00" }, { "name": "symfony/routing", @@ -2939,12 +2939,12 @@ }, "type": "library", "extra": { + "thanks": { + "url": "https://github.com/symfony/contracts", + "name": "symfony/contracts" + }, "branch-alias": { "dev-main": "3.5-dev" - }, - "thanks": { - "name": "symfony/contracts", - "url": "https://github.com/symfony/contracts" } }, "autoload": { @@ -3103,12 +3103,12 @@ }, "type": "library", "extra": { + "thanks": { + "url": "https://github.com/symfony/contracts", + "name": "symfony/contracts" + }, "branch-alias": { "dev-main": "3.5-dev" - }, - "thanks": { - "name": "symfony/contracts", - "url": "https://github.com/symfony/contracts" } }, "autoload": { @@ -3164,16 +3164,16 @@ }, { "name": "symfony/twig-bridge", - "version": "v6.4.16", + "version": "v6.4.17", "source": { "type": "git", "url": "https://github.com/symfony/twig-bridge.git", - "reference": "32ec012ed4f6426441a66014471bdb26674744be" + "reference": "238e1aac992b5231c66faf10131ace7bdba97065" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/twig-bridge/zipball/32ec012ed4f6426441a66014471bdb26674744be", - "reference": "32ec012ed4f6426441a66014471bdb26674744be", + "url": "https://api.github.com/repos/symfony/twig-bridge/zipball/238e1aac992b5231c66faf10131ace7bdba97065", + "reference": "238e1aac992b5231c66faf10131ace7bdba97065", "shasum": "" }, "require": { @@ -3253,7 +3253,7 @@ "description": "Provides integration for Twig with various Symfony components", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/twig-bridge/tree/v6.4.16" + "source": "https://github.com/symfony/twig-bridge/tree/v6.4.17" }, "funding": [ { @@ -3269,20 +3269,20 @@ "type": "tidelift" } ], - "time": "2024-11-25T11:59:11+00:00" + "time": "2024-12-19T14:08:41+00:00" }, { "name": "symfony/type-info", - "version": "v7.2.1", + "version": "v7.2.2", "source": { "type": "git", "url": "https://github.com/symfony/type-info.git", - "reference": "4f402070b08ad0b87e9cadbb07b87fb36061e6e4" + "reference": "3b5a17470fff0034f25fd4287cbdaa0010d2f749" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/type-info/zipball/4f402070b08ad0b87e9cadbb07b87fb36061e6e4", - "reference": "4f402070b08ad0b87e9cadbb07b87fb36061e6e4", + "url": "https://api.github.com/repos/symfony/type-info/zipball/3b5a17470fff0034f25fd4287cbdaa0010d2f749", + "reference": "3b5a17470fff0034f25fd4287cbdaa0010d2f749", "shasum": "" }, "require": { @@ -3328,7 +3328,7 @@ "type" ], "support": { - "source": "https://github.com/symfony/type-info/tree/v7.2.1" + "source": "https://github.com/symfony/type-info/tree/v7.2.2" }, "funding": [ { @@ -3344,7 +3344,7 @@ "type": "tidelift" } ], - "time": "2024-12-11T07:49:41+00:00" + "time": "2024-12-20T13:38:37+00:00" }, { "name": "symfony/var-dumper", @@ -3509,7 +3509,7 @@ }, { "name": "twig/intl-extra", - "version": "v3.17.0", + "version": "v3.18.0", "source": { "type": "git", "url": "https://github.com/twigphp/intl-extra.git", @@ -3557,7 +3557,7 @@ "twig" ], "support": { - "source": "https://github.com/twigphp/intl-extra/tree/v3.17.0" + "source": "https://github.com/twigphp/intl-extra/tree/v3.18.0" }, "funding": [ { @@ -3573,16 +3573,16 @@ }, { "name": "twig/twig", - "version": "v3.17.1", + "version": "v3.18.0", "source": { "type": "git", "url": "https://github.com/twigphp/Twig.git", - "reference": "677ef8da6497a03048192aeeb5aa3018e379ac71" + "reference": "acffa88cc2b40dbe42eaf3a5025d6c0d4600cc50" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/twigphp/Twig/zipball/677ef8da6497a03048192aeeb5aa3018e379ac71", - "reference": "677ef8da6497a03048192aeeb5aa3018e379ac71", + "url": "https://api.github.com/repos/twigphp/Twig/zipball/acffa88cc2b40dbe42eaf3a5025d6c0d4600cc50", + "reference": "acffa88cc2b40dbe42eaf3a5025d6c0d4600cc50", "shasum": "" }, "require": { @@ -3637,7 +3637,7 @@ ], "support": { "issues": "https://github.com/twigphp/Twig/issues", - "source": "https://github.com/twigphp/Twig/tree/v3.17.1" + "source": "https://github.com/twigphp/Twig/tree/v3.18.0" }, "funding": [ { @@ -3649,7 +3649,7 @@ "type": "tidelift" } ], - "time": "2024-12-12T09:58:10+00:00" + "time": "2024-12-29T10:51:50+00:00" } ], "packages-dev": [ @@ -3967,16 +3967,16 @@ }, { "name": "league/commonmark", - "version": "2.6.0", + "version": "2.6.1", "source": { "type": "git", "url": "https://github.com/thephpleague/commonmark.git", - "reference": "d150f911e0079e90ae3c106734c93137c184f932" + "reference": "d990688c91cedfb69753ffc2512727ec646df2ad" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/d150f911e0079e90ae3c106734c93137c184f932", - "reference": "d150f911e0079e90ae3c106734c93137c184f932", + "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/d990688c91cedfb69753ffc2512727ec646df2ad", + "reference": "d990688c91cedfb69753ffc2512727ec646df2ad", "shasum": "" }, "require": { @@ -4070,7 +4070,7 @@ "type": "tidelift" } ], - "time": "2024-12-07T15:34:16+00:00" + "time": "2024-12-29T14:10:59+00:00" }, { "name": "league/config", @@ -4513,16 +4513,16 @@ }, { "name": "phpstan/phpstan", - "version": "1.12.13", + "version": "1.12.15", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan.git", - "reference": "9b469068840cfa031e1deaf2fa1886d00e20680f" + "reference": "c91d4e8bc056f46cf653656e6f71004b254574d1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan/zipball/9b469068840cfa031e1deaf2fa1886d00e20680f", - "reference": "9b469068840cfa031e1deaf2fa1886d00e20680f", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/c91d4e8bc056f46cf653656e6f71004b254574d1", + "reference": "c91d4e8bc056f46cf653656e6f71004b254574d1", "shasum": "" }, "require": { @@ -4567,7 +4567,7 @@ "type": "github" } ], - "time": "2024-12-17T17:00:20+00:00" + "time": "2025-01-05T16:40:22+00:00" }, { "name": "rector/rector", diff --git a/design-system-templates/components/header-nav.html.twig b/design-system-templates/components/header-nav.html.twig index 8ab4c167..214ea5f2 100644 --- a/design-system-templates/components/header-nav.html.twig +++ b/design-system-templates/components/header-nav.html.twig @@ -19,7 +19,7 @@
Visit the W3C homepage diff --git a/design-system-templates/components/header-new-logo.html.twig b/design-system-templates/components/header-new-logo.html.twig new file mode 100644 index 00000000..6a7b8366 --- /dev/null +++ b/design-system-templates/components/header-new-logo.html.twig @@ -0,0 +1,271 @@ +
+ + +
diff --git a/design-system-templates/components/header.html.twig b/design-system-templates/components/header.html.twig index f02eb811..239f29ca 100644 --- a/design-system-templates/components/header.html.twig +++ b/design-system-templates/components/header.html.twig @@ -19,7 +19,7 @@
W3C homepage diff --git a/design-system-templates/example-pages/new-logo-page.html.twig b/design-system-templates/example-pages/new-logo-page.html.twig new file mode 100644 index 00000000..a3584a2b --- /dev/null +++ b/design-system-templates/example-pages/new-logo-page.html.twig @@ -0,0 +1,92 @@ +{% extends 'base.html.twig' %} + +{% block title %}Landing with new logo template{% endblock %} +{% block meta_description %}Landing page template from the W3C design system{% endblock %} + +{% block body_class %}class="landing"{% endblock %} + +{% block breadcrumbs %} + {% include 'components/breadcrumbs.html.twig' %} +{% endblock %} + +{% block header %} + {% include 'components/header-new-logo.html.twig' %} +{% endblock %} + +{% block content %} + + {% include 'components/hero-landing.html.twig' %} + +
+

Section heading for these teasers

+

Lorem ipsum dolor sit amet, consectetuer adipiscing elit.

+ +
+ +
+

Section heading for these teasers

+

Lorem ipsum dolor sit amet, consectetuer adipiscing elit.

+ +
+ + {% include 'components/fifty-fifty.html.twig' %} + + {% include 'components/fifty-fifty-reversed.html.twig' %} + + {% include 'components/text.html.twig' %} + + {% include 'components/image.html.twig' %} + + {% include 'components/video.html.twig' %} + + {% include 'components/quote.html.twig' %} + +{% endblock %} + +{% block crosslinks %} + {% include 'components/crosslinks.html.twig' %} +{% endblock %} + +{% block scripts %} +{% endblock %} \ No newline at end of file diff --git a/docs/components/navigation-v1.md b/docs/components/navigation-v1.md new file mode 100644 index 00000000..a924cbbb --- /dev/null +++ b/docs/components/navigation-v1.md @@ -0,0 +1,13 @@ +# Navigation with new logo + +The following example shows how the global navigation sits within the [header component](header.md). + + + +## Considerations + +Note the use of the inline style `display: none;` on the button element with the data attribute `data-trigger="mobile-nav"`. This data attribute is targeted by the JavaScript for the global navigation. In the absence of JavaScript, which is required for the off-canvas mobile navigation, the button remains hidden to users. + +The inline style `display: none;` is also used on instances of `.nav__submenu`. As the sub-navigation requires JavaScript for the drop-down effect, this keeps it hidden if JavaScript is not available. It also prevents the sub-menus from flashing from visible to hidden when an uncached page first loads. + +If a top level navigation item will have child links, indicated by the `.has-children` class on the `
  • `, JavaScript replaces the link with a button for toggling the display of the sub-navigation. \ No newline at end of file diff --git a/docs/settings/colours.json b/docs/settings/colours.json index a21752a8..b67d5338 100644 --- a/docs/settings/colours.json +++ b/docs/settings/colours.json @@ -13,9 +13,9 @@ "title": "Links", "colors": [ { - "color": "#005797", + "color": "#005a9c", "variable": "$link-color", - "alt-variable": "$blue", + "alt-variable": "$w3c-blue", "notes": "Link default color" }, { @@ -25,7 +25,7 @@ "notes": "Link hover color" }, { - "color": "#920ba6", + "color": "#75336c", "variable": "$link-color--visited", "alt-variable": "$purple", "notes": "Link visited color" @@ -62,9 +62,9 @@ "title": "Notifications", "colors": [ { - "color": "#005a9c", + "color": "#002a56", "variable": "$info-color", - "alt-variable": "$w3c-blue", + "alt-variable": "$deep-blue", "notes": "Border color for 'info' messages" }, { @@ -103,10 +103,6 @@ "color": "#fea78d", "variable": "$light-coral" }, - { - "color": "#f9c818", - "variable": "$deep-yellow" - }, { "color": "#f9dc4a", "variable": "$yellow" @@ -127,29 +123,17 @@ "color": "#cbe0fb", "variable": "$light-blue" }, - { - "color": "#6bc8fe", - "variable": "$sky-blue" - }, - { - "color": "#0075ff", - "variable": "$azure" - }, { "color": "#005a9c", "variable": "$w3c-blue", "notes": "Main brand color" }, { - "color": "#005797", - "variable": "$blue" - }, - { - "color": "#024488", + "color": "#002a56", "variable": "$deep-blue" }, { - "color": "#920ba6", + "color": "#75336c", "variable": "$purple" }, { @@ -173,7 +157,7 @@ "variable": "$storm-gray" }, { - "color": "#bdbdbd", + "color": "#cac9c9", "variable": "$twiki-gray" }, { @@ -190,4 +174,4 @@ } ] } -] \ No newline at end of file +] diff --git a/docs/templates/landing-new-logo-v1.md b/docs/templates/landing-new-logo-v1.md new file mode 100644 index 00000000..f372a356 --- /dev/null +++ b/docs/templates/landing-new-logo-v1.md @@ -0,0 +1,3 @@ +# Landing page with new logo + + diff --git a/templates/_common-head.html.twig b/templates/_common-head.html.twig index d741ec1a..d51f3aac 100644 --- a/templates/_common-head.html.twig +++ b/templates/_common-head.html.twig @@ -5,7 +5,7 @@ - + {{ 'header.logo_link'|trans({}, 'w3c_website_templates_bundle') }} diff --git a/templates/pages/basic.html.twig b/templates/pages/basic.html.twig index fa5ae08b..1b096470 100644 --- a/templates/pages/basic.html.twig +++ b/templates/pages/basic.html.twig @@ -7,7 +7,7 @@
    {{ 'header.logo_link'|trans({}, 'w3c_website_templates_bundle') }} diff --git a/w3c.json b/w3c.json index f2338b44..561ef019 100644 --- a/w3c.json +++ b/w3c.json @@ -1,5 +1,5 @@ { - "group": [106] + "group": [122803] , "contacts": ["vivienlacourba"] -, "repo-type": "project" +, "repo-type": "tool" }