diff --git a/assets/css/app.css b/assets/css/app.css index 1295828..e866f18 100644 --- a/assets/css/app.css +++ b/assets/css/app.css @@ -1,7 +1,6 @@ @tailwind components; -.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..d88207f --- /dev/null +++ b/assets/css/components/button.css @@ -0,0 +1,11 @@ +.tw-button { + @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 { + @apply bg-green-600 text-white !important + } +} 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/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/_includes/update-text.html.twig b/source/_includes/update-text.html.twig new file mode 100644 index 0000000..6ded570 --- /dev/null +++ b/source/_includes/update-text.html.twig @@ -0,0 +1,3 @@ +
+ {{ page.update_text }} +
diff --git a/source/index.html.twig b/source/index.html.twig index def4eb4..a935741 100644 --- a/source/index.html.twig +++ b/source/index.html.twig @@ -1,25 +1,15 @@ --- -twitter_url: https://twitter.com/drupalcampbris +papercall: + url: https://www.papercall.io/drupalcamp-bristol-2019 +twitter: + url: https://twitter.com/drupalcampbris +update_text: Session submissions are now open! --- - - - - - - - {{ site.title }} - - - - - + {% include 'meta' %} -

+ Submit a session + + + + Follow us +
-
- Thanks to all previous speakers, sponsors and attendees. See you in 2019! -
+ {% if page.update_text %} + {% include 'update-text' %} + {% endif %} {% include 'footer' %}
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'], 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==