From 544c5e9276d8742185fab3f95e8c44ff0be2608d Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Thu, 2 May 2019 21:19:49 +0100 Subject: [PATCH 1/4] Add tailwindcss-list-reset plugin --- package.json | 3 ++- tailwind.config.js | 1 + yarn.lock | 28 ++++++++++++++++++++++++++++ 3 files changed, 31 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index a0eac8b..c164b8f 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,8 @@ "browser-sync-webpack-plugin": "2.0.1", "cross-env": "^5.2.0", "laravel-mix": "^4.0.14", - "laravel-mix-purgecss": "^4.1.0" + "laravel-mix-purgecss": "^4.1.0", + "tailwindcss-list-reset": "^1.0.0" }, "dependencies": { "postcss-nested": "^4.1.2", diff --git a/tailwind.config.js b/tailwind.config.js index fa557ae..0869c10 100644 --- a/tailwind.config.js +++ b/tailwind.config.js @@ -20,6 +20,7 @@ module.exports = { }, plugins: [ require('tailwindcss-interaction-variants')(), + require('tailwindcss-list-reset')(), require('tailwindcss-spaced-items')({ values: defaultTheme.spacing }), ], } diff --git a/yarn.lock b/yarn.lock index 3fd6278..c979802 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6746,6 +6746,15 @@ tailwindcss-interaction-variants@^2.0.0-beta.1: dependencies: lodash "^4.17.11" +tailwindcss-list-reset@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/tailwindcss-list-reset/-/tailwindcss-list-reset-1.0.0.tgz#982da1bf826283a2ecd30d6e7c8207b3e5240e1f" + integrity sha512-TSoZNV+Yub0XxGI/NkqD3JIdc8+3CGEhwHC7gcnnPhOjFa80NDEjt8YL8dHm8L/m83Loj43Sscahl5MC039bRg== + dependencies: + lodash "^4.17.11" + postcss "^7.0.14" + tailwindcss "^1.0.0-beta.4" + tailwindcss-spaced-items@^0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/tailwindcss-spaced-items/-/tailwindcss-spaced-items-0.1.0.tgz#e7f381e5c780a034bcdbc38a6a2cfb31f828a020" @@ -6771,6 +6780,25 @@ tailwindcss@^1.0.0-beta.3: postcss-selector-parser "^6.0.0" pretty-hrtime "^1.0.3" +tailwindcss@^1.0.0-beta.4: + version "1.0.0-beta.8" + resolved "https://registry.yarnpkg.com/tailwindcss/-/tailwindcss-1.0.0-beta.8.tgz#62c04d4bb342933b45164735b0334119651cd733" + integrity sha512-rHS9yx2KzQPnfE++in2FcZ9yPt1KwdqENvMbmJzgWwidD4riNdTtGDKSk/3g7A8I2D7hMFvk6l6H3B52vOpqwQ== + dependencies: + autoprefixer "^9.4.5" + bytes "^3.0.0" + chalk "^2.4.1" + fs-extra "^7.0.1" + lodash "^4.17.11" + node-emoji "^1.8.1" + normalize.css "^8.0.1" + postcss "^7.0.11" + postcss-functions "^3.0.0" + postcss-js "^2.0.0" + postcss-nested "^4.1.1" + postcss-selector-parser "^6.0.0" + pretty-hrtime "^1.0.3" + tapable@^1.0.0, tapable@^1.1.0: version "1.1.1" resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.1.1.tgz#4d297923c5a72a42360de2ab52dadfaaec00018e" From 1dd7718a388a79d0202cb1cffda39163e382f63a Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Thu, 2 May 2019 21:21:36 +0100 Subject: [PATCH 2/4] Use utilities for menu and menu items --- source/_includes/banner.html.twig | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/source/_includes/banner.html.twig b/source/_includes/banner.html.twig index 7877d42..9e7f1fa 100644 --- a/source/_includes/banner.html.twig +++ b/source/_includes/banner.html.twig @@ -8,10 +8,10 @@ From cff777e05f9e7972458263aef10534f88c0a37e9 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Thu, 2 May 2019 21:26:01 +0100 Subject: [PATCH 3/4] Move main menu items into sculpin_site.yml --- app/config/sculpin_site.yml | 10 ++++++++++ source/_includes/banner.html.twig | 10 +++++++--- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/app/config/sculpin_site.yml b/app/config/sculpin_site.yml index 4b9d7b4..db2113a 100644 --- a/app/config/sculpin_site.yml +++ b/app/config/sculpin_site.yml @@ -5,3 +5,13 @@ eventbrite: papercall: url: https://www.papercall.io/drupalcamp-bristol-2019 + +main_menu: + - title: Tickets + url: '%eventbrite.url%' + + - title: Submit a session + url: '%papercall.url%' + + - title: Sponsor us + url: /sponsor-us diff --git a/source/_includes/banner.html.twig b/source/_includes/banner.html.twig index 9e7f1fa..b551b89 100644 --- a/source/_includes/banner.html.twig +++ b/source/_includes/banner.html.twig @@ -9,9 +9,13 @@ From 19243787de05ca79f44f3b2ed4cfe689ebe4023a Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Thu, 2 May 2019 21:39:12 +0100 Subject: [PATCH 4/4] Change text colour for active item --- app/config/sculpin_site.yml | 15 +++++++++------ source/_includes/banner.html.twig | 5 ++++- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/app/config/sculpin_site.yml b/app/config/sculpin_site.yml index db2113a..918ad6e 100644 --- a/app/config/sculpin_site.yml +++ b/app/config/sculpin_site.yml @@ -7,11 +7,14 @@ papercall: url: https://www.papercall.io/drupalcamp-bristol-2019 main_menu: - - title: Tickets - url: '%eventbrite.url%' + - title: Tickets + url: '%eventbrite.url%' + pattern: ~ - - title: Submit a session - url: '%papercall.url%' + - title: Submit a session + url: '%papercall.url%' + pattern: ~ - - title: Sponsor us - url: /sponsor-us + - title: Sponsor us + url: /sponsor-us + pattern: /^\/sponsor-us\/?/ diff --git a/source/_includes/banner.html.twig b/source/_includes/banner.html.twig index b551b89..d339930 100644 --- a/source/_includes/banner.html.twig +++ b/source/_includes/banner.html.twig @@ -11,7 +11,10 @@