Merge remote branch 'upstream/master'

Conflicts: rstatus.rb
pfhawkins · Mar 27, 2011 · 1288eff · 1288eff
2 parents 92736b7 + 9aa2dd7
commit 1288eff
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 5 deletions.
diff --git a/public/s/screen.css b/public/s/screen.css
diff --git a/test/rstatus_test.rb b/test/rstatus_test.rb
@@ -276,6 +276,13 @@ def test_facebook_username
     assert_match /\//, page.current_url
   end
 
+  def test_profile_php_rename_user
+    existing_user = Factory.build(:user, :username => 'profile.php?id=12345')
+    log_in_fb(existing_user)
+    click_link "reset_username"
+    assert_match /\/reset-username/, page.current_url
+  end
+
   def test_junk_username_gives_404
     visit "/users/1n2i12399992sjdsa21293jj"
     assert_equal 404, page.status_code

diff --git a/views/_username_error.haml b/views/_username_error.haml
@@ -2,4 +2,4 @@
   %p Warning: your username is currently empty or invalid.
   %p 
     Please 
-    %a{:href=>"/reset-username"}click here to reset your username.
+    %a{:href=>"/reset-username", :id=>"reset_username"}click here to reset your username.
diff --git a/views/screen.scss b/views/screen.scss
@@ -2,7 +2,7 @@
 
 Use the following command:
 
-rake css:compile
+rake scss
 
 Do not edit screen.css manually!
 

diff --git a/views/stylesheets/content.scss b/views/stylesheets/content.scss
@@ -140,11 +140,14 @@ form#update-form {
       float: left;
     }    
     #update-count {
+      font-size: 1.1em;
       .update-count {
-        font-size: 180%;
+        color: #666;
+        padding-right: 0.2em;
       }
-      color: #999;
+      color: #aaa;
       padding-left: 0.75em;
+      padding-top: 0.6em;
     }
   }
   #update-info.negative #update-count .update-count {