From cfdd818fa5d4c6d87ade0a1fa2381f022668ad5b Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Tue, 9 Apr 2019 14:08:53 +0100 Subject: [PATCH 1/7] Add example sponsorship page --- resources/css/app.css | 1 + resources/css/components/markup.css | 3 ++ source/_layouts/base.html.twig | 26 ++++++++++++ source/_layouts/front.html.twig | 3 ++ source/_layouts/page.html.twig | 11 +++++ source/index.html.twig | 66 ++++++++++------------------- source/sponsor-us.md | 9 ++++ 7 files changed, 75 insertions(+), 44 deletions(-) create mode 100644 resources/css/components/markup.css create mode 100644 source/_layouts/base.html.twig create mode 100644 source/_layouts/front.html.twig create mode 100644 source/_layouts/page.html.twig create mode 100644 source/sponsor-us.md diff --git a/resources/css/app.css b/resources/css/app.css index 0ce8bc7..bde2dd2 100644 --- a/resources/css/app.css +++ b/resources/css/app.css @@ -3,5 +3,6 @@ @import 'components/balloon.css'; @import 'components/button.css'; @import 'components/main.css'; +@import 'components/markup.css'; @tailwind utilities; diff --git a/resources/css/components/markup.css b/resources/css/components/markup.css new file mode 100644 index 0000000..a4015da --- /dev/null +++ b/resources/css/components/markup.css @@ -0,0 +1,3 @@ +.markup { + @apply leading-relaxed +} diff --git a/source/_layouts/base.html.twig b/source/_layouts/base.html.twig new file mode 100644 index 0000000..654c912 --- /dev/null +++ b/source/_layouts/base.html.twig @@ -0,0 +1,26 @@ + + + + {% include 'meta' %} + + + +
+ {% include 'banner' %} + + {% block content_wrapper %} + {% block content %}{% endblock %} + {% endblock %} + +
+ {% if page.update_text %} + {% include 'update-text' %} + {% endif %} + + {% include 'footer' %} +
+
+ + diff --git a/source/_layouts/front.html.twig b/source/_layouts/front.html.twig new file mode 100644 index 0000000..fdf8f67 --- /dev/null +++ b/source/_layouts/front.html.twig @@ -0,0 +1,3 @@ +{% extends 'base' %} + +{% block body_classes 'tw-h-full tw-flex tw-flex-col' %} diff --git a/source/_layouts/page.html.twig b/source/_layouts/page.html.twig new file mode 100644 index 0000000..13ca09e --- /dev/null +++ b/source/_layouts/page.html.twig @@ -0,0 +1,11 @@ +{% extends 'base' %} + +{% block content_wrapper %} +
+

{{ page.title }}

+ +
+ {% block content %}{% endblock %} +
+
+{% endblock %} diff --git a/source/index.html.twig b/source/index.html.twig index 6b3194a..0ea278a 100644 --- a/source/index.html.twig +++ b/source/index.html.twig @@ -1,56 +1,34 @@ --- +layout: front papercall: url: https://www.papercall.io/drupalcamp-bristol-2019 twitter: url: https://twitter.com/drupalcampbris update_text: Session submissions are now open! --- - - - - {% include 'meta' %} - - - -
- {% include 'banner' %} - -
-
-
-
- Drupalcamp Bristol logo -
-
-

- DrupalCamp Bristol is returning -
on June 28th 2019 at -
The Station, Silver St, BS1 2AG. -

-
- -
- - Submit a session - - - - Follow us - -
-
+
+
+
+
+ Drupalcamp Bristol logo +
+
+

+ DrupalCamp Bristol is returning +
on June 28th 2019 at +
The Station, Silver St, BS1 2AG. +

-
-
- {% if page.update_text %} - {% include 'update-text' %} - {% endif %} +
+ + Submit a session + - {% include 'footer' %} + + Follow us + +
- - +
diff --git a/source/sponsor-us.md b/source/sponsor-us.md new file mode 100644 index 0000000..5b910ee --- /dev/null +++ b/source/sponsor-us.md @@ -0,0 +1,9 @@ +--- +layout: page +title: Sponsor Us +--- +Lorem ipsum dolor sit amet, consectetur adipisicing elit. Illum cupiditate laborum culpa inventore incidunt rem omnis, odio earum, soluta adipisci sequi ipsum tempore sit quas officia repellat quam neque laboriosam. + +Lorem ipsum dolor sit amet, consectetur adipisicing elit. Illum cupiditate laborum culpa inventore incidunt rem omnis, odio earum, soluta adipisci sequi ipsum tempore sit quas officia repellat quam neque laboriosam. + +Lorem ipsum dolor sit amet, consectetur adipisicing elit. Illum cupiditate laborum culpa inventore incidunt rem omnis, odio earum, soluta adipisci sequi ipsum tempore sit quas officia repellat quam neque laboriosam. From c08aef7f61e78eeeb981261eb64d2c16d95cc71d Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Tue, 9 Apr 2019 14:46:58 +0100 Subject: [PATCH 2/7] Update header and footer links --- app/config/sculpin_site.yml | 3 +++ source/_includes/banner.html.twig | 5 ++--- source/_includes/footer.html.twig | 6 ++++++ 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/app/config/sculpin_site.yml b/app/config/sculpin_site.yml index 052bb6d..061fd92 100644 --- a/app/config/sculpin_site.yml +++ b/app/config/sculpin_site.yml @@ -1 +1,4 @@ title: DrupalCamp Bristol 2019 + +call_for_papers: + url: https://www.papercall.io/drupalcamp-bristol-2019 diff --git a/source/_includes/banner.html.twig b/source/_includes/banner.html.twig index 003b6d2..b4c55ba 100644 --- a/source/_includes/banner.html.twig +++ b/source/_includes/banner.html.twig @@ -9,9 +9,8 @@
diff --git a/source/_includes/footer.html.twig b/source/_includes/footer.html.twig index 2b9453f..2446a8d 100644 --- a/source/_includes/footer.html.twig +++ b/source/_includes/footer.html.twig @@ -1,6 +1,12 @@