Fix merge

joegattnet · Oct 17, 2013 · 17e4ac4 · 17e4ac4
1 parent 6c10003
commit 17e4ac4
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/app/assets/stylesheets/themes/default.css.sass b/app/assets/stylesheets/themes/default.css.sass
@@ -737,7 +737,8 @@ blockquote
   +pass_media_query('screen-and-min-width-1024px')
 
   iframe
-    +span-columns(9, 9)
+    +span-columns(9)
+    +suffix(3)
 
   article
     header

diff --git a/app/helpers/resources_helper.rb b/app/helpers/resources_helper.rb
@@ -36,7 +36,7 @@ def cut_image_binary(local_file_name, format, aspect_x, aspect_y, width, snap, g
     file_name_template = image_record.template_location(aspect_x, aspect_y)
     file_name_out = image_record.cut_location(aspect_x, aspect_y, width, snap, gravity, effects)
 
-    # Shorthand: small integers are taken to be number of columns rather than absolute width
+    # Shorthand: small integers are taken to be number of columns rather than absolute width 
     width = column_width(width) if width <= Settings.styling.total_columns
 
     # The height is derived from the aspect ratio and width.

diff --git a/config/locales/en.yml b/config/locales/en.yml
@@ -12,7 +12,7 @@ en:
 
   email:
     greeting: "Hi %{name}"
-    signature: 'nembrot.org'
+    signature: 'joegatt.net'
 
   site:
     title: 'joegatt.net'

diff --git a/config/settings.yml b/config/settings.yml
@@ -5,17 +5,17 @@ defaults: &defaults
   share: true
   admin:
     name: Joe
-    email: joe@nembrot.org
+    email: joe@joegatt.net
   monitoring:
     name: Joe
     email: monitoring@joegatt.net
   contact:
     name: Joe
-    email: joe@nembrot.org
+    email: joe@joegatt.net
   mailer:
     address: smtp.gmail.com
     port: 587
-    domain: mail.nembrot.org
+    domain: mail.joegatt.net
   google_analytics_key: 'UA-1346274-1'
   evernote:
     server: https://sandbox.evernote.com