Merge branch 'release/v2.5.0'

Author: TheSeg

Gemfile.lock

@@ -2,53 +2,60 @@ GEM
   remote: https://rubygems.org/
   specs:
     RedCloth (4.2.9)
-    activesupport (4.1.4)
+    activesupport (4.1.7)
       i18n (~> 0.6, >= 0.6.9)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
       thread_safe (~> 0.1)
       tzinfo (~> 1.1)
     blankslate (2.1.2.4)
-    celluloid (0.15.2)
-      timers (~> 1.1.0)
-    classifier (1.3.4)
-      fast-stemmer (>= 1.0.0)
+    celluloid (0.16.0)
+      timers (~> 4.0.0)
+    classifier-reborn (2.0.2)
+      fast-stemmer (~> 1.0)
     coffee-script (2.3.0)
       coffee-script-source
       execjs
-    coffee-script-source (1.7.1)
+    coffee-script-source (1.8.0)
     colorator (0.1)
-    execjs (2.2.1)
+    execjs (2.2.2)
     fast-stemmer (1.0.2)
-    ffi (1.9.3)
-    gemoji (2.0.0)
-    github-pages (21)
+    ffi (1.9.6)
+    gemoji (2.1.0)
+    github-pages (29)
       RedCloth (= 4.2.9)
-      jekyll (= 2.2.0)
+      github-pages-health-check (~> 0.1)
+      jekyll (= 2.4.0)
       jekyll-coffeescript (= 1.0.0)
       jekyll-mentions (= 0.1.3)
-      jekyll-redirect-from (= 0.4.0)
-      jekyll-sass-converter (= 1.1.0)
-      jekyll-sitemap (= 0.5.0)
+      jekyll-redirect-from (= 0.6.2)
+      jekyll-sass-converter (= 1.2.0)
+      jekyll-sitemap (= 0.6.0)
       jemoji (= 0.3.0)
       kramdown (= 1.3.1)
       liquid (= 2.6.1)
       maruku (= 0.7.0)
+      mercenary (~> 0.3)
       pygments.rb (= 0.6.0)
       rdiscount (= 2.1.7)
       redcarpet (= 3.1.2)
+      terminal-table (~> 1.4)
+    github-pages-health-check (0.1.1)
+      net-dns (~> 0.6)
+      public_suffix (~> 1.4)
+    hitimes (1.2.2)
     html-pipeline (1.9.0)
       activesupport (>= 2)
       nokogiri (~> 1.4)
     i18n (0.6.11)
-    jekyll (2.2.0)
-      classifier (~> 1.3)
+    jekyll (2.4.0)
+      classifier-reborn (~> 2.0)
       colorator (~> 0.1)
       jekyll-coffeescript (~> 1.0)
       jekyll-gist (~> 1.0)
       jekyll-paginate (~> 1.0)
       jekyll-sass-converter (~> 1.0)
-      jekyll-watch (~> 1.0)
+      jekyll-watch (~> 1.1)
       kramdown (~> 1.3)
       liquid (~> 2.6.1)
       mercenary (~> 0.3.3)
@@ -62,13 +69,13 @@ GEM
     jekyll-mentions (0.1.3)
       html-pipeline (~> 1.9.0)
       jekyll (~> 2.0)
-    jekyll-paginate (1.0.0)
-    jekyll-redirect-from (0.4.0)
+    jekyll-paginate (1.1.0)
+    jekyll-redirect-from (0.6.2)
       jekyll (~> 2.0)
-    jekyll-sass-converter (1.1.0)
+    jekyll-sass-converter (1.2.0)
       sass (~> 3.2)
-    jekyll-sitemap (0.5.0)
-    jekyll-watch (1.0.0)
+    jekyll-sitemap (0.6.0)
+    jekyll-watch (1.1.2)
       listen (~> 2.7)
     jemoji (0.3.0)
       gemoji (~> 2.0)
@@ -77,19 +84,21 @@ GEM
     json (1.8.1)
     kramdown (1.3.1)
     liquid (2.6.1)
-    listen (2.7.9)
+    listen (2.8.0)
       celluloid (>= 0.15.2)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
     maruku (0.7.0)
-    mercenary (0.3.4)
-    mini_portile (0.6.0)
-    minitest (5.4.0)
-    nokogiri (1.6.3.1)
-      mini_portile (= 0.6.0)
+    mercenary (0.3.5)
+    mini_portile (0.6.1)
+    minitest (5.4.3)
+    net-dns (0.8.0)
+    nokogiri (1.6.4.1)
+      mini_portile (~> 0.6.0)
     parslet (1.5.0)
       blankslate (~> 2.0)
-    posix-spawn (0.3.8)
+    posix-spawn (0.3.9)
+    public_suffix (1.4.6)
     pygments.rb (0.6.0)
       posix-spawn (~> 0.3.6)
       yajl-ruby (~> 1.1.0)
@@ -98,13 +107,15 @@ GEM
       ffi (>= 0.5.0)
     rdiscount (2.1.7)
     redcarpet (3.1.2)
-    safe_yaml (1.0.3)
-    sass (3.3.13)
+    safe_yaml (1.0.4)
+    sass (3.4.8)
+    terminal-table (1.4.5)
     thread_safe (0.3.4)
-    timers (1.1.0)
-    toml (0.1.1)
+    timers (4.0.1)
+      hitimes
+    toml (0.1.2)
       parslet (~> 1.5.0)
-    tzinfo (1.2.1)
+    tzinfo (1.2.2)
       thread_safe (~> 0.1)
     yajl-ruby (1.1.0)
 

_less/bootswatch/bootstrap-core.less

@@ -17,7 +17,6 @@
 
 // Components
 @import "../../_bower_components/bootstrap/less/component-animations.less";
-//@import "../../_bower_components/bootstrap/less/glyphicons.less";
 @import "../../_bower_components/bootstrap/less/dropdowns.less";
 @import "../../_bower_components/bootstrap/less/button-groups.less";
 @import "../../_bower_components/bootstrap/less/input-groups.less";
@@ -35,8 +34,10 @@
 @import "../../_bower_components/bootstrap/less/media.less";
 @import "../../_bower_components/bootstrap/less/list-group.less";
 @import "../../_bower_components/bootstrap/less/panels.less";
+@import "../../_bower_components/bootstrap/less/responsive-embed.less";
 @import "../../_bower_components/bootstrap/less/wells.less";
 @import "../../_bower_components/bootstrap/less/close.less";
+// Components
 
 // Components w/ JavaScript
 @import "../../_bower_components/bootstrap/less/modals.less";

_less/bootswatch/bootstrap-cyborg-util.less

@@ -1,16 +1,11 @@
-// Cyborg 3.2.0
+// Cyborg 3.3.1
 // Bootswatch
 // -----------------------------------------------------
 
-@import url("//fonts.googleapis.com/css?family=Droid+Sans:400,700");
+@import url("//fonts.googleapis.com/css?family=Roboto:400,700");
 
 // Navbar =====================================================================
 
-.navbar {
-
-  border-bottom: 1px solid @gray-dark;
-}
-
 // Buttons ====================================================================
 
 // Typography =================================================================
@@ -46,11 +41,15 @@ table,
 .table {
   color: #fff;
 
-  a {
+  a:not(.btn) {
     color: #fff;
     text-decoration: underline;
   }
 
+  .dropdown-menu a {
+    text-decoration: none;
+  }
+
   .text-muted {
     color: @text-muted;
   }
@@ -161,6 +160,48 @@ a.thumbnail.active {
   border-color: @thumbnail-border;
 }
 
+a.list-group-item {
+
+  &.active,
+  &.active:hover,
+  &.active:focus {
+    border-color: @list-group-border;
+  }
+
+  &-success {
+    &.active {
+      background-color: @state-success-bg;
+    }
+
+    &.active:hover,
+    &.active:focus {
+      background-color: darken(@state-success-bg, 5%);
+    }
+  }
+
+  &-warning {
+    &.active {
+      background-color: @state-warning-bg;
+    }
+    
+    &.active:hover,
+    &.active:focus {
+      background-color: darken(@state-warning-bg, 5%);
+    }
+  }
+
+  &-danger {
+    &.active {
+      background-color: @state-danger-bg;
+    }
+    
+    &.active:hover,
+    &.active:focus {
+      background-color: darken(@state-danger-bg, 5%);
+    }
+  }
+}
+
 .jumbotron {
 
   h1, h2, h3, h4, h5, h6 {