Merge branch 'release/0.5.0.0-RC' into develop

diaspora · Apr 21, 2015 · 9a9cf6f · 9a9cf6f
2 parents 9d49167 + 2d3c068
commit 9a9cf6f
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 11 deletions.
diff --git a/Changelog.md b/Changelog.md
@@ -180,6 +180,7 @@ diaspora* no longer adds a `div.container` to wrap custom splash pages. This add
 * Update help section [#5857](https://github.com/diaspora/diaspora/pull/5857) [#5859](https://github.com/diaspora/diaspora/pull/5859)
 * Fix asset precompilation check in script/server [#5863](https://github.com/diaspora/diaspora/pull/5863)
 * Convert MySQL databases to utf8mb4 [#5530](https://github.com/diaspora/diaspora/pull/5530) [#5624](https://github.com/diaspora/diaspora/pull/5624) [#5865](https://github.com/diaspora/diaspora/pull/5865)
+* Don't upcase labels on mobile sign up/sign in [#5872](https://github.com/diaspora/diaspora/pull/5872)
 
 ## Features
 * Don't pull jQuery from a CDN by default [#5105](https://github.com/diaspora/diaspora/pull/5105)

diff --git a/app/assets/stylesheets/mobile/mobile.scss b/app/assets/stylesheets/mobile/mobile.scss
@@ -154,6 +154,7 @@ h3 {
 
   .login-container {
     padding: 10px;
+    label, legend { text-transform: uppercase; }
   }
 }
 

diff --git a/app/views/registrations/new.mobile.haml b/app/views/registrations/new.mobile.haml
@@ -18,25 +18,25 @@
         %fieldset
           %legend
             = image_tag('branding/header-logo2x.png', :height => 40, :width => 40)
-            = t('aspects.aspect_stream.make_something').upcase
+            = t('aspects.aspect_stream.make_something')
 
           .control-group
-            = f.label :username, t('username').upcase
+            = f.label :username, t('username')
             .controls
               = f.text_field :username, :placeholder => "jedi_guy"
 
             .control-group
-              = f.label :email, t('email').upcase
+              = f.label :email, t('email')
               .controls
                 = f.text_field :email, :placeholder => "luke@hoth.net"
 
             .control-group
-              = f.label :password, t('password').upcase
+              = f.label :password, t('password')
               .controls
                 = f.password_field :password, :placeholder => "••••••••"
 
             .control-group
-              = f.label :password_confirmation, t('password_confirmation').upcase
+              = f.label :password_confirmation, t('password_confirmation')
               .controls
                 = f.password_field :password_confirmation, :placeholder => "••••••••"
 
@@ -50,7 +50,7 @@
 
             .controls
               = f.submit t('registrations.new.create_my_account'), :class => 'btn primary', :disable_with => t('registrations.new.submitting')
-              = link_to t('devise.sessions.new.sign_in'), new_user_session_path(), :class => 'btn primary', :style => "float: right;"
+              = link_to t('devise.sessions.new.sign_in'), new_user_session_path(), :class => 'btn btn-link', :style => "float: right;"
 
 %footer
   = link_to t('layouts.application.toggle'), toggle_mobile_path
diff --git a/app/views/sessions/new.mobile.haml b/app/views/sessions/new.mobile.haml
@@ -22,15 +22,15 @@
           %fieldset
             %legend
               = image_tag('branding/header-logo2x.png', :height => 40, :width => 40)
-              = t('devise.sessions.new.login').upcase
-          
+              = t('devise.sessions.new.login')
+
             .control-group
-              = f.label :username, t('username').upcase
+              = f.label :username, t('username')
               .controls
                 = f.text_field :username, :autofocus => true
 
             .control-group
-              = f.label :password , t('password').upcase
+              = f.label :password , t('password')
               .controls
                 = f.password_field :password
 
@@ -39,7 +39,7 @@
             .controls
               = f.submit t('devise.sessions.new.sign_in'), :class => 'btn primary'
               - if display_registration_link?
-                = link_to t('devise.shared.links.sign_up'), new_registration_path(resource_name), :class => 'btn primary', :style => "float: right;"
+                = link_to t('devise.shared.links.sign_up'), new_registration_path(resource_name), :class => 'btn btn-link', :style => "float: right;"
 
   %footer
     - if display_password_reset_link?