Commit 3c43819b authored by Steffen van Bergerem's avatar Steffen van Bergerem

Merge pull request #6504 from sarithats/fix/login_button

Change login button color
parents 13387253 7b08cdd4
......@@ -58,6 +58,7 @@ With the port to Bootstrap 3, app/views/terms/default.haml has a new structure.
* Hide cancel button in publisher on small screens [#6435](https://github.com/diaspora/diaspora/pull/6435)
* Replace mobile background with color [#6415](https://github.com/diaspora/diaspora/pull/6415)
* Port flash messages to backbone [#6395](https://github.com/diaspora/diaspora/6395)
* Change login/registration/forgot password button color [#6504](https://github.com/diaspora/diaspora/pull/6504)
## Bug fixes
* Destroy Participation when removing interactions with a post [#5852](https://github.com/diaspora/diaspora/pull/5852)
......
......@@ -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,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
......@@ -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)
......@@ -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()
......
......@@ -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")}
......@@ -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?
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment