diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-01-06 00:08:02 +0200 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-01-06 00:08:02 +0200 |
| commit | 68eb394824f6d7edd895d8175d16f281af68073a (patch) | |
| tree | 61007c32d3970eebacc794070ff06f0dde76697e /app/views | |
| parent | baf591cc2793533e524810c14afc76b5fe5126f7 (diff) | |
| download | gitlab-ce-68eb394824f6d7edd895d8175d16f281af68073a.tar.gz | |
Green button when we create new item, blue when save or some primary action
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/issues/_form.html.haml | 2 | ||||
| -rw-r--r-- | app/views/merge_requests/_form.html.haml | 9 | ||||
| -rw-r--r-- | app/views/projects/_new_form.html.haml | 2 |
3 files changed, 8 insertions, 5 deletions
diff --git a/app/views/issues/_form.html.haml b/app/views/issues/_form.html.haml index 02b11b53a95..bef235f2dea 100644 --- a/app/views/issues/_form.html.haml +++ b/app/views/issues/_form.html.haml @@ -44,7 +44,7 @@ .actions - if @issue.new_record? - = f.submit 'Submit new issue', class: "btn save-btn" + = f.submit 'Submit new issue', class: "btn success" -else = f.submit 'Save changes', class: "save-btn btn" diff --git a/app/views/merge_requests/_form.html.haml b/app/views/merge_requests/_form.html.haml index 0aaf6566d46..9a4f0617a3a 100644 --- a/app/views/merge_requests/_form.html.haml +++ b/app/views/merge_requests/_form.html.haml @@ -11,7 +11,7 @@ .row .span5 .mr_branch_box - %h5 From (Head Branch) + %h5.cgray From (Head Branch) .body .padded= f.select(:source_branch, @repository.heads.map(&:name), { include_blank: "Select branch" }, {class: 'chosen span4'}) .mr_source_commit @@ -20,7 +20,7 @@ %center= image_tag "merge.png", class: 'mr_direction_tip' .span5 .mr_branch_box - %h5 To (Base Branch) + %h5.cgray To (Base Branch) .body .padded= f.select(:target_branch, @repository.heads.map(&:name), { include_blank: "Select branch" }, {class: 'chosen span4'}) .mr_target_commit @@ -50,7 +50,10 @@ .control-group .form-actions - = f.submit 'Save', class: "btn save-btn" + - if @merge_request.new_record? + = f.submit 'Submit merge request', class: "btn success" + -else + = f.submit 'Save changes', class: "save-btn btn" - if @merge_request.new_record? = link_to project_merge_requests_path(@project), class: "btn cancel-btn" do Cancel diff --git a/app/views/projects/_new_form.html.haml b/app/views/projects/_new_form.html.haml index 2ef29cb0c65..2391c750bc8 100644 --- a/app/views/projects/_new_form.html.haml +++ b/app/views/projects/_new_form.html.haml @@ -7,7 +7,7 @@ Project name is .input = f.text_field :name, placeholder: "Example Project", class: "xxlarge" - = f.submit 'Create project', class: "btn primary project-submit" + = f.submit 'Create project', class: "btn success project-submit" - if current_user.several_namespaces? .clearfix |