diff options
| author | Nicolas <nicolas@gitlab.com> | 2015-06-14 17:38:27 +0200 |
|---|---|---|
| committer | Nicolas <nicolas@gitlab.com> | 2015-06-15 21:27:20 +0200 |
| commit | 4cf7d8d956acf5b3cbefa1f4b52d8c0db8d0b04c (patch) | |
| tree | 8017fdb0fb3ca807c2578c3e3907aebd0d4b5993 | |
| parent | f18a24f0ac96d2cafffc7dbf08bb644d5243a421 (diff) | |
| download | gitlab-ce-4cf7d8d956acf5b3cbefa1f4b52d8c0db8d0b04c.tar.gz | |
Fix consistency issues on New Application page.
| -rw-r--r-- | app/views/doorkeeper/applications/_form.html.haml | 5 | ||||
| -rw-r--r-- | app/views/doorkeeper/applications/new.html.haml | 7 | ||||
| -rw-r--r-- | features/steps/profile/profile.rb | 2 |
3 files changed, 10 insertions, 4 deletions
diff --git a/app/views/doorkeeper/applications/_form.html.haml b/app/views/doorkeeper/applications/_form.html.haml index a157c9af297..98a61ab211b 100644 --- a/app/views/doorkeeper/applications/_form.html.haml +++ b/app/views/doorkeeper/applications/_form.html.haml @@ -24,6 +24,7 @@ Use %code= Doorkeeper.configuration.native_redirect_uri for local tests + .form-actions - = f.submit 'Submit', class: "btn btn-primary wide" - = link_to "Cancel", applications_profile_path, class: "btn btn-default" + = f.submit 'Submit', class: "btn btn-create" + = link_to "Cancel", applications_profile_path, class: "btn btn-cancel" diff --git a/app/views/doorkeeper/applications/new.html.haml b/app/views/doorkeeper/applications/new.html.haml index 655845e4af5..fd32a468b45 100644 --- a/app/views/doorkeeper/applications/new.html.haml +++ b/app/views/doorkeeper/applications/new.html.haml @@ -1,2 +1,7 @@ -%h3.page-title New application +- page_title "New Application" + +%h3.page-title New Application + +%hr + = render 'form', application: @application
\ No newline at end of file diff --git a/features/steps/profile/profile.rb b/features/steps/profile/profile.rb index 32e6859eff7..8b07a13d31e 100644 --- a/features/steps/profile/profile.rb +++ b/features/steps/profile/profile.rb @@ -197,7 +197,7 @@ class Spinach::Features::Profile < Spinach::FeatureSteps end step 'I should see application form' do - expect(page).to have_content "New application" + expect(page).to have_content "New Application" end step 'I fill application form out and submit' do |