Skip to content

Commit

Permalink
Change button color to blue
Browse files Browse the repository at this point in the history
 Fix diaspora#6449
 Fix: SyntaxError in 'app/views/devise/passwords/edit.mobile.haml'
  • Loading branch information
sarithats committed Oct 19, 2015
1 parent 228f385 commit 25d82dc
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 12 deletions.
4 changes: 2 additions & 2 deletions app/views/devise/passwords/edit.haml
Expand Up @@ -38,7 +38,7 @@
aria: {labelledby: "passwordConfirmationLabel"}

= hidden_field(:user, :remember_me, value: 1)
= f.submit t('devise.passwords.edit.change_password'), class: "btn btn-block btn-default"
= f.submit t("devise.passwords.edit.change_password"), class: "btn btn-block btn-primary"

.text-center
= link_to t('devise.shared.links.sign_in'), new_session_path(resource_name)
= link_to t("devise.shared.links.sign_in"), new_session_path(resource_name)
10 changes: 5 additions & 5 deletions app/views/devise/passwords/edit.mobile.haml
Expand Up @@ -10,20 +10,20 @@
= f.hidden_field :reset_password_token
%fieldset
%legend
=t('devise.passwords.edit.change_password')
=t("devise.passwords.edit.change_password")

.control-group
= f.label :password, t('devise.passwords.edit.new_password'), class: "control-label"
= f.label :password, t("devise.passwords.edit.new_password"), class: "control-label"
.controls
= f.password_field :password

.control-group
= f.label :password_confirmation, t('devise.passwords.edit.confirm_password'), class: "control-label"
= f.label :password_confirmation, t("devise.passwords.edit.confirm_password"), class: "control-label"
.controls
= f.password_field :password_confirmation

.controls
= f.submit t('devise.passwords.edit.change_password'), :class: 'btn btn-primary'
= f.submit t("devise.passwords.edit.change_password"), class: "btn btn-primary"

%footer
= link_to t('layouts.application.toggle'), toggle_mobile_path
= link_to t("layouts.application.toggle"), toggle_mobile_path
2 changes: 1 addition & 1 deletion app/views/devise/passwords/new.haml
Expand Up @@ -26,7 +26,7 @@
autofocus: true,
aria: {labelledby: "passwordLabel"}

= f.submit t('devise.passwords.new.send_password_instructions'), class: "btn btn-block btn-default"
= f.submit t("devise.passwords.new.send_password_instructions"), class: "btn btn-block btn-primary"

.text-center
= link_to t('devise.shared.links.sign_in'), new_session_path(resource_name)
4 changes: 2 additions & 2 deletions app/views/devise/passwords/new.mobile.haml
Expand Up @@ -18,10 +18,10 @@
= f.text_field :email

.controls
= f.submit t('devise.passwords.new.send_password_instructions'), :class => 'btn'
= f.submit t("devise.passwords.new.send_password_instructions"), class: "btn btn-primary"

%footer
- if display_registration_link?
- if display_registration_link?
= link_to t('devise.shared.links.sign_up'), new_registration_path(resource_name)

= link_to t('devise.sessions.new.sign_in'), new_user_session_path()
Expand Down
3 changes: 2 additions & 1 deletion app/views/registrations/_form.haml
Expand Up @@ -57,4 +57,5 @@
%p.terms.text-center#terms
= t('registrations.new.terms', terms_link: link_to(t('registrations.new.terms_link'), terms_path, target: "_blank")).html_safe

= f.submit t('registrations.new.sign_up'), class: "btn btn-block btn-large btn-default", data: {disable_with: t('registrations.new.submitting')}
= f.submit t("registrations.new.sign_up"), class: "btn btn-block btn-large btn-primary",
data: {disable_with: t("registrations.new.submitting")}
2 changes: 1 addition & 1 deletion app/views/sessions/new.html.haml
Expand Up @@ -34,7 +34,7 @@
aria: {labelledby: "passwordLabel"}

= f.hidden_field :remember_me, value: 1
= f.submit t('devise.sessions.new.sign_in'), class: 'btn btn-large btn-block btn-default'
= f.submit t("devise.sessions.new.sign_in"), class: "btn btn-large btn-block btn-primary"

.text-center
- if display_password_reset_link?
Expand Down

0 comments on commit 25d82dc

Please sign in to comment.