Merge branch 'master' into th-health-seminar

Author: Toby Hunt

_posts/2015-12-08-christmas-slack-o-meter.md

@@ -32,25 +32,22 @@ The format should be fairly recognisable to anyone that has been to a hackathon,
 
 ### The Project
 
-One of the topics for this Hackathon was Christmas, so we chose a simple Hack that would reflect the ubiquitous festive sentiment around Pebble Towers. 
+One of the topics for this Hackathon was Christmas, so we chose a simple Hack that would reflect the ubiquitous festive sentiment around Pebble Towers.
 
 ![Ubiquitous Festive Excitement](https://pbs.twimg.com/media/CVF1N6pWwAAWdue.jpg:large)
 
 ### The First Idea
 
-Obviously we were going to make something huge, loud and fantastically ambitious. We wanted a massive sign with flashing lights, sound, and a HTML front-end displayed on the big monitor in the corner of our office. This would sound a klaxon and go crazy every time a certain keyword was mentioned on one of the public channels on Slack. Since the Hackathon's topic was Christmas, our keywords would be christmassy things like 'turkey', 'sleigh bells', or 'over-commercialised'. We We lost no time in making a big mess and covering our desks in wires, arduinos, raspberry pis and coffee. 
+Obviously we were going to make something huge, loud and fantastically ambitious. We wanted a massive sign with flashing lights, sound, and a HTML front-end displayed on the big monitor in the corner of our office. This would sound a klaxon and go crazy every time a certain keyword was mentioned on one of the public channels on Slack. Since the Hackathon's topic was Christmas, our keywords would be christmassy things like 'turkey', 'sleigh bells', or 'over-commercialised'. We We lost no time in making a big mess and covering our desks in wires, arduinos, raspberry pis and coffee.
 
 ![George Hiding His Face](/img/posts/2015-12-08-christmas-slack-o-meter/george-hiding.jpg)
 
 The team consisted of Aisling, fashioning the front-end, Clorama, hacking on the hardware and me bashing away at the backend. In no time we had our very own internal GCHQ snooping on every message in our public Slack channels. By using Slack's [outgoing webhooks](https://api.slack.com/outgoing-webhooks) we could POST every message to our own servers and analyse the text to find incidences of our trigger keywords.
 
 ![API diagram](/img/posts/2015-12-08-christmas-slack-o-meter/cristmas-meter-diagram.png)
 
-<<<<<<< HEAD
 For the API I used [Hapi](hapijs.com), a rich API framework that we've used for Hacks before. I wanted to use this Hackathon to familiarise myself with its structure, and I found it great - a quickly assembled springboard to launch our application from. For persistence we used [MongoDB](https://www.mongodb.org/) and to simplify DB connections and schema we used [Mongoose](http://mongoosejs.com/), both of which play nicely with Hapi.
-=======
-For the API I used [Hapi](http://hapijs.com), a rich API framework that we've used for Hacks before. I wanted to use this Hackathon to familiarise myself with its structure, and I found it great - a quickly assembled springboard to launch our application from. For persistence we used [MongoDB](https://www.mongodb.org/) and to simplify DB connections and schema we used [Mongoose](http://mongoosejs.com/), both of which play nicely with Hapi.
->>>>>>> f46a86a9cfc78ca6cbd0a599b9619f613cdcd1c5
+
 
 But the hardware was still giving us a headache. After much deliberating and some eating of humble Pi we decided to scale back our ambitions and instead focus on the Live Demo, since 5pm had somehow leapt on us out of nowhere, like an Australian dropbear.
 
@@ -62,7 +59,7 @@ We decided to make something interactive, a simple challenge that we could issue
 
 Now with a suitably re-scoped idea, we set to work on the front-end. We made a simple script that would poll our API and translate our Christmas metric into a `transform: rotate(x)` css declaration for the needle.
 
-With a bit of frantic typing right up until the last moment, we managed to do it. And here's a screencapture of the amazing, exhilirating moment when we declared the winner. 
+With a bit of frantic typing right up until the last moment, we managed to do it. And here's a screencapture of the amazing, exhilirating moment when we declared the winner.
 
 ![Gif of Hack ending](/img/posts/2015-12-08-christmas-slack-o-meter/christmas-hack.gif)
 

_sass/pages/_vertical.scss

@@ -9,8 +9,7 @@
 
 .vert-bubble-container {
   text-align: center;
-<<<<<<< HEAD
-=======
+
   padding: 30px;
 
   &:before {
@@ -20,7 +19,6 @@
 
   }
 
->>>>>>> f46a86a9cfc78ca6cbd0a599b9619f613cdcd1c5
   @media screen and ( max-width: $medium ) {
     padding: 12px;
   }
@@ -31,20 +29,15 @@
   width: 250px;
   display: inline-block;
   position: relative;
-<<<<<<< HEAD
-=======
   vertical-align: top;
->>>>>>> f46a86a9cfc78ca6cbd0a599b9619f613cdcd1c5
 
   img {
     height: 100%;
     width: 100%;
     position: relative;
     top: 0;
-<<<<<<< HEAD
-=======
 
->>>>>>> f46a86a9cfc78ca6cbd0a599b9619f613cdcd1c5
+
     @media screen and ( max-width: $medium ) {
       height: 100%;
       float: right;
@@ -61,11 +54,7 @@
     width: 100%;
     text-align: left;
     display: block;
-<<<<<<< HEAD
-    padding: 4px 12px ;
-=======
     padding: 4px 12px;
->>>>>>> f46a86a9cfc78ca6cbd0a599b9619f613cdcd1c5
     background: rgba(black, 0.2);
     border: rgba(white, 0.6) solid 6px;
     border-radius: 6px;
@@ -113,10 +102,7 @@
     position: absolute;
     top: 50%;
     transform: translateY(-50%);
-<<<<<<< HEAD
-=======
     padding-right: 128px;
->>>>>>> f46a86a9cfc78ca6cbd0a599b9619f613cdcd1c5
   }
 
 }
@@ -232,8 +218,7 @@
     background-color: $aqua;
   }
 
-<<<<<<< HEAD
-=======
+
   &.orange {
       background-color: $orange;
     &:before {
@@ -249,7 +234,6 @@
     }
   }
 
->>>>>>> f46a86a9cfc78ca6cbd0a599b9619f613cdcd1c5
   &.pink {
     &:before {
       transform: rotate(-1.1deg) scale(1.2);
@@ -318,15 +302,7 @@
     -webkit-transform: rotate(1.3deg) scale(1.2);
   }
 
-<<<<<<< HEAD
-  &:last-of-type {
-    &:before {
-      content: none;
-    }
 
-    &:after {
-       content: none;
-=======
   &:nth-last-of-type(2) {
     &:before {
     }
@@ -343,7 +319,6 @@
 
     &:after {
      content: none;
->>>>>>> f46a86a9cfc78ca6cbd0a599b9619f613cdcd1c5
     }
   }
 
@@ -397,21 +372,6 @@
 }
 
 .vert-section-table {
-<<<<<<< HEAD
-  border: 2px solid darken($pink, 20%);
-
-  tr {
-    // border: #333 solid 2px;
-    background: lighten($pink, 20%);
-    color: #333;
-
-    &:nth-child(odd) {
-      background: lighten($pink, 30%);
-    }
-
-    &:first-child {
-      background: darken($pink, 20%);
-=======
   border: 2px solid darken($aqua, 20%);
 
   tr {
@@ -425,20 +385,15 @@
 
     &:first-child {
       background: darken($aqua, 20%);
->>>>>>> f46a86a9cfc78ca6cbd0a599b9619f613cdcd1c5
       color: #fff;
       font-weight: bold;
     }
 
   }
 
   td {
-<<<<<<< HEAD
-    padding-left: 8px;
-=======
     // padding-left: 8px;
     padding: 6px 8px;
->>>>>>> f46a86a9cfc78ca6cbd0a599b9619f613cdcd1c5
   }
 }
 
@@ -547,10 +502,7 @@ h4.vert-section-breadcrumb {
 .vert-section-large-image {
   width: 400px;
   height: 400px;
-<<<<<<< HEAD
-=======
   max-width: 50%;
->>>>>>> f46a86a9cfc78ca6cbd0a599b9619f613cdcd1c5
   float: right;
   @media screen and ( max-width: $medium ) {
     height: 200px;
@@ -566,20 +518,6 @@ h4.vert-section-breadcrumb {
 // Case Study
 //===============================================================================
 
-<<<<<<< HEAD
-.vert-section-case-study {
-  width: 50%;
-  display: inline-block;
-  background: rgba(black, 0.2);
-  padding: 8px 18px;
-  display: inline;
-  border: 4px solid rgba(black, 0.2);
-  color: white;
-  font-weight: bold;
-  &:hover {
-    background: white;
-  }
-=======
 .vert-section-case-study,
 .vert-section-blog-link {
   margin: 20px auto;
@@ -647,5 +585,4 @@ h4.vert-section-breadcrumb {
     }
   }
 
->>>>>>> f46a86a9cfc78ca6cbd0a599b9619f613cdcd1c5
 }

_sass/shared/_sprite.scss

@@ -19,16 +19,6 @@ $ten-white: 24px 26px $gbl-sprite-path -81px -69px;
 $snacks-white: 20px 25px $gbl-sprite-path -58px -69px;
 $holiday-white: 26px 25px $gbl-sprite-path -28px -69px;
 $flexible-white: 25px 26px $gbl-sprite-path 0px -69px;
-<<<<<<< HEAD
-$mail-black: 29px 25px $gbl-sprite-path -137px -33px;
-$phone-black: 30px 30px $gbl-sprite-path -105px -33px;
-$location-black: 23px 32px $gbl-sprite-path -79px -33px;
-$close-grey: 17px 17px $gbl-sprite-path -191px -33px;
-$menu-grey: 19px 19px $gbl-sprite-path -169px -33px;
-$octocat-pink: 23px 23px $gbl-sprite-path -53px -33px;
-$twitter-pink: 26px 21px $gbl-sprite-path -26px -33px;
-$vimeo-pink: 24px 22px $gbl-sprite-path 0px -33px;
-=======
 $mail-black: 29px 25px $gbl-sprite-path -170px -33px;
 $phone-black: 30px 30px $gbl-sprite-path -138px -33px;
 $location-black: 23px 32px $gbl-sprite-path -112px -33px;
@@ -39,6 +29,3 @@ $octocat-pink: 23px 23px $gbl-sprite-path -53px -33px;
 $twitter-pink: 26px 21px $gbl-sprite-path -26px -33px;
 $vimeo-pink: 24px 22px $gbl-sprite-path 0px -33px;
 
-
-
->>>>>>> f46a86a9cfc78ca6cbd0a599b9619f613cdcd1c5

css/main.scss

@@ -73,19 +73,12 @@
 // INVITE: Styles for the invite pages
 @import "pages/_invite.scss";
 
-<<<<<<< HEAD
-// INVITE: Styles for the invite pages
-@import "pages/_vertical.scss";
-
-=======
 // SEMINAR: Styles for the seminar pages
 @import "pages/_seminar.scss";
 
 // INVITE: Styles for the invite pages
 @import "pages/_vertical.scss";
 
-
->>>>>>> f46a86a9cfc78ca6cbd0a599b9619f613cdcd1c5
 // IE 8
 // ===================================================
 @import "shared/_ie.scss";