Download as
Browse Code »

Commit 5fa805a7ba9e6dd437a5bbda1ea28741d0d8b9ee

Authored by Dmitriy Zaporozhets
1 parent a9fba2cd
Exists in spb-stable and in 3 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb

Restyle issue form. Replace inputs 

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Showing 17 changed files with 60 additions and 63 deletions   Show diff stats
app/assets/stylesheets/generic/selects.scss
  Diff comments   View file @5fa805a
... ... @@ -57,6 +57,6 @@
57 57 max-width: 170px !important;
58 58 }
59 59  
60   -select.select-wide {
61   - width: 200px;
  60 +select.chosen {
  61 + min-width: 200px;
62 62 }
... ...
app/views/admin/broadcast_messages/index.html.haml
  Diff comments   View file @5fa805a
... ... @@ -14,7 +14,7 @@
14 14 .form-group
15 15 = f.label :message
16 16 .col-sm-10
17   - = f.text_area :message, class: "input-lg", rows: 2, required: true
  17 + = f.text_area :message, class: "form-control", rows: 2, required: true
18 18 %div
19 19 = link_to '#', class: 'js-toggle-colors-link' do
20 20 Customize colors
... ...
app/views/admin/groups/edit.html.haml
  Diff comments   View file @5fa805a
... ... @@ -8,18 +8,18 @@
8 8 = f.label :name do
9 9 Group name
10 10 .col-sm-10
11   - = f.text_field :name, placeholder: "Example Group", class: "input-lg"
  11 + = f.text_field :name, placeholder: "Example Group", class: "form-control"
12 12  
13 13 .form-group.group-description-holder
14 14 = f.label :description, "Details"
15 15 .col-sm-10
16   - = f.text_area :description, maxlength: 250, class: "input-lg js-gfm-input", rows: 4
  16 + = f.text_area :description, maxlength: 250, class: "form-control js-gfm-input", rows: 4
17 17  
18 18 .form-group.group_name_holder
19 19 = f.label :path do
20 20 %span.cred Group path
21 21 .col-sm-10
22   - = f.text_field :path, placeholder: "example-group", class: "input-lg danger"
  22 + = f.text_field :path, placeholder: "example-group", class: "form-control danger"
23 23 %ul.cred
24 24 %li Changing group path can have unintended side effects.
25 25 %li Renaming group path will rename directory for all related projects
... ...
app/views/admin/groups/new.html.haml
  Diff comments   View file @5fa805a
... ... @@ -8,11 +8,11 @@
8 8 = f.label :name do
9 9 Group name
10 10 .col-sm-10
11   - = f.text_field :name, placeholder: "Ex. OpenSource", class: "input-lg left"
  11 + = f.text_field :name, placeholder: "Ex. OpenSource", class: "form-control left"
12 12 .form-group.group-description-holder
13 13 = f.label :description, "Details"
14 14 .col-sm-10
15   - = f.text_area :description, maxlength: 250, class: "input-lg js-gfm-input", rows: 4
  15 + = f.text_area :description, maxlength: 250, class: "form-control js-gfm-input", rows: 4
16 16  
17 17 .form-actions
18 18 = f.submit 'Create group', class: "btn btn-create"
... ...
app/views/admin/hooks/index.html.haml
  Diff comments   View file @5fa805a
... ... @@ -16,7 +16,7 @@
16 16 .form-group
17 17 = f.label :url, "URL:"
18 18 .col-sm-10
19   - = f.text_field :url, class: "text_field input-lg input-xpadding"
  19 + = f.text_field :url, class: "text_field form-control input-xpadding"
20 20 &nbsp;
21 21 = f.submit "Add System Hook", class: "btn btn-create"
22 22 %hr
... ...
app/views/groups/edit.html.haml
  Diff comments   View file @5fa805a
... ... @@ -28,12 +28,12 @@
28 28 = f.label :name do
29 29 Group name
30 30 .col-sm-10
31   - = f.text_field :name, placeholder: "Ex. OpenSource", class: "input-lg left"
  31 + = f.text_field :name, placeholder: "Ex. OpenSource", class: "form-control left"
32 32  
33 33 .form-group.group-description-holder
34 34 = f.label :description, "Details"
35 35 .col-sm-10
36   - = f.text_area :description, maxlength: 250, class: "input-lg js-gfm-input", rows: 4
  36 + = f.text_area :description, maxlength: 250, class: "form-control js-gfm-input", rows: 4
37 37  
38 38 .form-actions
39 39 = f.submit 'Save group', class: "btn btn-save"
... ...
app/views/groups/new.html.haml
  Diff comments   View file @5fa805a
... ... @@ -6,12 +6,12 @@
6 6 = f.label :name do
7 7 Group name
8 8 .col-sm-10
9   - = f.text_field :name, placeholder: "Ex. OpenSource", class: "input-lg left"
  9 + = f.text_field :name, placeholder: "Ex. OpenSource", class: "form-control left"
10 10  
11 11 .form-group.group-description-holder
12 12 = f.label :description, "Details"
13 13 .col-sm-10
14   - = f.text_area :description, maxlength: 250, class: "input-lg js-gfm-input", rows: 4
  14 + = f.text_area :description, maxlength: 250, class: "form-control js-gfm-input", rows: 4
15 15  
16 16 .form-group
17 17 .col-sm-10
... ...
app/views/projects/deploy_keys/_form.html.haml
  Diff comments   View file @5fa805a
... ... @@ -8,14 +8,14 @@
8 8  
9 9 .form-group
10 10 = f.label :title
11   - .col-sm-10= f.text_field :title, class: 'input-lg'
  11 + .col-sm-10= f.text_field :title, class: 'form-control'
12 12 .form-group
13 13 = f.label :key
14 14 .col-sm-10
15 15 %p.light
16 16 Paste a machine public key here. Read more about how to generate it
17 17 = link_to "here", help_ssh_path
18   - = f.text_area :key, class: "input-lg thin_area"
  18 + = f.text_area :key, class: "form-control thin_area"
19 19  
20 20 .form-actions
21 21 = f.submit 'Create', class: "btn-create btn"
... ...
app/views/projects/issues/_form.html.haml
  Diff comments   View file @5fa805a
1 1 %div.issue-form-holder
2 2 %h3.page-title= @issue.new_record? ? "New Issue" : "Edit Issue ##{@issue.iid}"
3   - = form_for [@project, @issue] do |f|
  3 + %hr
  4 + = form_for [@project, @issue], html: { class: 'form-horizontal issue-form' } do |f|
4 5 -if @issue.errors.any?
5 6 .alert.alert-danger
6 7 - @issue.errors.full_messages.each do |msg|
7 8 %span= msg
8 9 %br
9   - .issue-box
10   - .title
11   - .form-group
12   - = f.label :title do
13   - %strong= "Subject *"
14   - .col-sm-10
15   - = f.text_field :title, maxlength: 255, class: "input-lg js-gfm-input", autofocus: true, required: true
16   - .context
17   - .form-group
18   - .issue_assignee.pull-left
19   - = f.label :assignee_id do
20   - %i.icon-user
21   - Assign to
22   - .col-sm-10
23   - .pull-left
24   - = f.select(:assignee_id, assignee_options(@issue), { include_blank: "Select a user" }, {class: 'chosen'})
25   - .pull-right
26   - &nbsp;
27   - = link_to 'Assign to me', '#', class: 'btn btn-small assign-to-me-link'
28   - .issue_milestone.pull-left
29   - = f.label :milestone_id do
30   - %i.icon-time
31   - Milestone
32   - .col-sm-10= f.select(:milestone_id, milestone_options(@issue), { include_blank: "Select milestone" }, {class: 'chosen'})
  10 + .form-group
  11 + = f.label :title, class: 'control-label' do
  12 + %strong= "Subject *"
  13 + .col-sm-10
  14 + = f.text_field :title, maxlength: 255, class: "form-control js-gfm-input", autofocus: true, required: true
  15 + .form-group
  16 + = f.label :description, "Details", class: 'control-label'
  17 + .col-sm-10
  18 + = f.text_area :description, class: "form-control js-gfm-input", rows: 14
  19 + %p.hint Issues are parsed with #{link_to "GitLab Flavored Markdown", help_markdown_path, target: '_blank'}.
  20 + %hr
  21 + .form-group
  22 + .issue_assignee
  23 + = f.label :assignee_id, class: 'control-label' do
  24 + %i.icon-user
  25 + Assign to
  26 + .col-sm-10
  27 + = f.select(:assignee_id, assignee_options(@issue), { include_blank: "Select a user" }, {class: 'chosen'})
  28 + &nbsp;
  29 + = link_to 'Assign to me', '#', class: 'btn btn-small assign-to-me-link'
  30 + .form-group
  31 + .issue_milestone
  32 + = f.label :milestone_id, class: 'control-label' do
  33 + %i.icon-time
  34 + Milestone
  35 + .col-sm-10= f.select(:milestone_id, milestone_options(@issue), { include_blank: "Select milestone" }, {class: 'chosen'})
33 36  
34   - .description
35   - .form-group
36   - = f.label :label_list do
37   - %i.icon-tag
38   - Labels
39   - .col-sm-10
40   - = f.text_field :label_list, maxlength: 2000, class: "input-lg"
41   - %p.hint Separate labels with commas.
  37 + .form-group
  38 + = f.label :label_list, class: 'control-label' do
  39 + %i.icon-tag
  40 + Labels
  41 + .col-sm-10
  42 + = f.text_field :label_list, maxlength: 2000, class: "form-control"
  43 + %p.hint Separate labels with commas.
42 44  
43   - .form-group
44   - = f.label :description, "Details"
45   - .col-sm-10
46   - = f.text_area :description, class: "input-lg js-gfm-input", rows: 14
47   - %p.hint Issues are parsed with #{link_to "GitLab Flavored Markdown", help_markdown_path, target: '_blank'}.
48 45  
49 46  
50 47 .form-actions
... ...
app/views/projects/merge_requests/_form.html.haml
  Diff comments   View file @5fa805a
... ... @@ -33,7 +33,7 @@
33 33 .form-group
34 34 = f.label :title do
35 35 %strong= "Title *"
36   - .col-sm-10= f.text_field :title, class: "input-lg pad js-gfm-input", maxlength: 255, rows: 5, required: true
  36 + .col-sm-10= f.text_field :title, class: "form-control pad js-gfm-input", maxlength: 255, rows: 5, required: true
37 37 .form-group
38 38 .left
39 39 = f.label :assignee_id do
... ... @@ -48,7 +48,7 @@
48 48 .form-group
49 49 = f.label :description, "Description"
50 50 .col-sm-10
51   - = f.text_area :description, class: "input-lg js-gfm-input", rows: 14
  51 + = f.text_area :description, class: "form-control js-gfm-input", rows: 14
52 52 %p.hint Description is parsed with #{link_to "GitLab Flavored Markdown", help_markdown_path, target: '_blank'}.
53 53  
54 54  
... ...
app/views/projects/milestones/_form.html.haml
  Diff comments   View file @5fa805a
... ... @@ -16,12 +16,12 @@
16 16 .form-group
17 17 = f.label :title, "Title", class: "control-label"
18 18 .col-sm-10
19   - = f.text_field :title, maxlength: 255, class: "input-lg"
  19 + = f.text_field :title, maxlength: 255, class: "form-control"
20 20 %p.hint Required
21 21 .form-group
22 22 = f.label :description, "Description", class: "control-label"
23 23 .col-sm-10
24   - = f.text_area :description, maxlength: 2000, class: "input-lg", rows: 10
  24 + = f.text_area :description, maxlength: 2000, class: "form-control", rows: 10
25 25 %p.hint Milestones are parsed with #{link_to "GitLab Flavored Markdown", help_markdown_path, target: '_blank'}.
26 26 .col-md-6
27 27 .form-group
... ...
app/views/projects/network/_head.html.haml
  Diff comments   View file @5fa805a
... ... @@ -15,7 +15,7 @@
15 15 .form-group
16 16 = label_tag :search , "Looking for commit:", class: 'control-label light'
17 17 .col-sm-10
18   - = text_field_tag :extended_sha1, @options[:extended_sha1], placeholder: "Input an extended SHA1 syntax", class: "search-input input-lg"
  18 + = text_field_tag :extended_sha1, @options[:extended_sha1], placeholder: "Input an extended SHA1 syntax", class: "search-input form-control"
19 19 = button_tag type: 'submit', class: 'btn vtop' do
20 20 %i.icon-search
21 21 - @options.each do |key, value|
... ...
app/views/projects/snippets/_form.html.haml
  Diff comments   View file @5fa805a
... ... @@ -11,7 +11,7 @@
11 11  
12 12 .form-group
13 13 = f.label :title
14   - .col-sm-10= f.text_field :title, placeholder: "Example Snippet", class: 'input-lg', required: true
  14 + .col-sm-10= f.text_field :title, placeholder: "Example Snippet", class: 'form-control', required: true
15 15 .form-group
16 16 = f.label "Lifetime"
17 17 .col-sm-10= f.select :expires_at, lifetime_select_options, {}, {class: 'chosen span2'}
... ...
app/views/projects/wikis/_new.html.haml
  Diff comments   View file @5fa805a
... ... @@ -7,7 +7,7 @@
7 7 .modal-body
8 8 = label_tag :new_wiki_path do
9 9 %span Page slug
10   - = text_field_tag :new_wiki_path, nil, placeholder: 'how-to-setup', class: 'input-lg', required: true, :'data-wikis-path' => project_wikis_path(@project)
  10 + = text_field_tag :new_wiki_path, nil, placeholder: 'how-to-setup', class: 'form-control', required: true, :'data-wikis-path' => project_wikis_path(@project)
11 11 %p.hint
12 12 Please don't use spaces and slashes
13 13 .modal-footer
... ...
app/views/projects/wikis/git_access.html.haml
  Diff comments   View file @5fa805a
... ... @@ -7,7 +7,7 @@
7 7 .git-clone-holder
8 8 %button{class: "btn active", :"data-clone" => @gollum_wiki.ssh_url_to_repo} SSH
9 9 %button{class: "btn", :"data-clone" => @gollum_wiki.http_url_to_repo}= gitlab_config.protocol.upcase
10   - = text_field_tag :project_clone, @gollum_wiki.url_to_repo, class: "one_click_select input-lg", readonly: true
  10 + = text_field_tag :project_clone, @gollum_wiki.url_to_repo, class: "one_click_select form-control", readonly: true
11 11  
12 12 .git-empty
13 13 %fieldset
... ...
app/views/search/show.html.haml
  Diff comments   View file @5fa805a
... ... @@ -3,7 +3,7 @@
3 3 = label_tag :search do
4 4 %span Looking for
5 5 .col-sm-10
6   - = search_field_tag :search, params[:search], placeholder: "issue 143", class: "input-lg search-text-input", id: "dashboard_search"
  6 + = search_field_tag :search, params[:search], placeholder: "issue 143", class: "form-control search-text-input", id: "dashboard_search"
7 7 = hidden_field_tag :project_id, params[:project_id]
8 8 = hidden_field_tag :group_id, params[:group_id]
9 9 = hidden_field_tag :search_code, params[:search_code]
... ...
app/views/snippets/_form.html.haml
  Diff comments   View file @5fa805a
... ... @@ -11,7 +11,7 @@
11 11  
12 12 .form-group
13 13 = f.label :title
14   - .col-sm-10= f.text_field :title, placeholder: "Example Snippet", class: 'input-lg', required: true
  14 + .col-sm-10= f.text_field :title, placeholder: "Example Snippet", class: 'form-control', required: true
15 15 .form-group
16 16 = f.label "Access"
17 17 .col-sm-10
... ...