chmod like a mofo and i dont care

enigma-io · Jun 5, 2015 · 3c66094 · 3c66094
1 parent 9c14cc1
commit 3c66094
Show file tree

Hide file tree

Showing 33 changed files with 76 additions and 56 deletions.
diff --git a/.gitignore b/.gitignore
diff --git a/Gemfile b/Gemfile
@@ -2,6 +2,9 @@
 # the following line to use "https"
 source 'http://rubygems.org'
 
+gem 'therubyracer'
+gem 'eventmachine',  github: "eventmachine/eventmachine"
+
 gem "middleman", "~>3.3.3"
 
 # Live-reloading plugin
@@ -11,4 +14,4 @@ gem "middleman-livereload", "~> 3.1.0"
 gem "wdm", "~> 0.1.0", :platforms => [:mswin, :mingw]
 
 # Windows does not come with time zone data
-gem "tzinfo-data", platforms: [:mswin, :mingw]
+gem "tzinfo-data", platforms: [:mswin, :mingw]
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,63 +1,77 @@
+GIT
+  remote: git://github.com/eventmachine/eventmachine.git
+  revision: 98b0d480091fd12a4a1f9294f75a5903d9215e06
+  specs:
+    eventmachine (1.0.7)
+
 GEM
   remote: http://rubygems.org/
   specs:
-    activesupport (4.1.1)
+    activesupport (4.1.10)
       i18n (~> 0.6, >= 0.6.9)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
       thread_safe (~> 0.1)
       tzinfo (~> 1.1)
-    chunky_png (1.3.1)
-    coffee-script (2.2.0)
+    celluloid (0.16.0)
+      timers (~> 4.0.0)
+    chunky_png (1.3.4)
+    coffee-script (2.4.1)
       coffee-script-source
       execjs
-    coffee-script-source (1.7.0)
-    compass (0.12.6)
+    coffee-script-source (1.9.1.1)
+    compass (1.0.3)
       chunky_png (~> 1.2)
-      fssm (>= 0.2.7)
-      sass (~> 3.2.19)
-    compass-import-once (1.0.4)
+      compass-core (~> 1.0.2)
+      compass-import-once (~> 1.0.5)
+      rb-fsevent (>= 0.9.3)
+      rb-inotify (>= 0.9)
+      sass (>= 3.3.13, < 3.5)
+    compass-core (1.0.3)
+      multi_json (~> 1.0)
+      sass (>= 3.3.0, < 3.5)
+    compass-import-once (1.0.5)
       sass (>= 3.2, < 3.5)
     em-websocket (0.5.1)
       eventmachine (>= 0.12.9)
       http_parser.rb (~> 0.6.0)
     erubis (2.7.0)
-    eventmachine (1.0.3)
-    execjs (2.2.0)
-    ffi (1.9.3)
-    fssm (0.2.10)
-    haml (4.0.5)
+    execjs (2.5.2)
+    ffi (1.9.8)
+    haml (4.0.6)
       tilt
     hike (1.2.3)
+    hitimes (1.2.2)
     hooks (0.4.0)
       uber (~> 0.0.4)
     http_parser.rb (0.6.0)
-    i18n (0.6.9)
-    json (1.8.1)
-    kramdown (1.4.0)
-    listen (1.3.1)
+    i18n (0.7.0)
+    json (1.8.3)
+    kramdown (1.7.0)
+    libv8 (3.16.14.7)
+    listen (2.10.0)
+      celluloid (~> 0.16.0)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
-      rb-kqueue (>= 0.2)
-    middleman (3.3.3)
-      coffee-script (~> 2.2.0)
-      compass (>= 0.12.4)
-      compass-import-once (= 1.0.4)
+    middleman (3.3.12)
+      coffee-script (~> 2.2)
+      compass (>= 1.0.0, < 2.0.0)
+      compass-import-once (= 1.0.5)
       execjs (~> 2.0)
       haml (>= 4.0.5)
       kramdown (~> 1.2)
-      middleman-core (= 3.3.3)
+      middleman-core (= 3.3.12)
       middleman-sprockets (>= 3.1.2)
-      sass (>= 3.2.17, < 4.0)
+      sass (>= 3.4.0, < 4.0)
       uglifier (~> 2.5)
-    middleman-core (3.3.3)
+    middleman-core (3.3.12)
       activesupport (~> 4.1.0)
       bundler (~> 1.1)
       erubis
       hooks (~> 0.3)
-      i18n (~> 0.6.9)
-      listen (~> 1.1)
-      padrino-helpers (~> 0.12.1)
+      i18n (~> 0.7.0)
+      listen (>= 2.7.9, < 3.0)
+      padrino-helpers (~> 0.12.3)
       rack (>= 1.4.5, < 2.0)
       rack-test (~> 0.6.2)
       thor (>= 0.15.2, < 2.0)
@@ -67,58 +81,61 @@ GEM
       middleman-core (>= 3.0.2)
       multi_json (~> 1.0)
       rack-livereload
-    middleman-sprockets (3.3.3)
-      middleman-core (>= 3.2)
-      sprockets (~> 2.2)
+    middleman-sprockets (3.4.2)
+      middleman-core (>= 3.3)
+      sprockets (~> 2.12.1)
       sprockets-helpers (~> 1.1.0)
-      sprockets-sass (~> 1.1.0)
-    minitest (5.3.5)
-    multi_json (1.10.1)
-    padrino-helpers (0.12.2)
+      sprockets-sass (~> 1.3.0)
+    minitest (5.7.0)
+    multi_json (1.11.0)
+    padrino-helpers (0.12.5)
       i18n (~> 0.6, >= 0.6.7)
-      padrino-support (= 0.12.2)
+      padrino-support (= 0.12.5)
       tilt (~> 1.4.1)
-    padrino-support (0.12.2)
+    padrino-support (0.12.5)
       activesupport (>= 3.1)
-    rack (1.5.2)
+    rack (1.6.1)
     rack-livereload (0.3.15)
       rack
-    rack-test (0.6.2)
+    rack-test (0.6.3)
       rack (>= 1.0)
-    rb-fsevent (0.9.4)
+    rb-fsevent (0.9.5)
     rb-inotify (0.9.5)
       ffi (>= 0.5.0)
-    rb-kqueue (0.2.3)
-      ffi (>= 0.5.0)
-    sass (3.2.19)
-    sprockets (2.12.1)
+    ref (1.0.5)
+    sass (3.4.14)
+    sprockets (2.12.3)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
     sprockets-helpers (1.1.0)
       sprockets (~> 2.0)
-    sprockets-sass (1.1.0)
+    sprockets-sass (1.3.1)
       sprockets (~> 2.0)
       tilt (~> 1.1)
+    therubyracer (0.12.2)
+      libv8 (~> 3.16.14.0)
+      ref
     thor (0.19.1)
-    thread_safe (0.3.4)
+    thread_safe (0.3.5)
     tilt (1.4.1)
-    tzinfo (1.2.1)
+    timers (4.0.1)
+      hitimes
+    tzinfo (1.2.2)
       thread_safe (~> 0.1)
-    uber (0.0.6)
-    uglifier (2.5.1)
+    uber (0.0.13)
+    uglifier (2.7.1)
       execjs (>= 0.3.0)
       json (>= 1.8.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  eventmachine!
   middleman (~> 3.3.3)
   middleman-livereload (~> 3.1.0)
+  therubyracer
   tzinfo-data
   wdm (~> 0.1.0)
-
-BUNDLED WITH
-   1.10.3
diff --git a/LICENSE b/LICENSE
diff --git a/Procfile b/Procfile
diff --git a/README.md b/README.md
diff --git a/config.rb b/config.rb
diff --git a/readme.png b/readme.png
diff --git a/source/images/black.png b/source/images/black.png
diff --git a/source/images/white.png b/source/images/white.png
diff --git a/source/index.html.erb b/source/index.html.erb
diff --git a/source/javascripts/application.js b/source/javascripts/application.js
diff --git a/source/javascripts/helpers/font-monitor.js b/source/javascripts/helpers/font-monitor.js
diff --git a/source/javascripts/main.js b/source/javascripts/main.js
diff --git a/source/javascripts/models/meme.js b/source/javascripts/models/meme.js
diff --git a/source/javascripts/settings.js.erb b/source/javascripts/settings.js.erb
@@ -9,7 +9,7 @@ var MEME_SETTINGS = {
   fontFamily: 'Avenir Light',
   // Font family options: set to empty array to disable font selector.
   // These options may also be formatted as {text:'Knockout', value:'"Knockout 28 B"'}.
-  fontFamilyOpts: ['Avenir Light', 'Helvetica Neue', 'Comic Sans MS'],
+  fontFamilyOpts: ['Avenir Light', 'Helvetica Neue', 'Avenir Book'],
 
   // Font size of main headline:
   fontSize: 24,
@@ -47,7 +47,7 @@ var MEME_SETTINGS = {
   watermarkMaxWidthRatio: 0.25, // Maximum allowed width of watermark (percentage of total canvas width).
 
   // Path to the watermark image source, or blank for no watermark:
-  // Alternatively, use '<%= asset_data_uri("vox.png") %>' to populate the watermark with base64 data, avoiding Cross-Origin issues.
+  // Alternatively, use '<%= asset_data_uri("white.png") %>' to populate the watermark with base64 data, avoiding Cross-Origin issues.
   watermarkSrc: (localStorage && localStorage.getItem('meme_watermark')) || '<%= image_path("white.png") %>',
 
   // Watermark image options: set to empty array to disable watermark picker.
@@ -59,4 +59,4 @@ var MEME_SETTINGS = {
   ],
 
   width: 755 // Canvas rendering width.
-};
+};
diff --git a/source/javascripts/vendor/backbone.js b/source/javascripts/vendor/backbone.js
diff --git a/source/javascripts/vendor/jquery.js b/source/javascripts/vendor/jquery.js
diff --git a/source/javascripts/vendor/underscore.js b/source/javascripts/vendor/underscore.js
diff --git a/source/javascripts/views/meme-canvas.js b/source/javascripts/views/meme-canvas.js
diff --git a/source/javascripts/views/meme-editor.js b/source/javascripts/views/meme-editor.js
diff --git a/source/layouts/layout.erb b/source/layouts/layout.erb
diff --git a/source/partials/_canvas.html.erb b/source/partials/_canvas.html.erb
diff --git a/source/partials/_editor.html.erb b/source/partials/_editor.html.erb
diff --git a/source/partials/_head.html.erb b/source/partials/_head.html.erb
diff --git a/source/stylesheets/_fonts.scss b/source/stylesheets/_fonts.scss
diff --git a/source/stylesheets/_globals.scss b/source/stylesheets/_globals.scss
diff --git a/source/stylesheets/_vars.scss b/source/stylesheets/_vars.scss
diff --git a/source/stylesheets/main.scss b/source/stylesheets/main.scss
diff --git a/source/stylesheets/modules/_forms.scss b/source/stylesheets/modules/_forms.scss
diff --git a/source/stylesheets/modules/_m-canvas.scss b/source/stylesheets/modules/_m-canvas.scss
diff --git a/source/stylesheets/modules/_m-editor.scss b/source/stylesheets/modules/_m-editor.scss
diff --git a/source/stylesheets/modules/_m-meme.scss b/source/stylesheets/modules/_m-meme.scss