Merge branch 'gh-pages'

_includes/picture-item.html

@@ -11,6 +11,7 @@
   <div class="picture-item__inner">
     <img src="{{ site.baseurl }}/img/{{ item.img }}" alt="" height="145" width="230" />
     <div class="picture-item__details clearfix">
+      <img class="picture-item__blur" src="{{ site.baseurl }}/img/{{ item.img }}" alt="" height="145" width="230" />
       <figcaption class="picture-item__title pull-left"><a href="{{ site.baseurl }}/img/originals/{{ item.original }}" target="_blank">{{ item.title }}</a></figcaption>
       <p class="picture-item__tags pull-right">{{ item.groups | join: ', ' }}</p>
     </div>

_posts/demos/2014-04-09-requirejs.html

@@ -64,4 +64,4 @@ pagejs: false
 {% include credit-jake.html %}
 
 
-<script data-main="/js/require-main.js" src="//cdnjs.cloudflare.com/ajax/libs/require.js/2.1.11/require.min.js"></script>
+<script data-main="{{ site.baseurl }}/js/require-main.js" src="//cdnjs.cloudflare.com/ajax/libs/require.js/2.1.11/require.min.js"></script>

_scss/shuffle-styles.scss

@@ -29,6 +29,7 @@ $itemHeight: 220px;
       background-color: #333;
       background-color: rgba(black, .6);
       color: white;
+      overflow: hidden;
     }
 
     .picture-item__description {
@@ -48,6 +49,10 @@ $itemHeight: 220px;
     height: auto;
   }
 
+  .picture-item__blur {
+    display: none;
+  }
+
   .picture-item__details,
   .picture-item__description {
     padding: 1em;
@@ -67,6 +72,35 @@ $itemHeight: 220px;
   }
 }
 
+// Autoprefixer misses a parenthesis.
+/* autoprefixer: off */
+@supports (filter: blur(1px)) or (-webkit-filter: blur(1px)) {
+
+  .picture-item.span6:not(.picture-item--h2) {
+
+
+    .picture-item__blur {
+      /* autoprefixer: on */
+      position: absolute;
+      z-index: 1;
+      top: calc(50px - #{$itemHeight}); // Caption is 50px tall.
+      left: 0;
+      display: block;
+      filter: blur(7px);
+    }
+
+    .picture-item__details {
+      background: none;
+    }
+
+    .picture-item__tags,
+    .picture-item__title {
+      position: relative;
+      z-index: 2;
+    }
+  }
+}
+
 
 /*
   Shuffle needs either relative or absolute positioning on the container

css/shuffle-styles.css

@@ -5,10 +5,10 @@
   height: 220px;
   margin-top: 24px; }
 .picture-item.shuffle-item {
-  margin-left: 0;
+  margin-left: 0
   /* shuffle items shouldn't have a left margin*/ }
 .picture-item.picture-item--h2 {
-  height: 464px;
+  height: 464px
   /* 2x the height + 1 gutter */ }
 .picture-item.span6:not(.picture-item--h2) .picture-item__details {
   position: absolute;
@@ -17,7 +17,8 @@
   width: 100%;
   background-color: #333;
   background-color: rgba(0, 0, 0, 0.6);
-  color: white; }
+  color: white;
+  overflow: hidden; }
 .picture-item.span6:not(.picture-item--h2) .picture-item__description {
   display: none; }
 .picture-item .picture-item__inner {
@@ -28,6 +29,8 @@
   display: block;
   width: 100%;
   height: auto; }
+.picture-item .picture-item__blur {
+  display: none; }
 .picture-item .picture-item__details, .picture-item .picture-item__description {
   padding: 1em; }
 .picture-item .picture-item__description {
@@ -37,6 +40,22 @@
 .picture-item .picture-item__tags {
   margin: 0; }
 
+/* autoprefixer: off */
+@supports (filter: blur(1px)) or (-webkit-filter: blur(1px)) {
+  .picture-item.span6:not(.picture-item--h2) .picture-item__blur {
+    /* autoprefixer: on */
+    position: absolute;
+    z-index: 1;
+    top: calc(50px - 220px);
+    left: 0;
+    display: block;
+    -webkit-filter: blur(7px);
+            filter: blur(7px); }
+  .picture-item.span6:not(.picture-item--h2) .picture-item__details {
+    background: none; }
+  .picture-item.span6:not(.picture-item--h2) .picture-item__tags, .picture-item.span6:not(.picture-item--h2) .picture-item__title {
+    position: relative;
+    z-index: 2; } }
 /*
   Shuffle needs either relative or absolute positioning on the container
   It will set it for you, but it'll cause another style recalculation and layout.
@@ -57,19 +76,14 @@
 
 .shuffle--animatein .picture-item__inner {
   opacity: 0;
-  -webkit-transform: translate(0, 220px);
-      -ms-transform: translate(0, 220px);
-          transform: translate(0, 220px); }
+  transform: translate(0, 220px); }
 
 .shuffle--animatein .picture-item__inner--transition {
-  -webkit-transition: all .6s ease;
-          transition: all .6s ease; }
+  transition: all .6s ease; }
 
 .shuffle--animatein .picture-item.in .picture-item__inner {
   opacity: 1;
-  -webkit-transform: translate(0, 0);
-      -ms-transform: translate(0, 0);
-          transform: translate(0, 0); }
+  transform: translate(0, 0); }
 
 @media (max-width: 47.9375em) {
   .picture-item {

css/style.css

@@ -42,7 +42,7 @@ html {
   /* 1 */
   -ms-text-size-adjust: 100%;
   /* 2 */
-  -webkit-text-size-adjust: 100%;
+  -webkit-text-size-adjust: 100%
   /* 2 */ }
 
 /**
@@ -183,7 +183,7 @@ fieldset {
 legend {
   border: 0;
   /* 1 */
-  padding: 0;
+  padding: 0
   /* 2 */ }
 
 /**
@@ -196,7 +196,7 @@ button, input, select, textarea {
   /* 1 */
   font-size: 100%;
   /* 2 */
-  margin: 0;
+  margin: 0
   /* 3 */ }
 
 /**
@@ -225,7 +225,7 @@ button, select {
 button, html input[type="button"], input[type="reset"], input[type="submit"] {
   -webkit-appearance: button;
   /* 2 */
-  cursor: pointer;
+  cursor: pointer
   /* 3 */ }
 
 /**
@@ -241,14 +241,14 @@ button[disabled], html input[disabled] {
 input[type="checkbox"], input[type="radio"] {
   box-sizing: border-box;
   /* 1 */
-  padding: 0;
+  padding: 0
   /* 2 */ }
 
 /**
  * 1. Address `appearance` set to `searchfield` in Safari 5 and Chrome.
  */
 input[type="search"] {
-  -webkit-appearance: textfield;
+  -webkit-appearance: textfield
   /* 1 */ }
 
 /**
@@ -272,7 +272,7 @@ button::-moz-focus-inner, input::-moz-focus-inner {
 textarea {
   overflow: auto;
   /* 1 */
-  vertical-align: top;
+  vertical-align: top
   /* 2 */ }
 
 /* ==========================================================================
@@ -1758,7 +1758,7 @@ input.faq-search:focus::-moz-input-placeholder {
 .clearfix:before, .clearfix:after {
   content: " ";
   /* 1 */
-  display: table;
+  display: table
   /* 2 */ }
 
 .clearfix:after {

js/require-main.js

@@ -1,5 +1,5 @@
 requirejs.config({
-  baseUrl: '/js',
+  baseUrl: site_url + '/js',
   paths: {
     jquery: '//ajax.googleapis.com/ajax/libs/jquery/2.1.0/jquery.min',
     shuffle: '../dist/jquery.shuffle',
@@ -37,7 +37,7 @@ define(function(require) {
   var Page = require('page');
 
   // Create a new shuffle instance.
-  var shuffle = new Shuffle($('#grid'), {
+  var shuffle = new Shuffle($('#grid').get(0), {
     itemSelector: '.js-item',
     sizer: $('#js-sizer')
   });

package.json

@@ -30,7 +30,7 @@
   "homepage": "https://github.com/Vestride/Shuffle",
   "devDependencies": {
     "grunt": "^0.4.5",
-    "grunt-autoprefixer": "^1.0.1",
+    "grunt-autoprefixer": "^2.0.0",
     "grunt-contrib-concat": "^0.5.0",
     "grunt-contrib-jasmine": "^0.7.0",
     "grunt-contrib-sass": "^0.8.1",