nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Change button color to blue

Browse source 
Fix #6449
 Fix: SyntaxError in 'app/views/devise/passwords/edit.mobile.haml'
This commit is contained in:
Saritha 2015-10-15 11:34:54 +05:30
parent 228f3852b2
commit 7b08cdd488
6 changed files with 13 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/views/devise/passwords/edit.haml
View file

@ -38,7 +38,7 @@
aria: {labelledby: "passwordConfirmationLabel"} aria: {labelledby: "passwordConfirmationLabel"}
= hidden_field(:user, :remember_me, value: 1) = 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 .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
app/views/devise/passwords/edit.mobile.haml
View file

@ -10,20 +10,20 @@
= f.hidden_field :reset_password_token = f.hidden_field :reset_password_token
%fieldset %fieldset
%legend %legend
=t('devise.passwords.edit.change_password') = t("devise.passwords.edit.change_password")
.control-group .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 .controls
= f.password_field :password = f.password_field :password
.control-group .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 .controls
= f.password_field :password_confirmation = f.password_field :password_confirmation
.controls .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 %footer
= link_to t('layouts.application.toggle'), toggle_mobile_path = link_to t("layouts.application.toggle"), toggle_mobile_path

2
app/views/devise/passwords/new.haml
View file

@ -26,7 +26,7 @@
autofocus: true, autofocus: true,
aria: {labelledby: "passwordLabel"} 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 .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)

2
app/views/devise/passwords/new.mobile.haml
View file

@ -18,7 +18,7 @@
= f.text_field :email = f.text_field :email
.controls .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 %footer
- if display_registration_link? - if display_registration_link?

3
app/views/registrations/_form.haml
View file

@ -57,4 +57,5 @@
%p.terms.text-center#terms %p.terms.text-center#terms
= t('registrations.new.terms', terms_link: link_to(t('registrations.new.terms_link'), terms_path, target: "_blank")).html_safe = 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
app/views/sessions/new.html.haml
View file

@ -34,7 +34,7 @@
aria: {labelledby: "passwordLabel"} aria: {labelledby: "passwordLabel"}
= f.hidden_field :remember_me, value: 1 = 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 .text-center
- if display_password_reset_link? - if display_password_reset_link?