Merge branch 'staging' into production

Vizzuality · Aug 28, 2012 · c79834b · c79834b
2 parents 96fb8ed + 654c432
commit c79834b
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/app/models/partner.rb b/app/models/partner.rb
@@ -21,7 +21,7 @@ class Partner < ActiveRecord::Base
   has_attached_file :logo, :styles => {
                                       :small => {
                                         :geometry => '80x46>',
-                                        :format => 'jpg'
+                                        :format => 'png'
                                       }
                                     },
                             :url => "/system/partners/:attachment/:id/:style.:extension"

diff --git a/app/models/user.rb b/app/models/user.rb
@@ -58,11 +58,11 @@ def email=(value)
   end
 
   def password=(value)
-    write_attribute :password, (value ? value.strip : nil)
+    @password = value ? value.strip : nil
   end
 
   def password_confirmation=(value)
-    write_attribute :password_confirmation, (value ? value.strip : nil)
+    @password_confirmation = value ? value.strip : nil
   end
 
   def admin?

diff --git a/public/stylesheets/sites/layout.css b/public/stylesheets/sites/layout.css
@@ -285,8 +285,8 @@ div#left_column div.right h3 ul.download li a:hover {text-decoration: underline;
 div#left_column div.right h3.withlogo {width:300px}
 div#left_column div.right div#sponsor {position: absolute; right: 0; top: 0px;}
 div#left_column div.right div#sponsor span {float: left; vertical-align: top; padding: 21px 0 0 0; font: normal 13px "PT Sans Bold"; color:#999999; text-shadow:0 1px white; text-transform:uppercase;}
-div#left_column div.right div#sponsor div#logo {float: left;; width: 101px; padding: 15px 0 0 0; text-align: center; background: url('/images/sites/home/sponsor_frame.png');}
-div#left_column div.right div#sponsor div#logo_bottom_border{position: absolute; width: 101px; height: 10px; padding: 0; text-align: center; background: url('/images/sites/home/sponsor_frame_bottom.png'); right: 0; bottom: -10px;}
+div#left_column div.right div#sponsor div#logo {float: left;; width: 101px; padding: 15px 0 0 0; text-align: center; }
+div#left_column div.right div#sponsor div#logo_bottom_border{position: absolute; width: 101px; height: 10px; padding: 0; text-align: center; right: 0; bottom: -10px;}
 div#left_column div.right ul {width:100%; padding:0!important;}
 div#left_column div.right ul li {width:572px; height:74px; padding:20px 26px 20px 34px;}
 div#left_column div.right ul li.even {background:url('/images/sites/regions/even_bkg.png') repeat-x 0 0;}