diff --git a/README.md b/README.md index f8d06ec..3a30afc 100755 --- a/README.md +++ b/README.md @@ -1,3 +1,3 @@ Website for the European Data and Computational Journalism Conference. -Cover Image: CC-BY-ND 2.0 by LenDog64 https://www.flickr.com/photos/lendog64/5574663324/ +Cover Image: CC-BY-ND 2.0 by LenDog64 https://www.flickr.com/photos/lendog64/5574663324/ diff --git a/app/_assets/scss/main.scss b/app/_assets/scss/main.scss index 0aaa3f5..b349237 100755 --- a/app/_assets/scss/main.scss +++ b/app/_assets/scss/main.scss @@ -36,8 +36,6 @@ $medium-break: 600px; $large-break: 1000px; - - // Use media queries like this: // @include media-query($on-palm) { // .wrapper { diff --git a/app/_assets/scss/partials/_layout.scss b/app/_assets/scss/partials/_layout.scss index 939aaef..9922451 100644 --- a/app/_assets/scss/partials/_layout.scss +++ b/app/_assets/scss/partials/_layout.scss @@ -38,7 +38,7 @@ nav { .wrapper { - padding-top: $spacing-unit*3; + padding-top: $spacing-unit * 2; height: 100%; width: 95%; margin: auto; diff --git a/app/_assets/scss/partials/_sections.scss b/app/_assets/scss/partials/_sections.scss index 3a0d2dd..a217dfe 100644 --- a/app/_assets/scss/partials/_sections.scss +++ b/app/_assets/scss/partials/_sections.scss @@ -100,6 +100,38 @@ } } +#speakers { + background: url(../img/microphone.jpg); + background-size: cover; + padding-bottom: $spacing-unit; + color: white; + + .flex-wrapper { + margin: 0 auto; + display: flex; + flex-direction: column; + } + + .speaker { + background-color: rgba($grey-colour-dark, 0.9); + padding-top: $spacing-unit/2; + border-radius: 50px; + margin: $gap-size; + text-align: center; + flex-grow: 1; + flex-shrink: 1; + flex-basis: 1; + + .fa-user { + font-size: 80px; + } + } + + .explainer { + padding-bottom: $spacing-unit; + } +} + @include media-query($small-break) { .hero { @@ -177,4 +209,12 @@ margin-top: 20vh; } } + + #speakers { + .flex-wrapper { + padding-top: 10vh; + flex-direction: row; + } + } + } diff --git a/app/_includes/head.html b/app/_includes/head.html index bb6bfaa..075dd92 100755 --- a/app/_includes/head.html +++ b/app/_includes/head.html @@ -5,11 +5,12 @@ {% if page.title %}{{ page.title | escape }}{% else %}{{ site.title | escape }}{% endif %} - + + diff --git a/app/img/lecture.jpg b/app/img/lecture.jpg new file mode 100644 index 0000000..9d96f1b Binary files /dev/null and b/app/img/lecture.jpg differ diff --git a/app/img/microphone.jpg b/app/img/microphone.jpg new file mode 100644 index 0000000..6dffa0c Binary files /dev/null and b/app/img/microphone.jpg differ diff --git a/app/index.html b/app/index.html index 0b4912b..81355cc 100755 --- a/app/index.html +++ b/app/index.html @@ -60,6 +60,26 @@

The Conference

Speakers

+
+ Joining us will be three industry leaders to deliver keynote talks during the conference on the real world practice of Data and Computational Journalism. +
+
+
+ +

Speaker tbc

+

... speaker to be confirmed ...

+
+
+ +

Speaker tbc

+

... speaker to be confirmed ...

+
+
+ +

Speaker tbc

+

... speaker to be confirmed ...

+
+
diff --git a/todo.md b/todo.md index 6574db4..cb815bb 100644 --- a/todo.md +++ b/todo.md @@ -11,4 +11,4 @@ * * * -Last generated: Wed Feb 08 2017 14:43:54 by [grunt-todo](https://github.com/leny/grunt-todo). +Last generated: Wed Feb 08 2017 20:06:50 by [grunt-todo](https://github.com/leny/grunt-todo).