BigW Consortium Gitlab

Skip to content

G
gitlab-ce
Unverified Commit 5fa805a7 by Dmitriy Zaporozhets
Options

Restyle issue form. Replace inputs

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