Fix uppercase registration/login labels and btn style
This commit is contained in:
parent
ae8735c2a3
commit
2d3c0680ea
4 changed files with 13 additions and 11 deletions
|
|
@ -165,6 +165,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)
|
* 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)
|
* 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)
|
* 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
|
## Features
|
||||||
* Don't pull jQuery from a CDN by default [#5105](https://github.com/diaspora/diaspora/pull/5105)
|
* Don't pull jQuery from a CDN by default [#5105](https://github.com/diaspora/diaspora/pull/5105)
|
||||||
|
|
|
||||||
|
|
@ -154,6 +154,7 @@ h3 {
|
||||||
|
|
||||||
.login-container {
|
.login-container {
|
||||||
padding: 10px;
|
padding: 10px;
|
||||||
|
label, legend { text-transform: uppercase; }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -18,25 +18,25 @@
|
||||||
%fieldset
|
%fieldset
|
||||||
%legend
|
%legend
|
||||||
= image_tag('branding/header-logo2x.png', :height => 40, :width => 40)
|
= 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
|
.control-group
|
||||||
= f.label :username, t('username').upcase
|
= f.label :username, t('username')
|
||||||
.controls
|
.controls
|
||||||
= f.text_field :username, :placeholder => "jedi_guy"
|
= f.text_field :username, :placeholder => "jedi_guy"
|
||||||
|
|
||||||
.control-group
|
.control-group
|
||||||
= f.label :email, t('email').upcase
|
= f.label :email, t('email')
|
||||||
.controls
|
.controls
|
||||||
= f.text_field :email, :placeholder => "luke@hoth.net"
|
= f.text_field :email, :placeholder => "luke@hoth.net"
|
||||||
|
|
||||||
.control-group
|
.control-group
|
||||||
= f.label :password, t('password').upcase
|
= f.label :password, t('password')
|
||||||
.controls
|
.controls
|
||||||
= f.password_field :password, :placeholder => "••••••••"
|
= f.password_field :password, :placeholder => "••••••••"
|
||||||
|
|
||||||
.control-group
|
.control-group
|
||||||
= f.label :password_confirmation, t('password_confirmation').upcase
|
= f.label :password_confirmation, t('password_confirmation')
|
||||||
.controls
|
.controls
|
||||||
= f.password_field :password_confirmation, :placeholder => "••••••••"
|
= f.password_field :password_confirmation, :placeholder => "••••••••"
|
||||||
|
|
||||||
|
|
@ -50,7 +50,7 @@
|
||||||
|
|
||||||
.controls
|
.controls
|
||||||
= f.submit t('registrations.new.create_my_account'), :class => 'btn primary', :disable_with => t('registrations.new.submitting')
|
= 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
|
%footer
|
||||||
= link_to t('layouts.application.toggle'), toggle_mobile_path
|
= link_to t('layouts.application.toggle'), toggle_mobile_path
|
||||||
|
|
|
||||||
|
|
@ -22,15 +22,15 @@
|
||||||
%fieldset
|
%fieldset
|
||||||
%legend
|
%legend
|
||||||
= image_tag('branding/header-logo2x.png', :height => 40, :width => 40)
|
= image_tag('branding/header-logo2x.png', :height => 40, :width => 40)
|
||||||
= t('devise.sessions.new.login').upcase
|
= t('devise.sessions.new.login')
|
||||||
|
|
||||||
.control-group
|
.control-group
|
||||||
= f.label :username, t('username').upcase
|
= f.label :username, t('username')
|
||||||
.controls
|
.controls
|
||||||
= f.text_field :username, :autofocus => true
|
= f.text_field :username, :autofocus => true
|
||||||
|
|
||||||
.control-group
|
.control-group
|
||||||
= f.label :password , t('password').upcase
|
= f.label :password , t('password')
|
||||||
.controls
|
.controls
|
||||||
= f.password_field :password
|
= f.password_field :password
|
||||||
|
|
||||||
|
|
@ -39,7 +39,7 @@
|
||||||
.controls
|
.controls
|
||||||
= f.submit t('devise.sessions.new.sign_in'), :class => 'btn primary'
|
= f.submit t('devise.sessions.new.sign_in'), :class => 'btn primary'
|
||||||
- if display_registration_link?
|
- 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
|
%footer
|
||||||
- if display_password_reset_link?
|
- if display_password_reset_link?
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue