Update Rails, fix S3 and update Fancybox.

Gemfile

@@ -1,6 +1,6 @@
 source 'http://rubygems.org'
 
-gem 'rails', '~> 3.1.1'
+gem 'rails', '~> 3.2.0'
 
 # Bundle edge Rails instead:
 # gem 'rails', :git => 'git://github.com/rails/rails.git'
@@ -8,8 +8,8 @@ gem 'rails', '~> 3.1.1'
 # Gems used only for assets and not required
 # in production environments by default.
 group :assets do
-  gem 'sass-rails', "  ~> 3.1.0"
+  gem 'sass-rails', "  ~> 3.2.0"
-  gem 'coffee-rails', "~> 3.1.0"
+  gem 'coffee-rails', "~> 3.2.0"
   gem 'uglifier'
 end
 
@@ -28,7 +28,7 @@ gem 'jquery-rails'
 # gem 'bj'
 # gem 'nokogiri'
 # gem 'sqlite3-ruby', :require => 'sqlite3'
-gem 'aws-s3', :require => 'aws/s3'
+gem 'aws-sdk'
 
 # Bundle gems for the local environment. Make sure to
 # put test-only gems in this group so their generators
@@ -42,7 +42,7 @@ end
 
 gem "newrelic_rpm"
 
-gem 'sass-rails', "~> 3.1.0"
+gem 'sass-rails', "~> 3.2.0"
 gem "exception_notification", :git => "git://github.com/rails/exception_notification", :require => 'exception_notifier'
 gem 'pg'
 gem 'devise'

Gemfile.lock

@@ -7,164 +7,173 @@ GIT
 GEM
   remote: http://rubygems.org/
   specs:
-    RedCloth (4.2.8)
+    RedCloth (4.2.9)
-    actionmailer (3.1.10)
+    actionmailer (3.2.11)
-      actionpack (= 3.1.10)
+      actionpack (= 3.2.11)
-      mail (~> 2.3.3)
+      mail (~> 2.4.4)
-    actionpack (3.1.10)
+    actionpack (3.2.11)
-      activemodel (= 3.1.10)
+      activemodel (= 3.2.11)
-      activesupport (= 3.1.10)
+      activesupport (= 3.2.11)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
-      i18n (~> 0.6)
+      journey (~> 1.0.4)
-      rack (~> 1.3.6)
+      rack (~> 1.4.0)
       rack-cache (~> 1.2)
-      rack-mount (~> 0.8.2)
       rack-test (~> 0.6.1)
-      sprockets (~> 2.0.4)
+      sprockets (~> 2.2.1)
-    activemodel (3.1.10)
+    activemodel (3.2.11)
-      activesupport (= 3.1.10)
+      activesupport (= 3.2.11)
       builder (~> 3.0.0)
-      i18n (~> 0.6)
+    activerecord (3.2.11)
-    activerecord (3.1.10)
+      activemodel (= 3.2.11)
-      activemodel (= 3.1.10)
+      activesupport (= 3.2.11)
-      activesupport (= 3.1.10)
+      arel (~> 3.0.2)
-      arel (~> 2.2.3)
       tzinfo (~> 0.3.29)
-    activeresource (3.1.10)
+    activeresource (3.2.11)
-      activemodel (= 3.1.10)
+      activemodel (= 3.2.11)
-      activesupport (= 3.1.10)
+      activesupport (= 3.2.11)
-    activesupport (3.1.10)
+    activesupport (3.2.11)
-      multi_json (>= 1.0, < 1.3)
+      i18n (~> 0.6)
-    acts_as_markup (1.3.4)
+      multi_json (~> 1.0)
+    acts_as_markup (1.4.2)
+      RedCloth
       RedCloth (~> 4.2)
+      activerecord
       activerecord (>= 2.3.2)
+      activesupport
       activesupport (>= 2.3.2)
+      rdiscount
       rdiscount (~> 1.3)
+      wikicloth
       wikitext (~> 2.0)
-    arel (2.2.3)
+    arel (3.0.2)
-    aws-s3 (0.6.2)
+    aws-sdk (1.8.1.1)
-      builder
+      json (~> 1.4)
-      mime-types
+      nokogiri (>= 1.4.4)
-      xml-simple
+      uuidtools (~> 2.1)
     bcrypt-ruby (3.0.1)
     builder (3.0.4)
-    cocaine (0.2.0)
+    cocaine (0.4.2)
-    coffee-rails (3.1.1)
+    coffee-rails (3.2.2)
       coffee-script (>= 2.2.0)
-      railties (~> 3.1.0)
+      railties (~> 3.2.0)
     coffee-script (2.2.0)
       coffee-script-source
       execjs
-    coffee-script-source (1.1.2)
+    coffee-script-source (1.4.0)
-    devise (1.4.9)
+    devise (2.2.3)
       bcrypt-ruby (~> 3.0)
-      orm_adapter (~> 0.0.3)
+      orm_adapter (~> 0.1)
-      warden (~> 1.0.3)
+      railties (~> 3.1)
+      warden (~> 1.2.1)
     erubis (2.7.0)
-    execjs (1.2.9)
+    execjs (1.4.0)
       multi_json (~> 1.0)
-    formtastic (2.0.2)
+    expression_parser (0.9.0)
-      rails (~> 3.0)
+    formtastic (2.2.1)
-    haml (3.1.3)
+      actionpack (>= 3.0)
+    haml (3.1.7)
     hike (1.2.1)
-    hpricot (0.8.4)
+    hpricot (0.8.6)
     i18n (0.6.1)
-    jquery-rails (1.0.16)
+    journey (1.0.4)
-      railties (~> 3.0)
+    jquery-rails (2.2.0)
-      thor (~> 0.14)
+      railties (>= 3.0, < 5.0)
+      thor (>= 0.14, < 2.0)
     json (1.7.6)
-    mail (2.3.3)
+    mail (2.4.4)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     mime-types (1.19)
-    multi_json (1.2.0)
+    multi_json (1.5.0)
-    newrelic_rpm (3.5.4.33)
+    newrelic_rpm (3.5.6.46)
-    orm_adapter (0.0.5)
+    nokogiri (1.5.6)
-    paperclip (2.4.5)
+    orm_adapter (0.4.0)
-      activerecord (>= 2.3.0)
+    paperclip (3.4.0)
-      activesupport (>= 2.3.2)
+      activemodel (>= 3.0.0)
-      cocaine (>= 0.0.2)
+      activerecord (>= 3.0.0)
+      activesupport (>= 3.0.0)
+      cocaine (~> 0.4.0)
       mime-types
-    pg (0.11.0)
+    pg (0.14.1)
     polyamorous (0.5.0)
       activerecord (~> 3.0)
     polyglot (0.3.3)
-    powder (0.1.6)
+    powder (0.1.8)
       thor (>= 0.11.5)
-    rack (1.3.9)
+    rack (1.4.4)
     rack-cache (1.2)
       rack (>= 0.4)
-    rack-mount (0.8.3)
-      rack (>= 1.0.0)
     rack-ssl (1.3.3)
       rack
     rack-test (0.6.2)
       rack (>= 1.0)
-    rails (3.1.10)
+    rails (3.2.11)
-      actionmailer (= 3.1.10)
+      actionmailer (= 3.2.11)
-      actionpack (= 3.1.10)
+      actionpack (= 3.2.11)
-      activerecord (= 3.1.10)
+      activerecord (= 3.2.11)
-      activeresource (= 3.1.10)
+      activeresource (= 3.2.11)
-      activesupport (= 3.1.10)
+      activesupport (= 3.2.11)
       bundler (~> 1.0)
-      railties (= 3.1.10)
+      railties (= 3.2.11)
-    railties (3.1.10)
+    railties (3.2.11)
-      actionpack (= 3.1.10)
+      actionpack (= 3.2.11)
-      activesupport (= 3.1.10)
+      activesupport (= 3.2.11)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
-      thor (~> 0.14.6)
+      thor (>= 0.14.6, < 2.0)
     rake (10.0.3)
     rdiscount (1.6.8)
     rdoc (3.12)
       json (~> 1.4)
-    ruby_parser (2.3.1)
+    ruby_parser (3.1.1)
-      sexp_processor (~> 3.0)
+      sexp_processor (~> 4.1)
-    sass (3.1.10)
+    sass (3.2.5)
-    sass-rails (3.1.4)
+    sass-rails (3.2.6)
-      actionpack (~> 3.1.0)
+      railties (~> 3.2.0)
-      railties (~> 3.1.0)
+      sass (>= 3.1.10)
-      sass (>= 3.1.4)
+      tilt (~> 1.3)
-      sprockets (~> 2.0.0)
+    sexp_processor (4.1.4)
-      tilt (~> 1.3.2)
+    sprockets (2.2.2)
-    sexp_processor (3.0.7)
-    sprockets (2.0.4)
       hike (~> 1.2)
+      multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sqlite3 (1.3.4)
+    sqlite3 (1.3.7)
     sqlite3-ruby (1.3.3)
       sqlite3 (>= 1.3.3)
-    squeel (0.9.3)
+    squeel (1.0.15)
       activerecord (~> 3.0)
       activesupport (~> 3.0)
       polyamorous (~> 0.5.0)
-    thor (0.14.6)
+    thor (0.17.0)
     tilt (1.3.3)
     treetop (1.4.12)
       polyglot
       polyglot (>= 0.3.1)
     tzinfo (0.3.35)
-    uglifier (1.0.4)
+    uglifier (1.3.0)
       execjs (>= 0.3.0)
-      multi_json (>= 1.0.2)
+      multi_json (~> 1.0, >= 1.0.2)
-    warden (1.0.6)
+    uuidtools (2.1.3)
+    warden (1.2.1)
       rack (>= 1.0)
+    wikicloth (0.8.0)
+      builder
+      expression_parser
     wikitext (2.1.1)
-    will_paginate (3.0.2)
+    will_paginate (3.0.4)
-    xml-simple (1.1.1)
+    yaml_db (0.2.3)
-    yaml_db (0.2.2)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   acts_as_markup
-  aws-s3
+  aws-sdk
-  coffee-rails (~> 3.1.0)
+  coffee-rails (~> 3.2.0)
   devise
   exception_notification!
   formtastic
@@ -175,10 +184,10 @@ DEPENDENCIES
   paperclip
   pg
   powder
-  rails (~> 3.1.1)
+  rails (~> 3.2.0)
   rdiscount
   ruby_parser
-  sass-rails (~> 3.1.0)
+  sass-rails (~> 3.2.0)
   sqlite3-ruby
   squeel
   uglifier

app/assets/javascripts/photos.js

@@ -15,7 +15,7 @@ $(document).ready(function() {
                     email: true
                 },
                 'contact[message]': "required",
-            
+
             },
             messages: {
                 'contact[email]': {

app/models/photo.rb

@@ -13,7 +13,7 @@ class Photo < ActiveRecord::Base
                       :s3_protocol => "https",
                       :path => ":attachment/:id/:style.:extension",
                       :bucket => 'danbarberphoto',
-                      :url  => ":s3_eu_url"
+                      :url => ':s3_domain_url'
 
     #after_create :get_exif
     

app/views/layouts/photos.html.erb

@@ -36,7 +36,7 @@
 
       </div>
 
-      <%= render :partial => 'shared/analytics' %>
+      <%= render :partial => 'shared/analytics' if Rails.env.production? %>
 
     </body>
 

app/views/shared/_analytics.html.erb

@@ -1,13 +1,13 @@
 <script type="text/javascript">
 
-      var _gaq = _gaq || [];
+  var _gaq = _gaq || [];
-      _gaq.push(['_setAccount', 'UA-603600-4']);
+  _gaq.push(['_setAccount', 'UA-603600-4']);
-      _gaq.push(['_trackPageview']);
+  _gaq.push(['_trackPageview']);
 
-      (function() {
+  (function() {
-        var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
-        ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
-        var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
-      })();
+  })();
 
 </script>

config/initializers/paperclip.rb

@@ -1,9 +0,0 @@
-Paperclip.interpolates(:s3_eu_url) do |att, style|
-    "#{att.s3_protocol}://s3-eu-west-1.amazonaws.com/#{att.bucket_name}/#{att.path(style)}"
-end
-
-module AWS
-    module S3
-        DEFAULT_HOST = "s3-eu-west-1.amazonaws.com"
-    end
-end

vendor/assets/stylesheets/fancybox.css

@@ -1,359 +1,249 @@
-/*
+/*! fancyBox v2.1.4 fancyapps.com | fancyapps.com/fancybox/#license */
- * FancyBox - jQuery Plugin
+.fancybox-wrap,
- * Simple and fancy lightbox alternative
+.fancybox-skin,
- *
+.fancybox-outer,
- * Examples and documentation at: http://fancybox.net
+.fancybox-inner,
- * 
+.fancybox-image,
- * Copyright (c) 2008 - 2010 Janis Skarnelis
+.fancybox-wrap iframe,
- * That said, it is hardly a one-person project. Many people have submitted bugs, code, and offered their advice freely. Their support is greatly appreciated.
+.fancybox-wrap object,
- * 
+.fancybox-nav,
- * Version: 1.3.4 (11/11/2010)
+.fancybox-nav span,
- * Requires: jQuery v1.3+
+.fancybox-tmp
- *
+{
- * Dual licensed under the MIT and GPL licenses:
+  padding: 0;
- *   http://www.opensource.org/licenses/mit-license.php
+  margin: 0;
- *   http://www.gnu.org/licenses/gpl.html
+  border: 0;
- */
+  outline: none;
-
+  vertical-align: top;
-#fancybox-loading {
+}
-	position: fixed;
+
-	top: 50%;
+.fancybox-wrap {
-	left: 50%;
+  position: absolute;
-	width: 40px;
+  top: 0;
-	height: 40px;
+  left: 0;
-	margin-top: -20px;
+  z-index: 8020;
-	margin-left: -20px;
+}
-	cursor: pointer;
+
-	overflow: hidden;
+.fancybox-skin {
-	z-index: 1104;
+  position: relative;
-	display: none;
+  background: #f9f9f9;
-}
+  color: #444;
-
+  text-shadow: none;
-#fancybox-loading div {
+  -webkit-border-radius: 4px;
-	position: absolute;
+  -moz-border-radius: 4px;
-	top: 0;
+  border-radius: 4px;
-	left: 0;
+}
-	width: 40px;
+
-	height: 480px;
+.fancybox-opened {
-	background-image: url('/assets/fancybox//assets/fancybox/fancybox.png');
+  z-index: 8030;
-}
+}
-
+
-#fancybox-overlay {
+.fancybox-opened .fancybox-skin {
-	position: absolute;
+  -webkit-box-shadow: 0 10px 25px rgba(0, 0, 0, 0.5);
-	top: 0;
+  -moz-box-shadow: 0 10px 25px rgba(0, 0, 0, 0.5);
-	left: 0;
+  box-shadow: 0 10px 25px rgba(0, 0, 0, 0.5);
-	width: 100%;
+}
-	z-index: 1100;
+
-	display: none;
+.fancybox-outer, .fancybox-inner {
-}
+  position: relative;
-
+}
-#fancybox-tmp {
+
-	padding: 0;
+.fancybox-inner {
-	margin: 0;
+  overflow: hidden;
-	border: 0;
+}
-	overflow: auto;
+
-	display: none;
+.fancybox-type-iframe .fancybox-inner {
-}
+  -webkit-overflow-scrolling: touch;
-
+}
-#fancybox-wrap {
+
-	position: absolute;
+.fancybox-error {
-	top: 0;
+  color: #444;
-	left: 0;
+  font: 14px/20px "Helvetica Neue",Helvetica,Arial,sans-serif;
-	padding: 20px;
+  margin: 0;
-	z-index: 1101;
+  padding: 15px;
-	outline: none;
+  white-space: nowrap;
-	display: none;
+}
-}
+
-
+.fancybox-image, .fancybox-iframe {
-#fancybox-outer {
+  display: block;
-	position: relative;
+  width: 100%;
-	width: 100%;
+  height: 100%;
-	height: 100%;
+}
-	background: #fff;
+
-}
+.fancybox-image {
-
+  max-width: 100%;
-#fancybox-content {
+  max-height: 100%;
-	width: 0;
+}
-	height: 0;
+
-	padding: 0;
+#fancybox-loading, .fancybox-close, .fancybox-prev span, .fancybox-next span {
-	outline: none;
+  background-image: url('/assets/fancybox/sprite.png');
-	position: relative;
+}
-	overflow: hidden;
+
-	z-index: 1102;
+#fancybox-loading {
-	border: 0px solid #fff;
+  position: fixed;
-}
+  top: 50%;
-
+  left: 50%;
-#fancybox-hide-sel-frame {
+  margin-top: -22px;
-	position: absolute;
+  margin-left: -22px;
-	top: 0;
+  background-position: 0 -108px;
-	left: 0;
+  opacity: 0.8;
-	width: 100%;
+  cursor: pointer;
-	height: 100%;
+  z-index: 8060;
-	background: transparent;
+}
-	z-index: 1101;
+
-}
+#fancybox-loading div {
-
+  width: 44px;
-#fancybox-close {
+  height: 44px;
-	position: absolute;
+  background: url('/assets/fancybox/loading.gif') center center no-repeat;
-	top: -15px;
+}
-	right: -15px;
+
-	width: 30px;
+.fancybox-close {
-	height: 30px;
+  position: absolute;
-	background: transparent url('/assets/fancybox/fancybox.png') -40px 0px;
+  top: -18px;
-	cursor: pointer;
+  right: -18px;
-	z-index: 1103;
+  width: 36px;
-	display: none;
+  height: 36px;
-}
+  cursor: pointer;
-
+  z-index: 8040;
-#fancybox-error {
+}
-	color: #444;
+
-	font: normal 12px/20px Arial;
+.fancybox-nav {
-	padding: 14px;
+  position: absolute;
-	margin: 0;
+  top: 0;
-}
+  width: 40%;
-
+  height: 100%;
-#fancybox-img {
+  cursor: pointer;
-	width: 100%;
+  text-decoration: none;
-	height: 100%;
+  background: transparent url('/assets/fancybox/blank.gif'); /* helps IE */
-	padding: 0;
+  -webkit-tap-highlight-color: rgba(0,0,0,0);
-	margin: 0;
+  z-index: 8040;
-	border: none;
+}
-	outline: none;
+
-	line-height: 0;
+.fancybox-prev {
-	vertical-align: top;
+  left: 0;
-}
+}
-
+
-#fancybox-frame {
+.fancybox-next {
-	width: 100%;
+  right: 0;
-	height: 100%;
+}
-	border: none;
+
-	display: block;
+.fancybox-nav span {
-}
+  position: absolute;
-
+  top: 50%;
-#fancybox-left, #fancybox-right {
+  width: 36px;
-	position: absolute;
+  height: 34px;
-	bottom: 0px;
+  margin-top: -18px;
-	height: 100%;
+  cursor: pointer;
-	width: 35%;
+  z-index: 8040;
-	cursor: pointer;
+  visibility: hidden;
-	outline: none;
+}
-	background: transparent url('/assets/fancybox/blank.gif');
+
-	z-index: 1102;
+.fancybox-prev span {
-	display: none;
+  left: 10px;
-}
+  background-position: 0 -36px;
-
+}
-#fancybox-left {
+
-	left: 0px;
+.fancybox-next span {
-}
+  right: 10px;
-
+  background-position: 0 -72px;
-#fancybox-right {
+}
-	right: 0px;
+
-}
+.fancybox-nav:hover span {
-
+  visibility: visible;
-#fancybox-left-ico, #fancybox-right-ico {
+}
-	position: absolute;
+
-	top: 50%;
+.fancybox-tmp {
-	left: -9999px;
+  position: absolute;
-	width: 30px;
+  top: -99999px;
-	height: 30px;
+  left: -99999px;
-	margin-top: -15px;
+  visibility: hidden;
-	cursor: pointer;
+  max-width: 99999px;
-	z-index: 1102;
+  max-height: 99999px;
-	display: block;
+  overflow: visible !important;
-}
+}
-
+
-#fancybox-left-ico {
+/* Overlay helper */
-	background-image: url('/assets/fancybox/fancybox.png');
+
-	background-position: -40px -30px;
+.fancybox-lock {
-}
+  overflow: hidden;
-
+}
-#fancybox-right-ico {
+
-	background-image: url('/assets/fancybox/fancybox.png');
+.fancybox-overlay {
-	background-position: -40px -60px;
+  position: absolute;
-}
+  top: 0;
-
+  left: 0;
-#fancybox-left:hover, #fancybox-right:hover {
+  overflow: hidden;
-	visibility: visible; /* IE6 */
+  display: none;
-}
+  z-index: 8010;
-
+  background: url('/assets/fancybox/overlay.png');
-#fancybox-left:hover span {
+}
-	left: 20px;
+
-}
+.fancybox-overlay-fixed {
-
+  position: fixed;
-#fancybox-right:hover span {
+  bottom: 0;
-	left: auto;
+  right: 0;
-	right: 20px;
+}
-}
+
-
+.fancybox-lock .fancybox-overlay {
-.fancybox-bg {
+  overflow: auto;
-	position: absolute;
+  overflow-y: scroll;
-	padding: 0;
+}
-	margin: 0;
+
-	border: 0;
+/* Title helper */
-	width: 20px;
+
-	height: 20px;
+.fancybox-title {
-	z-index: 1001;
+  visibility: hidden;
-}
+  font: normal 13px/20px "Helvetica Neue",Helvetica,Arial,sans-serif;
-
+  position: relative;
-#fancybox-bg-n {
+  text-shadow: none;
-	top: -20px;
+  z-index: 8050;
-	left: 0;
+}
-	width: 100%;
+
-	background-image: url('/assets/fancybox/fancybox-x.png');
+.fancybox-opened .fancybox-title {
-}
+  visibility: visible;
-
+}
-#fancybox-bg-ne {
+
-	top: -20px;
+.fancybox-title-float-wrap {
-	right: -20px;
+  position: absolute;
-	background-image: url('/assets/fancybox/fancybox.png');
+  bottom: 0;
-	background-position: -40px -162px;
+  right: 50%;
-}
+  margin-bottom: -35px;
-
+  z-index: 8050;
-#fancybox-bg-e {
+  text-align: center;
-	top: 0;
+}
-	right: -20px;
+
-	height: 100%;
+.fancybox-title-float-wrap .child {
-	background-image: url('/assets/fancybox/fancybox-y.png');
+  display: inline-block;
-	background-position: -20px 0px;
+  margin-right: -100%;
-}
+  padding: 2px 20px;
-
+  background: transparent; /* Fallback for web browsers that doesn't support RGBa */
-#fancybox-bg-se {
+  background: rgba(0, 0, 0, 0.8);
-	bottom: -20px;
+  -webkit-border-radius: 15px;
-	right: -20px;
+  -moz-border-radius: 15px;
-	background-image: url('/assets/fancybox/fancybox.png');
+  border-radius: 15px;
-	background-position: -40px -182px; 
+  text-shadow: 0 1px 2px #222;
-}
+  color: #FFF;
-
+  font-weight: bold;
-#fancybox-bg-s {
+  line-height: 24px;
-	bottom: -20px;
+  white-space: nowrap;
-	left: 0;
+}
-	width: 100%;
+
-	background-image: url('/assets/fancybox/fancybox-x.png');
+.fancybox-title-outside-wrap {
-	background-position: 0px -20px;
+  position: relative;
-}
+  margin-top: 10px;
-
+  color: #fff;
-#fancybox-bg-sw {
+}
-	bottom: -20px;
+
-	left: -20px;
+.fancybox-title-inside-wrap {
-	background-image: url('/assets/fancybox/fancybox.png');
+  padding-top: 10px;
-	background-position: -40px -142px;
+}
-}
+
-
+.fancybox-title-over-wrap {
-#fancybox-bg-w {
+  position: absolute;
-	top: 0;
+  bottom: 0;
-	left: -20px;
+  left: 0;
-	height: 100%;
+  color: #fff;
-	background-image: url('/assets/fancybox/fancybox-y.png');
+  padding: 10px;
-}
+  background: #000;
-
+  background: rgba(0, 0, 0, .8);
-#fancybox-bg-nw {
+}
-	top: -20px;
-	left: -20px;
-	background-image: url('/assets/fancybox/fancybox.png');
-	background-position: -40px -122px;
-}
-
-#fancybox-title {
-	font-family: Helvetica;
-	font-size: 12px;
-	z-index: 1102;
-}
-
-.fancybox-title-inside {
-	padding-bottom: 10px;
-	text-align: center;
-	color: #333;
-	background: #fff;
-	position: relative;
-}
-
-.fancybox-title-outside {
-	padding-top: 10px;
-	color: #fff;
-}
-
-.fancybox-title-over {
-	position: absolute;
-	bottom: 0;
-	left: 0;
-	color: #FFF;
-	text-align: left;
-}
-
-#fancybox-title-over {
-	padding: 10px;
-	background-image: url('/assets/fancybox/fancy_title_over.png');
-	display: block;
-}
-
-.fancybox-title-float {
-	position: absolute;
-	left: 0;
-	bottom: -20px;
-	height: 32px;
-}
-
-#fancybox-title-float-wrap {
-	border: none;
-	border-collapse: collapse;
-	width: auto;
-}
-
-#fancybox-title-float-wrap td {
-	border: none;
-	white-space: nowrap;
-}
-
-#fancybox-title-float-left {
-	padding: 0 0 0 15px;
-	background: url('/assets/fancybox/fancybox.png') -40px -90px no-repeat;
-}
-
-#fancybox-title-float-main {
-	color: #FFF;
-	line-height: 29px;
-	font-weight: bold;
-	padding: 0 0 3px 0;
-	background: url('/assets/fancybox/fancybox-x.png') 0px -40px;
-}
-
-#fancybox-title-float-right {
-	padding: 0 0 0 15px;
-	background: url('/assets/fancybox/fancybox.png') -55px -90px no-repeat;
-}
-
-/* IE6 */
-
-.fancybox-ie6 #fancybox-close { background: transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='fancybox/fancy_close.png', sizingMethod='scale'); }
-
-.fancybox-ie6 #fancybox-left-ico { background: transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='fancybox/fancy_nav_left.png', sizingMethod='scale'); }
-.fancybox-ie6 #fancybox-right-ico { background: transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='fancybox/fancy_nav_right.png', sizingMethod='scale'); }
-
-.fancybox-ie6 #fancybox-title-over { background: transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='fancybox/fancy_title_over.png', sizingMethod='scale'); zoom: 1; }
-.fancybox-ie6 #fancybox-title-float-left { background: transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='fancybox/fancy_title_left.png', sizingMethod='scale'); }
-.fancybox-ie6 #fancybox-title-float-main { background: transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='fancybox/fancy_title_main.png', sizingMethod='scale'); }
-.fancybox-ie6 #fancybox-title-float-right { background: transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='fancybox/fancy_title_right.png', sizingMethod='scale'); }
-
-.fancybox-ie6 #fancybox-bg-w, .fancybox-ie6 #fancybox-bg-e, .fancybox-ie6 #fancybox-left, .fancybox-ie6 #fancybox-right, #fancybox-hide-sel-frame {
-	height: expression(this.parentNode.clientHeight + "px");
-}
-
-#fancybox-loading.fancybox-ie6 {
-	position: absolute; margin-top: 0;
-	top: expression( (-20 + (document.documentElement.clientHeight ? document.documentElement.clientHeight/2 : document.body.clientHeight/2 ) + ( ignoreMe = document.documentElement.scrollTop ? document.documentElement.scrollTop : document.body.scrollTop )) + 'px');
-}
-
-#fancybox-loading.fancybox-ie6 div	{ background: transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='fancybox/fancy_loading.png', sizingMethod='scale'); }
-
-/* IE6, IE7, IE8 */
-
-.fancybox-ie .fancybox-bg { background: transparent !important; }
-
-.fancybox-ie #fancybox-bg-n { filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='fancybox/fancy_shadow_n.png', sizingMethod='scale'); }
-.fancybox-ie #fancybox-bg-ne { filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='fancybox/fancy_shadow_ne.png', sizingMethod='scale'); }
-.fancybox-ie #fancybox-bg-e { filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='fancybox/fancy_shadow_e.png', sizingMethod='scale'); }
-.fancybox-ie #fancybox-bg-se { filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='fancybox/fancy_shadow_se.png', sizingMethod='scale'); }
-.fancybox-ie #fancybox-bg-s { filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='fancybox/fancy_shadow_s.png', sizingMethod='scale'); }
-.fancybox-ie #fancybox-bg-sw { filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='fancybox/fancy_shadow_sw.png', sizingMethod='scale'); }
-.fancybox-ie #fancybox-bg-w { filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='fancybox/fancy_shadow_w.png', sizingMethod='scale'); }
-.fancybox-ie #fancybox-bg-nw { filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='fancybox/fancy_shadow_nw.png', sizingMethod='scale'); }