diff options
| author | Marin Jankovski <marin@gitlab.com> | 2015-03-09 16:21:31 +0000 |
|---|---|---|
| committer | Marin Jankovski <marin@gitlab.com> | 2015-03-09 16:21:31 +0000 |
| commit | d6c13ec0b264b03ada4c7c5c39e3ba61165f5a74 (patch) | |
| tree | 1b8318580ddb3b88e7412a60e03215b57352c132 | |
| parent | dbb514e764d305e4fbafcb598359a76d3b2518d4 (diff) | |
| parent | 1e42cd2040c788774734e6621b426b3d99362123 (diff) | |
| download | gitlab-ce-d6c13ec0b264b03ada4c7c5c39e3ba61165f5a74.tar.gz | |
Merge branch 'button_changes' into 'master'
Change button styles
Styles for buttons are changed to match user expectations.
Fixes #2004
See merge request !1580
| -rw-r--r-- | app/views/profiles/accounts/show.html.haml | 2 | ||||
| -rw-r--r-- | app/views/profiles/notifications/show.html.haml | 2 | ||||
| -rw-r--r-- | app/views/profiles/passwords/edit.html.haml | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/app/views/profiles/accounts/show.html.haml b/app/views/profiles/accounts/show.html.haml index f124637c07b..6bafcb56551 100644 --- a/app/views/profiles/accounts/show.html.haml +++ b/app/views/profiles/accounts/show.html.haml @@ -57,7 +57,7 @@ %p.light = user_url(@user) %div - = f.submit 'Save username', class: "btn btn-save" + = f.submit 'Save username', class: "btn btn-warning" - if show_profile_remove_tab? %fieldset.remove-account diff --git a/app/views/profiles/notifications/show.html.haml b/app/views/profiles/notifications/show.html.haml index e3cd323927e..6cf5c81c19e 100644 --- a/app/views/profiles/notifications/show.html.haml +++ b/app/views/profiles/notifications/show.html.haml @@ -50,7 +50,7 @@ %p You will receive all notifications from projects in which you participate .form-actions - = f.submit 'Save changes', class: "btn btn-save" + = f.submit 'Save changes', class: "btn btn-create" .clearfix %hr diff --git a/app/views/profiles/passwords/edit.html.haml b/app/views/profiles/passwords/edit.html.haml index 3b1ebbfaf59..4b04b113e89 100644 --- a/app/views/profiles/passwords/edit.html.haml +++ b/app/views/profiles/passwords/edit.html.haml @@ -35,4 +35,4 @@ .col-sm-10 = f.password_field :password_confirmation, required: true, class: 'form-control' .form-actions - = f.submit 'Save password', class: "btn btn-save" + = f.submit 'Save password', class: "btn btn-create" |