Merge branch 'release/v2.3.2'

Author: TheSeg

Gemfile.lock

@@ -2,7 +2,7 @@ GEM
   remote: https://rubygems.org/
   specs:
     RedCloth (4.2.9)
-    activesupport (4.1.1)
+    activesupport (4.1.2)
       i18n (~> 0.6, >= 0.6.9)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
@@ -65,7 +65,7 @@ GEM
       rb-kqueue (>= 0.2)
     maruku (0.7.0)
     mini_portile (0.6.0)
-    minitest (5.3.4)
+    minitest (5.3.5)
     nokogiri (1.6.2.1)
       mini_portile (= 0.6.0)
     parslet (1.5.0)
@@ -75,17 +75,17 @@ GEM
       posix-spawn (~> 0.3.6)
       yajl-ruby (~> 1.1.0)
     rb-fsevent (0.9.4)
-    rb-inotify (0.9.4)
+    rb-inotify (0.9.5)
       ffi (>= 0.5.0)
-    rb-kqueue (0.2.2)
+    rb-kqueue (0.2.3)
       ffi (>= 0.5.0)
     rdiscount (2.1.7)
     redcarpet (2.3.0)
     safe_yaml (1.0.3)
-    thread_safe (0.3.3)
+    thread_safe (0.3.4)
     toml (0.1.1)
       parslet (~> 1.5.0)
-    tzinfo (1.1.0)
+    tzinfo (1.2.1)
       thread_safe (~> 0.1)
     yajl-ruby (1.1.0)
 

_includes/content/speaking.html

@@ -0,0 +1,11 @@
+  <div class="row">
+    <div class="col-md-12">
+      <h2>Shipping the Empty Box: Releasing [string:titleOfGame] on [array:platforms]</h2>
+      <h3><a href="http://dev.paxsite.com/">PAX Dev</a> <small>August 2014, Seattle, WA</small></h3>
+    </div>
+    <div class="col-md-9 col-xs-12">
+      <p>Working on [string:titleOfGame], you need to release it on [array:platforms-0] and perhaps on [array:platforms-1] in the future. You have [int:NULL] time till release. Build engineer and programmer John “Seg” Seggerson (Telltale Games, John McNeil Studio, Domonique Pamplemousse) will help smooth the multi-platform release by outlining build engineering tips for platforms on desktop, mobile, console, and beyond. Increase artist, writer, and programmer efficiency with a set of core specifications and planning applied to existing platforms and future platforms. Skills and knowledge that will reduce release headaches for your [int:sizeOfTeam] team!</p>
+    </div>
+    <div class="col-md-3 hidden-xs hidden-sm">
+      <a href="http://dev.paxsite.com/"><img src="{{site.baseurl}}img/paxdevlogo.png" alt="PAX Dev" class="" /></a>
+  </div>

_less/bootswatch/bootstrap-cyborg-util.less

@@ -1,4 +1,4 @@
-// Cyborg 3.1.1
+// Cyborg 3.2.0
 // Bootswatch
 // -----------------------------------------------------
 
@@ -50,6 +50,10 @@ table,
     color: #fff;
     text-decoration: underline;
   }
+
+  .text-muted {
+    color: @text-muted;
+  }
 }
 
 .table-responsive > .table {
@@ -60,36 +64,42 @@ table,
 
 .has-warning {
   .help-block,
-  .control-label {
+  .control-label,
+  .form-control-feedback {
     color: @brand-warning;
   }
 
   .form-control,
-  .form-control:focus {
+  .form-control:focus,
+  .input-group-addon {
     border-color: @brand-warning;
   }
 }
 
 .has-error {
   .help-block,
-  .control-label {
+  .control-label,
+  .form-control-feedback {
     color: @brand-danger;
   }
 
   .form-control,
-  .form-control:focus {
+  .form-control:focus,
+  .input-group-addon {
     border-color: @brand-danger;
   }
 }
 
 .has-success {
   .help-block,
-  .control-label {
+  .control-label,
+  .form-control-feedback {
     color: @brand-success;
   }
 
   .form-control,
-  .form-control:focus {
+  .form-control:focus,
+  .input-group-addon {
     border-color: @brand-success;
   }
 }
@@ -104,15 +114,6 @@ legend {
 
 // Navs =======================================================================
 
-.nav {
-
-  .caret,
-  a:hover .caret {
-    border-top-color: #fff;
-    border-bottom-color: #fff;
-  }
-}
-
 .nav-tabs,
 .nav-pills,
 .breadcrumb,
@@ -134,22 +135,32 @@ legend {
   }
 
   .close {
-    color: #fff;
     text-decoration: none;
-    opacity: 0.4;
+  }
+}
+
+.close {
+  color: #fff;
+  text-decoration: none;
+  opacity: 0.4;
 
-    &:hover,
-    &:focus {
-      color: #fff;
-      opacity: 1;
-    }
+  &:hover,
+  &:focus {
+    color: #fff;
+    opacity: 1;
   }
 }
 
 // Progress bars ==============================================================
 
 // Containers =================================================================
 
+a.thumbnail:hover,
+a.thumbnail:focus,
+a.thumbnail.active {
+  border-color: @thumbnail-border;
+}
+
 .jumbotron {
 
   h1, h2, h3, h4, h5, h6 {

_less/bootswatch/bootstrap-cyborg-var.less

@@ -1,4 +1,4 @@
-// Cyborg 3.1.1
+// Cyborg 3.2.0
 // Variables
 // --------------------------------------------------
 
@@ -22,7 +22,7 @@
 
 //== Scaffolding
 //
-// ## Settings for some of the most global styles.
+//## Settings for some of the most global styles.
 
 //** Background color for `<body>`.
 @body-bg:               #060606;
@@ -68,14 +68,18 @@
 @headings-color:          #fff;
 
 
-//-- Iconography
+//== Iconography
 //
-//## Specify custom locations of the include Glyphicons icon font. Useful for those including Bootstrap via Bower.
+//## Specify custom location and filename of the included Glyphicons icon font. Useful for those including Bootstrap via Bower.
 
+//** Load fonts from this directory.
 @icon-font-path:          "../fonts/";
+//** File name for all font files.
 @icon-font-name:          "glyphicons-halflings-regular";
+//** Element ID within SVG icon file.
 @icon-font-svg-id:        "glyphicons_halflingsregular";
 
+
 //== Components
 //
 //## Define common padding and border radius sizes and more. Values based on 14px text and 1.428 line-height (~20px to start).
@@ -232,7 +236,7 @@
 //** Text color for headers within dropdown menus.
 @dropdown-header-color:          @text-muted;
 
-// Note: Deprecated @dropdown-caret-color as of v3.1.0
+//** Deprecated `@dropdown-caret-color` as of v3.1.0
 @dropdown-caret-color:           #000;
 
 
@@ -245,8 +249,8 @@
 
 @zindex-navbar:            1000;
 @zindex-dropdown:          1000;
-@zindex-popover:           1010;
-@zindex-tooltip:           1030;
+@zindex-popover:           1060;
+@zindex-tooltip:           1070;
 @zindex-navbar-fixed:      1030;
 @zindex-modal-background:  1040;
 @zindex-modal:             1050;
@@ -257,27 +261,32 @@
 //## Define the breakpoints at which your layout will change, adapting to different screen sizes.
 
 // Extra small screen / phone
-// Note: Deprecated @screen-xs and @screen-phone as of v3.0.1
+//** Deprecated `@screen-xs` as of v3.0.1
 @screen-xs:                  480px;
+//** Deprecated `@screen-xs-min` as of v3.2.0
 @screen-xs-min:              @screen-xs;
+//** Deprecated `@screen-phone` as of v3.0.1
 @screen-phone:               @screen-xs-min;
 
 // Small screen / tablet
-// Note: Deprecated @screen-sm and @screen-tablet as of v3.0.1
+//** Deprecated `@screen-sm` as of v3.0.1
 @screen-sm:                  768px;
 @screen-sm-min:              @screen-sm;
+//** Deprecated `@screen-tablet` as of v3.0.1
 @screen-tablet:              @screen-sm-min;
 
 // Medium screen / desktop
-// Note: Deprecated @screen-md and @screen-desktop as of v3.0.1
+//** Deprecated `@screen-md` as of v3.0.1
 @screen-md:                  992px;
 @screen-md-min:              @screen-md;
+//** Deprecated `@screen-desktop` as of v3.0.1
 @screen-desktop:             @screen-md-min;
 
 // Large screen / wide desktop
-// Note: Deprecated @screen-lg and @screen-lg-desktop as of v3.0.1
+//** Deprecated `@screen-lg` as of v3.0.1
 @screen-lg:                  1200px;
 @screen-lg-min:              @screen-lg;
+//** Deprecated `@screen-lg-desktop` as of v3.0.1
 @screen-lg-desktop:          @screen-lg-min;
 
 // So media queries don't overlap when required, provide a maximum
@@ -643,17 +652,26 @@
 //** List group border radius
 @list-group-border-radius:      @border-radius-base;
 
-//** Background color of single list elements on hover
+//** Background color of single list items on hover
 @list-group-hover-bg:           lighten(@list-group-bg, 15%);
-//** Text color of active list elements
+//** Text color of active list items
 @list-group-active-color:       @component-active-color;
-//** Background color of active list elements
+//** Background color of active list items
 @list-group-active-bg:          @component-active-bg;
 //** Border color of active list elements
 @list-group-active-border:      @list-group-active-bg;
+//** Text color for content within active list items
 @list-group-active-text-color:  lighten(@list-group-active-bg, 40%);
 
+//** Text color of disabled list items
+@list-group-disabled-color:      @gray-light;
+//** Background color of disabled list items
+@list-group-disabled-bg:         @gray-lighter;
+//** Text color for content within disabled list items
+@list-group-disabled-text-color: @list-group-disabled-color;
+
 @list-group-link-color:         @text-color;
+@list-group-link-hover-color:   @list-group-link-color;
 @list-group-link-heading-color: #fff;
 
 
@@ -663,6 +681,8 @@
 
 @panel-bg:                    @gray-darker;
 @panel-body-padding:          15px;
+@panel-heading-padding:       10px 15px;
+@panel-footer-padding:        @panel-heading-padding;
 @panel-border-radius:         @border-radius-base;
 
 //** Border color for elements within panels
@@ -701,9 +721,9 @@
 //** Padding around the thumbnail image
 @thumbnail-padding:           4px;
 //** Thumbnail background color
-@thumbnail-bg:                @body-bg;
+@thumbnail-bg:                @gray-dark;
 //** Thumbnail border color
-@thumbnail-border:            #ddd;
+@thumbnail-border:            @gray-dark;
 //** Thumbnail border radius
 @thumbnail-border-radius:     @border-radius-base;
 
@@ -802,6 +822,8 @@
 //
 //##
 
+//** Horizontal offset for forms and lists.
+@component-offset-horizontal: 180px;
 //** Text muted color
 @text-muted:                  @gray-light;
 //** Abbreviations and acronyms border color
@@ -816,14 +838,9 @@
 @blockquote-border-color:     @gray-dark;
 //** Page header border color
 @page-header-border-color:    @gray-dark;
-
-
-//== Miscellaneous
-//
-//##
-
+//** Width of horizontal description list titles
+@dl-horizontal-offset:        @component-offset-horizontal;
 //** Horizontal line color.
 @hr-border:                   @gray-dark;
 
-//** Horizontal offset for forms and lists.
-@component-offset-horizontal: 180px;
+