diff options
| author | Douwe Maan <douwe@gitlab.com> | 2016-01-26 13:43:50 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2016-01-26 13:43:50 +0000 |
| commit | b227b9add0f5845848c0a607d5c8c2aae767c7b8 (patch) | |
| tree | 9b35c1fdce5a38bf132386c7a4f368ec43146af2 /app | |
| parent | b6eb41638904734826bfc02178a8e521baa761e2 (diff) | |
| parent | 89154880e56c34e94cdd7326c6cfc67bdb256f74 (diff) | |
| download | gitlab-ce-b227b9add0f5845848c0a607d5c8c2aae767c7b8.tar.gz | |
Merge branch 'save-button-color-application-settings' into 'master'
Save button on app settings now btn-save
Some save buttons where `btn-primary` where throughout the application these usually are `btn-save`.
Before (Application settings)
After
See merge request !2612
Diffstat (limited to 'app')
| -rw-r--r-- | app/views/admin/application_settings/_form.html.haml | 2 | ||||
| -rw-r--r-- | app/views/admin/applications/_form.html.haml | 2 | ||||
| -rw-r--r-- | app/views/admin/groups/_form.html.haml | 3 |
3 files changed, 3 insertions, 4 deletions
diff --git a/app/views/admin/application_settings/_form.html.haml b/app/views/admin/application_settings/_form.html.haml index c4020c8273b..dde35f8742a 100644 --- a/app/views/admin/application_settings/_form.html.haml +++ b/app/views/admin/application_settings/_form.html.haml @@ -268,4 +268,4 @@ = f.text_field :sentry_dsn, class: 'form-control' .form-actions - = f.submit 'Save', class: 'btn btn-primary' + = f.submit 'Save', class: 'btn btn-save' diff --git a/app/views/admin/applications/_form.html.haml b/app/views/admin/applications/_form.html.haml index fa4e6335c73..e18f7b499dd 100644 --- a/app/views/admin/applications/_form.html.haml +++ b/app/views/admin/applications/_form.html.haml @@ -22,5 +22,5 @@ %code= Doorkeeper.configuration.native_redirect_uri for local tests .form-actions - = f.submit 'Submit', class: "btn btn-primary wide" + = f.submit 'Submit', class: "btn btn-save wide" = link_to "Cancel", admin_applications_path, class: "btn btn-default" diff --git a/app/views/admin/groups/_form.html.haml b/app/views/admin/groups/_form.html.haml index 8de2ba74a79..198026a1f75 100644 --- a/app/views/admin/groups/_form.html.haml +++ b/app/views/admin/groups/_form.html.haml @@ -21,6 +21,5 @@ - else .form-actions - = f.submit 'Save changes', class: "btn btn-primary" + = f.submit 'Save changes', class: "btn btn-save" = link_to 'Cancel', admin_group_path(@group), class: "btn btn-cancel" - |