diff --git a/assets/js/main.js b/assets/js/main.js index f7f3515b..6f58817a 100644 --- a/assets/js/main.js +++ b/assets/js/main.js @@ -1,4 +1,9 @@ (function ($) { - // Update the HTML classes. - $('html.no-js').removeClass('no-js').addClass('js'); + $('html.no-js').addClass('js').removeClass('no-js'); + + $('.nav-toggle').on('click', function (e) { + e.preventDefault(); + + $(this).siblings('.nav-right').toggleClass('is-active'); + }) })(jQuery); diff --git a/assets/sass/base/_layout.sass b/assets/sass/base/_layout.sass index 994ab17f..0587738e 100644 --- a/assets/sass/base/_layout.sass +++ b/assets/sass/base/_layout.sass @@ -11,15 +11,15 @@ flex-wrap: wrap .list-style-none - list-style: none + list-style: none !important .align-items-center align-items: center -@each $value in 'block', 'inline', 'inline-block', 'flex' - .display-#{$value}, - .is-#{$value}, - display: #{$value} +//@each $value in 'block', 'inline', 'inline-block', 'flex' +// .display-#{$value}, +// .is-#{$value}, +// display: #{$value} @each $value in 'top', 'middle', 'bottom' .table @@ -32,10 +32,6 @@ &.vertical-#{$value} vertical-align: #{$value} -@for $value from 2 through 5 - .is-#{$value} - width: calc(100% / #{$value}) - $properties: ( mb: 'margin-bottom', ml: 'margin-left', mr: 'margin-right', mt: 'margin-top', pb: 'padding-bottom', pl: 'padding-left', pr: 'padding-right', pt: 'padding-top' ) @each $key, $property in $properties @for $value from 1 through 5 diff --git a/assets/sass/base/_utilities.sass b/assets/sass/base/_utilities.sass index 66693cff..90d897a6 100644 --- a/assets/sass/base/_utilities.sass +++ b/assets/sass/base/_utilities.sass @@ -1,2 +1,5 @@ +.is-borderless + border: none !important + .is-circle border-radius: 50% diff --git a/assets/sass/pages/_blog.sass b/assets/sass/pages/_blog.sass index 765521a1..671624e2 100644 --- a/assets/sass/pages/_blog.sass +++ b/assets/sass/pages/_blog.sass @@ -1,11 +1,10 @@ .page--blog__list ul.posts - list-style: none + //list-style: none margin-bottom: 2em - padding-left: 0 + margin-left: 0 + margin-top: 0 + //padding-left: 0 .post - +clearfix border-bottom: 1px solid #CCC - margin-bottom: 1em - padding-bottom: 2em diff --git a/assets/sass/pages/_post.sass b/assets/sass/pages/_post.sass index 94ed1a3f..80a7790c 100644 --- a/assets/sass/pages/_post.sass +++ b/assets/sass/pages/_post.sass @@ -1,10 +1,3 @@ -.post-pager - clear: both - margin-top: 2em - -.post-pager div - flex: 1 - pre display: block overflow: auto @@ -14,7 +7,6 @@ pre pre[class*="language-"] border: 0 border-radius: 0 - margin: 1.5em 0 pre code white-space: pre @@ -28,8 +20,5 @@ code[data-gist-id] background: transparent padding: 0 -.about-author - img - // float: left - // margin: 0 1em 1em 0 - width: 50px +.about-author img + width: 50px diff --git a/assets/sass/pages/_talk.sass b/assets/sass/pages/_talk.sass index 9764d734..76aa2d22 100644 --- a/assets/sass/pages/_talk.sass +++ b/assets/sass/pages/_talk.sass @@ -1,9 +1,4 @@ -@import '../mixins' - -.talk-full h1 - margin-bottom: 25px - -.presentation +.talk-slides background: url('../images/loading.gif') no-repeat center min-height: 275px width: 100% diff --git a/assets/sass/pages/_testimonials.sass b/assets/sass/pages/_testimonials.sass index 1b3eaf47..74c21553 100644 --- a/assets/sass/pages/_testimonials.sass +++ b/assets/sass/pages/_testimonials.sass @@ -1,10 +1,3 @@ -@import '../mixins' - -.testimonial - +clearfix - margin-bottom: 10px - - &__image - height: 75px - margin: 0 0 10px 10px - width: 75px +.testimonial-image + height: 75px + width: 75px diff --git a/gulpfile.js b/gulpfile.js index 0b09fa04..05d763f0 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -31,10 +31,9 @@ gulp.task('styles', gulp.task('scripts', addScript([ 'node_modules/jquery/dist/jquery.js', - 'node_modules/bootstrap-sass/assets/javascripts/bootstrap.js', 'node_modules/prismjs/prism.js', - 'node_modules/prismjs/components/prism-{apacheconf,bash,css,diff,ini,json,nginx,php,sass,scss,sql,less,twig,xml,yaml}.js', - config.js.sourceDir + config.js.pattern + 'node_modules/prismjs/components/prism-{apacheconf,bsash,css,diff,ini,json,nginx,php,sass,scss,sql,less,twig,xml,yaml}.js', + config.js.sourceDir + '/**/*.js' ], 'site.js') ); diff --git a/package.json b/package.json index 984f5501..a5a88a98 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,5 @@ { "dependencies": { - "bootstrap-sass": "^3.3.7", "bulma": "^0.5.0", "del": "^3.0.0", "font-awesome": "^4.7.0", diff --git a/source/_includes/nav.html.twig b/source/_includes/nav.html.twig index c954766f..ad18db08 100644 --- a/source/_includes/nav.html.twig +++ b/source/_includes/nav.html.twig @@ -1,31 +1,41 @@ - diff --git a/source/_includes/post/pager.html.twig b/source/_includes/post/pager.html.twig index 1597101d..6dcb6bb8 100644 --- a/source/_includes/post/pager.html.twig +++ b/source/_includes/post/pager.html.twig @@ -1,6 +1,6 @@ -
+
{% if page.previous_post %} -
+
« {{ page.previous_post.title }} @@ -8,7 +8,7 @@ {% endif %} {% if page.next_post %} -
+
{{ page.next_post.title }} » diff --git a/source/_includes/post/tags.html.twig b/source/_includes/post/tags.html.twig index 6f4862de..a0cface1 100644 --- a/source/_includes/post/tags.html.twig +++ b/source/_includes/post/tags.html.twig @@ -1,8 +1,9 @@ {% if page.tags %} -

- Tags: +

{% for tag in page.tags %} - {{ tag }}{% if not loop.last %}, {% endif %} + + {{- tag -}} + {% endfor %} -

+
{% endif %} diff --git a/source/_includes/talks-table.html.twig b/source/_includes/talks-table.html.twig index 45add50a..73015190 100644 --- a/source/_includes/talks-table.html.twig +++ b/source/_includes/talks-table.html.twig @@ -1,5 +1,5 @@
- +
diff --git a/source/_layouts/default.html.twig b/source/_layouts/default.html.twig index a2c9e12f..ae49bd9b 100644 --- a/source/_layouts/default.html.twig +++ b/source/_layouts/default.html.twig @@ -27,34 +27,38 @@ {% include 'nav' %} -
-
-
- {% block content_top %}{% endblock %} - {% block content_wrapper %}{% block content %}{% endblock %}{% endblock %} - {% block content_bottom %}{% endblock %} -
+
+
+
+
+ {% block content_top %}{% endblock %} + {% block content_wrapper %}{% block content %}{% endblock %}{% endblock %} + {% block content_bottom %}{% endblock %} +
- {% block sidebar_wrapper %} -
- {% block sidebar %} - {% include 'badges' %} - {% include 'availability' %} - {% include 'posts/latest' %} - {% endblock %} -
- {% endblock %} + {% block sidebar_wrapper %} +
+ {% block sidebar %} + {% include 'badges' %} + {% include 'availability' %} + {% include 'posts/latest' %} + {% endblock %} +
+ {% endblock %} -
{# .row #} -
{# .container #} +
{# .row #} +
{# .container #} + -
-

- © 2010-{{ 'now'|date('Y') }} {{ site.title }}. Built with Sculpin. -

+
+
+

+ © 2010-{{ 'now'|date('Y') }} {{ site.title }}. Built with Sculpin, Bulma and Gulp. +

- {% include 'meetups' %} -
+ {% include 'meetups' %} +
+ @@ -62,6 +66,6 @@ {% endif %} - {% block scripts '' %} + {% block scripts %}{% endblock %} diff --git a/source/_layouts/talk.html.twig b/source/_layouts/talk.html.twig index d7b8125b..951a9897 100644 --- a/source/_layouts/talk.html.twig +++ b/source/_layouts/talk.html.twig @@ -1,35 +1,31 @@ -{% extends 'default' %} +{% extends 'page' %} {% block body_classes 'talk talk-full' %} -{% block content_top %} -

{{ page.title }}

-{% endblock %} - {% block content_wrapper %} -
+
{% block content %}{% endblock %}
{% if page.slides.embed %} -
+

Slides

-
+
{{ page.slides.embed|raw }} -
{# .presentation #} -
{# .talk-slides #} +
+
{% endif %} {% if page.video.embed %} -
+

Video

{{ page.video.embed|raw }}
-
{# .talk-video #} +
{% endif %} -
+

Events

{% set events = [] %} @@ -48,5 +44,5 @@ events: events, talk_page: true, } %} -
{# .talk-events #} +
{% endblock %} diff --git a/source/_posts/2017-05-15-drupalcamp-bristol-tickets-sessions-sponsors.md b/source/_posts/2017-05-15-drupalcamp-bristol-tickets-sessions-sponsors.md index 766f1440..419ea3be 100644 --- a/source/_posts/2017-05-15-drupalcamp-bristol-tickets-sessions-sponsors.md +++ b/source/_posts/2017-05-15-drupalcamp-bristol-tickets-sessions-sponsors.md @@ -16,7 +16,9 @@ meta: slug: drupalcamp-bristol-early-bird-tickets-sessions-sponsors --- {% block excerpt %} -DrupalCamp Bristol 2017 logo +
+ DrupalCamp Bristol 2017 logo +
In less than two months time, [DrupalCamp Bristol][0] will be back for our third year! (July seems to come around quicker each year). This is this year’s schedule and venues: diff --git a/source/_posts/2017-07-13-publishing-sculpin-sites-with-github-pages.md b/source/_posts/2017-07-13-publishing-sculpin-sites-with-github-pages.md index a5275789..5434bf27 100644 --- a/source/_posts/2017-07-13-publishing-sculpin-sites-with-github-pages.md +++ b/source/_posts/2017-07-13-publishing-sculpin-sites-with-github-pages.md @@ -25,12 +25,13 @@ This made sense as I already kept the source code in [on GitHub][1], the issue w {% endblock %} {% block content %} - +
+ +
Earlier this week I moved this site from my personal Linode server to [GitHub Pages][0]. diff --git a/source/blog.html b/source/blog.html index 04f980d2..03c4ef7f 100644 --- a/source/blog.html +++ b/source/blog.html @@ -9,9 +9,9 @@ use: [posts] {% block content %}

Blog

-
    +
      {% for post in page.pagination.items %} -
    • +
    • {{ include('post/header', { page: post, title_tag: 'h2' diff --git a/source/testimonials.html.twig b/source/testimonials.html.twig index c6891cac..386fc0b0 100644 --- a/source/testimonials.html.twig +++ b/source/testimonials.html.twig @@ -5,19 +5,19 @@ use: [posts] --- {% block content %} {% for testimonial in site.testimonials|reverse %} -
      -

      {{ testimonial.name }}

      +
      +

      {{ testimonial.name }}

      {% if testimonial.image %} {{ testimonial.name }} + > {% endif %} {% if testimonial.role %} -
      +
      {{ testimonial.role|markdown }}
      {% endif %} diff --git a/yarn.lock b/yarn.lock index f57572f9..c4b35d2b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -216,10 +216,6 @@ boom@2.x.x: dependencies: hoek "2.x.x" -bootstrap-sass@^3.3.7: - version "3.3.7" - resolved "https://registry.yarnpkg.com/bootstrap-sass/-/bootstrap-sass-3.3.7.tgz#6596c7ab40f6637393323ab0bc80d064fc630498" - brace-expansion@^1.0.0: version "1.1.6" resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.6.tgz#7197d7eaa9b87e648390ea61fc66c84427420df9"
Date