From 972f0773dcda90ca7576a2ae7a1077518de6cb23 Mon Sep 17 00:00:00 2001
From: ccd0 <admin@containerchan.org>
Date: Sun, 8 Jun 2014 13:42:53 -0700
Subject: [PATCH] flex no longer needs to be prefixed in Chrome

---
 Gruntfile.coffee          |  2 --
 src/General/css/style.css | 24 ++++++++++++------------
 2 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/Gruntfile.coffee b/Gruntfile.coffee
index 9fcd25d93..5ff4a0a56 100755
--- a/Gruntfile.coffee
+++ b/Gruntfile.coffee
@@ -171,13 +171,11 @@ module.exports = (grunt) ->
     grunt.config 'pkg', pkg
 
     if type is 'crx'
-      pkg.flex      = '-webkit-flex'
       pkg.order     = '-webkit-order'
       pkg.align     = '-webkit-align'
       pkg.justify   = '-webkit-justify-content'
       pkg.transform = '-webkit-transform'
     else
-      pkg.flex      = 'flex'
       pkg.order     = 'order'
       pkg.align     = 'align'
       pkg.justify   = 'justify-content'
diff --git a/src/General/css/style.css b/src/General/css/style.css
index c0d65f5b4..9d1b6c6fa 100755
--- a/src/General/css/style.css
+++ b/src/General/css/style.css
@@ -1271,21 +1271,21 @@ div.boardTitle {
   left: 0;
   right: 0;
   z-index: 30;
-  display: <%= flex %>;
-  <%= flex %>-direction: row;
+  display: flex;
+  flex-direction: row;
   background: rgba(0,0,0,0.7);
 }
 .gal-viewport {
-  display: <%= flex %>;
+  display: flex;
   <%= align %>-items: stretch;
-  <%= flex %>-direction: row;
-  <%= flex %>: 1 1 auto;
+  flex-direction: row;
+  flex: 1 1 auto;
 }
 .gal-thumbnails {
-  <%= flex %>: 0 0 150px;
+  flex: 0 0 150px;
   overflow-y: auto;
-  display: <%= flex %>;
-  <%= flex %>-direction: column;
+  display: flex;
+  flex-direction: column;
   <%= align %>-items: stretch;
   text-align: center;
   background: rgba(0,0,0,.5);
@@ -1301,7 +1301,7 @@ div.boardTitle {
   width: auto;
 }
 .gal-thumb {
-  <%= flex %>: 0 0 auto;
+  flex: 0 0 auto;
   padding: 3px;
   line-height: 0;
   transition: background .2s linear;
@@ -1319,7 +1319,7 @@ div.boardTitle {
 }
 .gal-prev,
 .gal-next {
-  <%= flex %>: 0 0 20px;
+  flex: 0 0 20px;
   position: relative;
   cursor: pointer;
   opacity: 0.7;
@@ -1349,8 +1349,8 @@ div.boardTitle {
 }
 .gal-image {
   order: 1;
-  <%= flex %>: 1 0 auto;
-  display: <%= flex %>;
+  flex: 1 0 auto;
+  display: flex;
   <%= align %>-items: flex-start;
   <%= justify %>: space-around;
   overflow: hidden;