From 44fcbae02b594d9c41f5b77d7c76ac17cbec8914 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Wed, 20 Mar 2019 23:00:27 +0000 Subject: [PATCH 01/10] Remove old text --- source/index.html.twig | 4 ---- 1 file changed, 4 deletions(-) diff --git a/source/index.html.twig b/source/index.html.twig index def4eb4..7d80726 100644 --- a/source/index.html.twig +++ b/source/index.html.twig @@ -39,10 +39,6 @@ twitter_url: https://twitter.com/drupalcampbris
on June 28th 2019 at
The Station, Silver St, BS1 2AG.

-

Session submissions opening soon!

-

- Follow us on Twitter to get updates! -

From fa3bc889c1706d3f3f889cf5bac11cb55118a5f8 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Wed, 20 Mar 2019 23:18:22 +0000 Subject: [PATCH 02/10] Add postcss-nested --- package.json | 5 +++-- webpack.mix.js | 1 + yarn.lock | 10 +++++++++- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 768dc90..f8f2734 100644 --- a/package.json +++ b/package.json @@ -12,8 +12,9 @@ "laravel-mix": "^4.0.14" }, "dependencies": { + "postcss-nested": "^4.1.2", + "tailwindcss": "^1.0.0-beta.3", "tailwindcss-interaction-variants": "^1.0.0", - "tailwindcss-spaced-items": "^0.1.0", - "tailwindcss": "^1.0.0-beta.3" + "tailwindcss-spaced-items": "^0.1.0" } } diff --git a/webpack.mix.js b/webpack.mix.js index a10090d..3552b7f 100644 --- a/webpack.mix.js +++ b/webpack.mix.js @@ -3,4 +3,5 @@ let mix = require('laravel-mix') mix.disableNotifications() .postCss('assets/css/app.css', 'source/dist', [ require('tailwindcss')(), + require('postcss-nested')(), ]) diff --git a/yarn.lock b/yarn.lock index b6a01e9..ad8a1a2 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4804,6 +4804,14 @@ postcss-nested@^4.1.1: postcss "^7.0.6" postcss-selector-parser "^5.0.0-rc.4" +postcss-nested@^4.1.2: + version "4.1.2" + resolved "https://registry.yarnpkg.com/postcss-nested/-/postcss-nested-4.1.2.tgz#8e0570f736bfb4be5136e31901bf2380b819a561" + integrity sha512-9bQFr2TezohU3KRSu9f6sfecXmf/x6RXDedl8CHF6fyuyVW7UqgNMRdWMHZQWuFY6Xqs2NYk+Fj4Z4vSOf7PQg== + dependencies: + postcss "^7.0.14" + postcss-selector-parser "^5.0.0" + postcss-normalize-charset@^4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/postcss-normalize-charset/-/postcss-normalize-charset-4.0.1.tgz#8b35add3aee83a136b0471e0d59be58a50285dd4" @@ -4991,7 +4999,7 @@ postcss@^6.0.1, postcss@^6.0.23, postcss@^6.0.9: source-map "^0.6.1" supports-color "^5.4.0" -postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.11, postcss@^7.0.13, postcss@^7.0.5, postcss@^7.0.6, postcss@^7.0.7: +postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.11, postcss@^7.0.13, postcss@^7.0.14, postcss@^7.0.5, postcss@^7.0.6, postcss@^7.0.7: version "7.0.14" resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.14.tgz#4527ed6b1ca0d82c53ce5ec1a2041c2346bbd6e5" integrity sha512-NsbD6XUUMZvBxtQAJuWDJeeC4QFsmWsfozWxCJPWf3M55K9iu2iMDaKqyoOdTJ1R4usBXuxlVFAIo8rZPQD4Bg== From ec88f7a3a15823d3239cc39197797fdb1af69a61 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Wed, 20 Mar 2019 23:19:08 +0000 Subject: [PATCH 03/10] Add CTA buttons Add buttons to PaperCall (session submissions) and Twitter. --- assets/css/app.css | 9 +++++++++ source/index.html.twig | 15 ++++++++++++++- tailwind.config.js | 3 +++ 3 files changed, 26 insertions(+), 1 deletion(-) diff --git a/assets/css/app.css b/assets/css/app.css index 1295828..1153e7b 100644 --- a/assets/css/app.css +++ b/assets/css/app.css @@ -1,5 +1,14 @@ @tailwind components; +.tw-button { + @apply inline-block uppercase font-bold text-lg mx-2 py-3 px-5 text-white no-underline bg-black !important; + + &:hover, + &:focus { + @apply bg-green-600 text-white !important + } +} + .tw-bg-balloon { background-image: url(/themes/dcb2017/images/dcb-bg.jpg); } diff --git a/source/index.html.twig b/source/index.html.twig index 7d80726..d9b98df 100644 --- a/source/index.html.twig +++ b/source/index.html.twig @@ -1,5 +1,8 @@ --- -twitter_url: https://twitter.com/drupalcampbris +papercall: + url: ~ +twitter: + url: https://twitter.com/drupalcampbris --- @@ -40,6 +43,16 @@ twitter_url: https://twitter.com/drupalcampbris
The Station, Silver St, BS1 2AG.

+ +
+ + Submit a session + + + + Follow us for updates + +
diff --git a/tailwind.config.js b/tailwind.config.js index 0144f66..478be7b 100644 --- a/tailwind.config.js +++ b/tailwind.config.js @@ -7,6 +7,9 @@ module.exports = { extend: { colors: { black: '#000', + 'green-600': '#0fa877', + 'pink-600': '#ec16a8', + 'purple-600': '#b33ee9', }, variants: { textStyle: ['responsive', 'hover', 'focus', 'hocus'], From 11d3aedb37ac5f34b6188dc39c8ec0144b74bf03 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Wed, 20 Mar 2019 23:21:26 +0000 Subject: [PATCH 04/10] Move components into separate files --- assets/css/app.css | 14 ++------------ assets/css/components/balloon.css | 3 +++ assets/css/components/button.css | 8 ++++++++ 3 files changed, 13 insertions(+), 12 deletions(-) create mode 100644 assets/css/components/balloon.css create mode 100644 assets/css/components/button.css diff --git a/assets/css/app.css b/assets/css/app.css index 1153e7b..e866f18 100644 --- a/assets/css/app.css +++ b/assets/css/app.css @@ -1,16 +1,6 @@ @tailwind components; -.tw-button { - @apply inline-block uppercase font-bold text-lg mx-2 py-3 px-5 text-white no-underline bg-black !important; - - &:hover, - &:focus { - @apply bg-green-600 text-white !important - } -} - -.tw-bg-balloon { - background-image: url(/themes/dcb2017/images/dcb-bg.jpg); -} +@import 'components/balloon.css'; +@import 'components/button.css'; @tailwind utilities; diff --git a/assets/css/components/balloon.css b/assets/css/components/balloon.css new file mode 100644 index 0000000..c1cf789 --- /dev/null +++ b/assets/css/components/balloon.css @@ -0,0 +1,3 @@ +.tw-bg-balloon { + background-image: url(/themes/dcb2017/images/dcb-bg.jpg); +} diff --git a/assets/css/components/button.css b/assets/css/components/button.css new file mode 100644 index 0000000..4d8c39f --- /dev/null +++ b/assets/css/components/button.css @@ -0,0 +1,8 @@ +.tw-button { + @apply inline-block uppercase font-bold text-lg mx-2 py-3 px-5 text-white no-underline bg-black !important; + + &:hover, + &:focus { + @apply bg-green-600 text-white !important + } +} From 30c47ed695ec768c570636340f15a7d8e28b39b7 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Wed, 20 Mar 2019 23:24:40 +0000 Subject: [PATCH 05/10] Adjust spacing --- source/index.html.twig | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/source/index.html.twig b/source/index.html.twig index d9b98df..0d3b049 100644 --- a/source/index.html.twig +++ b/source/index.html.twig @@ -31,9 +31,9 @@ twitter: {% include 'banner' %}
-
-
-
+
+
+
Drupalcamp Bristol logo
From 617179f903a4ded90e54f9aaa59e8835a4f86d20 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Wed, 20 Mar 2019 23:31:12 +0000 Subject: [PATCH 06/10] Add papercall URL --- source/index.html.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/index.html.twig b/source/index.html.twig index 0d3b049..d887357 100644 --- a/source/index.html.twig +++ b/source/index.html.twig @@ -1,6 +1,6 @@ --- papercall: - url: ~ + url: https://www.papercall.io/drupalcamp-bristol-2019 twitter: url: https://twitter.com/drupalcampbris --- From 665ecc074616ee09d735ffc7b0ce6004cd830911 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Wed, 20 Mar 2019 23:31:20 +0000 Subject: [PATCH 07/10] Update button text --- source/index.html.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/index.html.twig b/source/index.html.twig index d887357..6efe6ed 100644 --- a/source/index.html.twig +++ b/source/index.html.twig @@ -50,7 +50,7 @@ twitter: - Follow us for updates + Follow us
From ab1bf8276a9ddde7e7eccb0e05f1db6a512cb915 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Wed, 20 Mar 2019 23:31:35 +0000 Subject: [PATCH 08/10] Adjust button styling --- assets/css/components/button.css | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/assets/css/components/button.css b/assets/css/components/button.css index 4d8c39f..d88207f 100644 --- a/assets/css/components/button.css +++ b/assets/css/components/button.css @@ -1,5 +1,8 @@ .tw-button { - @apply inline-block uppercase font-bold text-lg mx-2 py-3 px-5 text-white no-underline bg-black !important; + @apply block uppercase font-bold text-lg py-3 px-5 text-white no-underline bg-black !important; + @screen md { + @apply w-1/2 inline-flex items-center justify-center mx-2 !important + } &:hover, &:focus { From d48908d6714578016fa2fca5f7a7af50e2d1ccb5 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Wed, 20 Mar 2019 23:33:22 +0000 Subject: [PATCH 09/10] Move meta tags into a partial --- source/_includes/meta.html.twig | 14 ++++++++++++++ source/index.html.twig | 16 +--------------- 2 files changed, 15 insertions(+), 15 deletions(-) create mode 100644 source/_includes/meta.html.twig diff --git a/source/_includes/meta.html.twig b/source/_includes/meta.html.twig new file mode 100644 index 0000000..1fecaff --- /dev/null +++ b/source/_includes/meta.html.twig @@ -0,0 +1,14 @@ + + + + + + +{{ site.title }} + + + + + diff --git a/source/index.html.twig b/source/index.html.twig index 6efe6ed..d7eb062 100644 --- a/source/index.html.twig +++ b/source/index.html.twig @@ -7,22 +7,8 @@ twitter: - - - - - - - {{ site.title }} - - - - - + {% include 'meta' %} -