Commit 010a770b authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Migrate forms and inputs pt1

Signed-off-by: default avatarDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
parent 16eb3ac3
...@@ -9,7 +9,7 @@ $ -> ...@@ -9,7 +9,7 @@ $ ->
toggleClass('icon-chevron-down'). toggleClass('icon-chevron-down').
toggleClass('icon-chevron-up') toggleClass('icon-chevron-up')
container = $(".js-toggle-visibility-container") container = $(".js-toggle-visibility-container")
container.toggleClass("hide") container.toggleClass("gl-hide")
e.preventDefault() e.preventDefault()
$("body").on "click", ".js-toggle-button", (e) -> $("body").on "click", ".js-toggle-button", (e) ->
......
...@@ -69,12 +69,6 @@ ...@@ -69,12 +69,6 @@
} }
} }
.pagination ul > li > a, .pagination ul > li >span {
@include linear-gradient(#f1f1f1, #e1e1e1);
color: #333;
text-shadow: 0 1px 1px #FFF;
}
pre.well-pre { pre.well-pre {
border: 1px solid #EEE; border: 1px solid #EEE;
background: #f9f9f9; background: #f9f9f9;
......
input[type="text"], input[type="password"], input[type="search"], input[type="email"] {
@extend .form-control;
}
form {
@extend .form-horizontal;
label {
@extend .control-label;
@extend .col-sm-2;
&.radio-label {
text-align: left;
width: 100%;
margin-left: 0;
input[type="radio"] {
margin-top: 1px !important;
}
}
&.list-label {
float: none;
padding: 0 !important;
margin: 0;
text-align: left;
}
}
&.form-tiny {
margin: 0;
}
}
input[type='search'].search-text-input { input[type='search'].search-text-input {
background-image: url("icon-search.png"); background-image: url("icon-search.png");
background-repeat: no-repeat; background-repeat: no-repeat;
background-position: 10px; background-position: 10px;
padding-left: 25px; padding-left: 25px;
@include border-radius(4px);
border: 1px solid #ccc;
} }
input[type='text'].danger { input[type='text'].danger {
...@@ -63,5 +27,9 @@ fieldset legend { ...@@ -63,5 +27,9 @@ fieldset legend {
margin-bottom: 18px; margin-bottom: 18px;
background-color: whitesmoke; background-color: whitesmoke;
border-top: 1px solid #e5e5e5; border-top: 1px solid #e5e5e5;
padding-left: 180px; padding-left: 17%;
}
label.control-label {
@extend .col-sm-2;
} }
...@@ -80,7 +80,7 @@ ...@@ -80,7 +80,7 @@
border-right: 1px solid #ccc; border-right: 1px solid #ccc;
text-align: right; text-align: right;
min-width: 35px; min-width: 35px;
max-width: 35px; max-width: 50px;
width: 35px; width: 35px;
@include user-select(none); @include user-select(none);
a { a {
......
...@@ -32,14 +32,15 @@ ...@@ -32,14 +32,15 @@
.dash-filter { .dash-filter {
margin: 7px 0; margin: 7px 0;
padding: 4px 6px; padding: 4px 6px;
width: 202px; width: 220px;
float: left; float: left;
height: inherit;
} }
} }
@media (max-width: 1200px) { @media (max-width: 1200px) {
.dashboard .dash-filter { .dashboard .dash-filter {
width: 132px; width: 150px;
} }
} }
......
...@@ -99,6 +99,7 @@ header { ...@@ -99,6 +99,7 @@ header {
form { form {
margin: 0; margin: 0;
padding: 0;
} }
.search-input { .search-input {
......
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
border-bottom: 1px solid #E1E1E1; border-bottom: 1px solid #E1E1E1;
ul { ul {
padding: 0;
margin: auto; margin: auto;
height: 40px; height: 40px;
overflow: hidden; overflow: hidden;
......
.update-notifications { .update-notifications {
margin-bottom: 0; .radio-inline {
label { margin-right: 30px;
margin-bottom: 0;
} }
} }
......
...@@ -67,7 +67,7 @@ ...@@ -67,7 +67,7 @@
} }
.git-clone-holder { .git-clone-holder {
float: right; margin-right: 45px;
border: 1px solid #E1E1E1; border: 1px solid #E1E1E1;
@include border-radius(4px); @include border-radius(4px);
...@@ -100,6 +100,11 @@ ...@@ -100,6 +100,11 @@
cursor: auto; cursor: auto;
@extend .monospace; @extend .monospace;
background: #FAFAFA; background: #FAFAFA;
width: 100%;
}
.protocol-clone {
overflow: hidden;
} }
} }
......
...@@ -24,10 +24,10 @@ ...@@ -24,10 +24,10 @@
th { th {
font-weight: normal; font-weight: normal;
font-size: 15px; font-size: 15px;
border-bottom: 1px solid #CCC; border-bottom: 1px solid #CCC !important;
} }
td { td {
border-color: #F1F1F1; border-color: #F1F1F1 !important;
} }
&:hover { &:hover {
td { td {
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
.form-group .form-group
= f.label :message = f.label :message
.col-sm-10 .col-sm-10
= f.text_area :message, class: "input-xxlarge", rows: 2, required: true = f.text_area :message, class: "input-lg", rows: 2, required: true
%div %div
= link_to '#', class: 'js-toggle-colors-link' do = link_to '#', class: 'js-toggle-colors-link' do
Customize colors Customize colors
......
...@@ -8,18 +8,18 @@ ...@@ -8,18 +8,18 @@
= f.label :name do = f.label :name do
Group name Group name
.col-sm-10 .col-sm-10
= f.text_field :name, placeholder: "Example Group", class: "input-xxlarge" = f.text_field :name, placeholder: "Example Group", class: "input-lg"
.form-group.group-description-holder .form-group.group-description-holder
= f.label :description, "Details" = f.label :description, "Details"
.col-sm-10 .col-sm-10
= f.text_area :description, maxlength: 250, class: "input-xxlarge js-gfm-input", rows: 4 = f.text_area :description, maxlength: 250, class: "input-lg js-gfm-input", rows: 4
.form-group.group_name_holder .form-group.group_name_holder
= f.label :path do = f.label :path do
%span.cred Group path %span.cred Group path
.col-sm-10 .col-sm-10
= f.text_field :path, placeholder: "example-group", class: "input-xxlarge danger" = f.text_field :path, placeholder: "example-group", class: "input-lg danger"
%ul.cred %ul.cred
%li Changing group path can have unintended side effects. %li Changing group path can have unintended side effects.
%li Renaming group path will rename directory for all related projects %li Renaming group path will rename directory for all related projects
......
...@@ -8,11 +8,11 @@ ...@@ -8,11 +8,11 @@
= f.label :name do = f.label :name do
Group name Group name
.col-sm-10 .col-sm-10
= f.text_field :name, placeholder: "Ex. OpenSource", class: "input-xxlarge left" = f.text_field :name, placeholder: "Ex. OpenSource", class: "input-lg left"
.form-group.group-description-holder .form-group.group-description-holder
= f.label :description, "Details" = f.label :description, "Details"
.col-sm-10 .col-sm-10
= f.text_area :description, maxlength: 250, class: "input-xxlarge js-gfm-input", rows: 4 = f.text_area :description, maxlength: 250, class: "input-lg js-gfm-input", rows: 4
.form-actions .form-actions
= f.submit 'Create group', class: "btn btn-create" = f.submit 'Create group', class: "btn btn-create"
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
.form-group .form-group
= f.label :url, "URL:" = f.label :url, "URL:"
.col-sm-10 .col-sm-10
= f.text_field :url, class: "text_field input-xxlarge input-xpadding" = f.text_field :url, class: "text_field input-lg input-xpadding"
&nbsp; &nbsp;
= f.submit "Add System Hook", class: "btn btn-create" = f.submit "Add System Hook", class: "btn btn-create"
%hr %hr
......
.ui-box .ui-box
.title.clearfix .title.clearfix
= search_field_tag :filter_group, nil, placeholder: 'Filter by name', class: 'dash-filter' = search_field_tag :filter_group, nil, placeholder: 'Filter by name', class: 'dash-filter form-control'
- if current_user.can_create_group? - if current_user.can_create_group?
%span.pull-right %span.pull-right
= link_to new_group_path, class: "btn btn-new" do = link_to new_group_path, class: "btn btn-new" do
......
.ui-box .ui-box
.title.clearfix .title.clearfix
= search_field_tag :filter_projects, nil, placeholder: 'Filter by name', class: 'dash-filter' = search_field_tag :filter_projects, nil, placeholder: 'Filter by name', class: 'dash-filter form-control'
- if current_user.can_create_project? - if current_user.can_create_project?
%span.pull-right %span.pull-right
= link_to new_project_path, class: "btn btn-new" do = link_to new_project_path, class: "btn btn-new" do
......
...@@ -28,12 +28,12 @@ ...@@ -28,12 +28,12 @@
= f.label :name do = f.label :name do
Group name Group name
.col-sm-10 .col-sm-10
= f.text_field :name, placeholder: "Ex. OpenSource", class: "input-xxlarge left" = f.text_field :name, placeholder: "Ex. OpenSource", class: "input-lg left"
.form-group.group-description-holder .form-group.group-description-holder
= f.label :description, "Details" = f.label :description, "Details"
.col-sm-10 .col-sm-10
= f.text_area :description, maxlength: 250, class: "input-xxlarge js-gfm-input", rows: 4 = f.text_area :description, maxlength: 250, class: "input-lg js-gfm-input", rows: 4
.form-actions .form-actions
= f.submit 'Save group', class: "btn btn-save" = f.submit 'Save group', class: "btn btn-save"
......
...@@ -6,12 +6,12 @@ ...@@ -6,12 +6,12 @@
= f.label :name do = f.label :name do
Group name Group name
.col-sm-10 .col-sm-10
= f.text_field :name, placeholder: "Ex. OpenSource", class: "input-xxlarge left" = f.text_field :name, placeholder: "Ex. OpenSource", class: "input-lg left"
.form-group.group-description-holder .form-group.group-description-holder
= f.label :description, "Details" = f.label :description, "Details"
.col-sm-10 .col-sm-10
= f.text_area :description, maxlength: 250, class: "input-xxlarge js-gfm-input", rows: 4 = f.text_area :description, maxlength: 250, class: "input-lg js-gfm-input", rows: 4
.form-group .form-group
.col-sm-10 .col-sm-10
......
...@@ -6,8 +6,8 @@ ...@@ -6,8 +6,8 @@
-# remote: data-remote -# remote: data-remote
-# paginator: the paginator that renders the pagination tags inside -# paginator: the paginator that renders the pagination tags inside
= paginator.render do = paginator.render do
%div.pagination %div.gl-pagination
%ul %ul.pagination
= prev_page_tag unless current_page.first? = prev_page_tag unless current_page.first?
- each_page do |page| - each_page do |page|
- if page.left_outer? || page.right_outer? || page.inside_window? - if page.left_outer? || page.right_outer? || page.inside_window?
......
...@@ -23,8 +23,9 @@ ...@@ -23,8 +23,9 @@
%p.cgray %p.cgray
- if current_user.private_token - if current_user.private_token
= text_field_tag "token", current_user.private_token, class: "input-xlarge input-xpadding pull-left" = text_field_tag "token", current_user.private_token, class: "form-control"
= f.submit 'Reset', data: { confirm: "Are you sure?" }, class: "btn btn-primary btn-build-token prepend-left-10" %div
= f.submit 'Reset', data: { confirm: "Are you sure?" }, class: "btn btn-primary btn-build-token"
- else - else
%span You don`t have one yet. Click generate to fix it. %span You don`t have one yet. Click generate to fix it.
= f.submit 'Generate', class: "btn success btn-build-token" = f.submit 'Generate', class: "btn success btn-build-token"
...@@ -47,7 +48,7 @@ ...@@ -47,7 +48,7 @@
%p %p
Changing your username will change path to all personal projects! Changing your username will change path to all personal projects!
%div %div
= f.text_field :username, required: true, class: 'input-xlarge input-xpadding' = f.text_field :username, required: true, class: 'form-control'
&nbsp; &nbsp;
%span.loading-gif.gl-hide= image_tag "ajax_loader.gif" %span.loading-gif.gl-hide= image_tag "ajax_loader.gif"
%p.light %p.light
......
%div %div
= form_for [:profile, @key] do |f| = form_for [:profile, @key], html: { class: 'form-horizontal' } do |f|
- if @key.errors.any? - if @key.errors.any?
.alert.alert-error .alert.alert-error
%ul %ul
...@@ -7,14 +7,12 @@ ...@@ -7,14 +7,12 @@
%li= msg %li= msg
.form-group .form-group
= f.label :title = f.label :title, class: 'control-label'
.col-sm-10= f.text_field :title, class: "input-xlarge" .col-sm-10= f.text_field :title, class: "form-control"
.form-group .form-group
= f.label :key = f.label :key, class: 'control-label'
.col-sm-10 .col-sm-10
%p.light = f.text_area :key, class: "form-control", rows: 8
Paste your public key here. Read more about how to generate a key on #{link_to "the SSH help page", help_ssh_path}.
= f.text_area :key, class: "input-xxlarge thin_area"
.form-actions .form-actions
......
%h3.page-title Add an SSH Key %h3.page-title Add an SSH Key
%p.light
Paste your public key here. Read more about how to generate a key on #{link_to "the SSH help page", help_ssh_path}.
%hr %hr
= render 'form' = render 'form'
......
...@@ -13,19 +13,19 @@ ...@@ -13,19 +13,19 @@
= hidden_field_tag :notification_type, type, id: dom_id(membership, 'notification_type') = hidden_field_tag :notification_type, type, id: dom_id(membership, 'notification_type')
= hidden_field_tag :notification_id, membership.id, id: dom_id(membership, 'notification_id') = hidden_field_tag :notification_id, membership.id, id: dom_id(membership, 'notification_id')
= label_tag do = label_tag nil, class: 'radio-inline' do
= radio_button_tag :notification_level, Notification::N_GLOBAL, notification.global?, id: dom_id(membership, 'notification_level'), class: 'trigger-submit' = radio_button_tag :notification_level, Notification::N_GLOBAL, notification.global?, id: dom_id(membership, 'notification_level'), class: 'trigger-submit'
%span Use global setting %span Use global setting
= label_tag do = label_tag nil, class: 'radio-inline' do
= radio_button_tag :notification_level, Notification::N_DISABLED, notification.disabled?, id: dom_id(membership, 'notification_level'), class: 'trigger-submit' = radio_button_tag :notification_level, Notification::N_DISABLED, notification.disabled?, id: dom_id(membership, 'notification_level'), class: 'trigger-submit'
%span Disabled %span Disabled
= label_tag do = label_tag nil, class: 'radio-inline' do
= radio_button_tag :notification_level, Notification::N_PARTICIPATING, notification.participating?, id: dom_id(membership, 'notification_level'), class: 'trigger-submit' = radio_button_tag :notification_level, Notification::N_PARTICIPATING, notification.participating?, id: dom_id(membership, 'notification_level'), class: 'trigger-submit'
%span Participating %span Participating
= label_tag do = label_tag nil, class: 'radio-inline' do
= radio_button_tag :notification_level, Notification::N_WATCH, notification.watch?, id: dom_id(membership, 'notification_level'), class: 'trigger-submit' = radio_button_tag :notification_level, Notification::N_WATCH, notification.watch?, id: dom_id(membership, 'notification_level'), class: 'trigger-submit'
%span Watch %span Watch
...@@ -26,15 +26,15 @@ ...@@ -26,15 +26,15 @@
= form_tag profile_notifications_path, method: :put, remote: true, class: 'update-notifications' do = form_tag profile_notifications_path, method: :put, remote: true, class: 'update-notifications' do
= hidden_field_tag :notification_type, 'global' = hidden_field_tag :notification_type, 'global'
= label_tag do = label_tag nil, class: 'radio-inline' do
= radio_button_tag :notification_level, Notification::N_DISABLED, @notification.disabled?, class: 'trigger-submit' = radio_button_tag :notification_level, Notification::N_DISABLED, @notification.disabled?, class: 'trigger-submit'
%span Disabled %span Disabled
= label_tag do = label_tag nil, class: 'radio-inline' do
= radio_button_tag :notification_level, Notification::N_PARTICIPATING, @notification.participating?, class: 'trigger-submit' = radio_button_tag :notification_level, Notification::N_PARTICIPATING, @notification.participating?, class: 'trigger-submit'
%span Participating %span Participating
= label_tag do = label_tag nil, class: 'radio-inline' do
= radio_button_tag :notification_level, Notification::N_WATCH, @notification.watch?, class: 'trigger-submit' = radio_button_tag :notification_level, Notification::N_WATCH, @notification.watch?, class: 'trigger-submit'
%span Watch %span Watch
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
Change your password or recover your current one. Change your password or recover your current one.
%hr %hr
.update-password .update-password
= form_for @user, url: profile_password_path, method: :put do |f| = form_for @user, url: profile_password_path, method: :put, html: { class: 'form-horizontal' } do |f|
%div %div
%p.slead %p.slead
You must provide current password in order to change it. You must provide current password in order to change it.
...@@ -15,18 +15,18 @@ ...@@ -15,18 +15,18 @@
- @user.errors.full_messages.each do |msg| - @user.errors.full_messages.each do |msg|
%li= msg %li= msg
.form-group .form-group
= f.label :current_password = f.label :current_password, class: 'control-label'
.col-sm-10 .col-sm-10
= f.password_field :current_password, required: true = f.password_field :current_password, required: true, class: 'form-control'
%div %div
= link_to "Forgot your password?", reset_profile_password_path, method: :put = link_to "Forgot your password?", reset_profile_password_path, method: :put
.form-group .form-group
= f.label :password, 'New password' = f.label :password, 'New password', class: 'control-label'
.col-sm-10= f.password_field :password, required: true .col-sm-10= f.password_field :password, required: true, class: 'form-control'
.form-group .form-group
= f.label :password_confirmation = f.label :password_confirmation, class: 'control-label'
.col-sm-10 .col-sm-10
= f.password_field :password_confirmation, required: true = f.password_field :password_confirmation, required: true, class: 'form-control'
.form-actions .form-actions
= f.submit 'Save password', class: "btn btn-save" = f.submit 'Save password', class: "btn btn-save"
...@@ -19,18 +19,18 @@ ...@@ -19,18 +19,18 @@
.form-group .form-group
= f.label :name, class: "control-label" = f.label :name, class: "control-label"
.col-sm-10 .col-sm-10
= f.text_field :name, class: "input-xlarge", required: true = f.text_field :name, class: "form-control", required: true
%span.help-block Enter your name, so people you know can recognize you. %span.help-block Enter your name, so people you know can recognize you.
.form-group .form-group
= f.label :email, class: "control-label" = f.label :email, class: "control-label"
.col-sm-10 .col-sm-10
- if @user.ldap_user? - if @user.ldap_user?
= f.text_field :email, class: "input-xlarge", required: true, readonly: true = f.text_field :email, class: "form-control", required: true, readonly: true
%span.help-block.light %span.help-block.light
Email is read-only for LDAP user Email is read-only for LDAP user
- else - else
= f.text_field :email, class: "input-xlarge", required: true = f.text_field :email, class: "form-control", required: true
- if @user.unconfirmed_email.present? - if @user.unconfirmed_email.present?
%span.help-block %span.help-block
We sent confirmation email to We sent confirmation email to
...@@ -39,17 +39,17 @@ ...@@ -39,17 +39,17 @@
%span.help-block We also use email for avatar detection if no avatar is uploaded. %span.help-block We also use email for avatar detection if no avatar is uploaded.
.form-group .form-group
= f.label :skype, class: "control-label" = f.label :skype, class: "control-label"
.col-sm-10= f.text_field :skype, class: "input-xlarge" .col-sm-10= f.text_field :skype, class: "form-control"
.form-group .form-group
= f.label :linkedin, class: "control-label" = f.label :linkedin, class: "control-label"
.col-sm-10= f.text_field :linkedin, class: "input-xlarge" .col-sm-10= f.text_field :linkedin, class: "form-control"
.form-group .form-group
= f.label :twitter, class: "control-label" = f.label :twitter, class: "control-label"
.col-sm-10= f.text_field :twitter, class: "input-xlarge" .col-sm-10= f.text_field :twitter, class: "form-control"
.form-group .form-group
= f.label :bio, class: "control-label" = f.label :bio, class: "control-label"
.col-sm-10 .col-sm-10
= f.text_area :bio, rows: 6, class: "input-xlarge", maxlength: 250 = f.text_area :bio, rows: 6, class: "form-control", maxlength: 250
%span.help-block Tell us about yourself in fewer than 250 characters. %span.help-block Tell us about yourself in fewer than 250 characters.
.col-md-5.pull-right .col-md-5.pull-right
......
...@@ -8,14 +8,14 @@ ...@@ -8,14 +8,14 @@
.form-group .form-group
= f.label :title = f.label :title
.col-sm-10= f.text_field :title, class: 'input-xlarge' .col-sm-10= f.text_field :title, class: 'input-lg'
.form-group .form-group
= f.label :key = f.label :key
.col-sm-10 .col-sm-10
%p.light %p.light
Paste a machine public key here. Read more about how to generate it Paste a machine public key here. Read more about how to generate it
= link_to "here", help_ssh_path = link_to "here", help_ssh_path
= f.text_area :key, class: "input-xxlarge thin_area" = f.text_area :key, class: "input-lg thin_area"
.form-actions .form-actions
= f.submit 'Create', class: "btn-create btn" = f.submit 'Create', class: "btn-create btn"
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
.form-group .form-group
= f.label :url, "URL" = f.label :url, "URL"
.col-sm-10 .col-sm-10
= f.text_field :url, class: "text_field input-xxlarge input-xpadding", placeholder: 'http://example.com/trigger-ci.json' = f.text_field :url, class: "text_field input-lg input-xpadding", placeholder: 'http://example.com/trigger-ci.json'
&nbsp; &nbsp;
= f.submit "Add Web Hook", class: "btn btn-create" = f.submit "Add Web Hook", class: "btn btn-create"
.form-group .form-group
......
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
= f.label :title do = f.label :title do
%strong= "Subject *" %strong= "Subject *"
.col-sm-10 .col-sm-10
= f.text_field :title, maxlength: 255, class: "input-xxlarge js-gfm-input", autofocus: true, required: true = f.text_field :title, maxlength: 255, class: "input-lg js-gfm-input", autofocus: true, required: true
.context .context
.form-group .form-group
.issue_assignee.pull-left .issue_assignee.pull-left
...@@ -37,13 +37,13 @@ ...@@ -37,13 +37,13 @@
%i.icon-tag %i.icon-tag
Labels Labels
.col-sm-10 .col-sm-10
= f.text_field :label_list, maxlength: 2000, class: "input-xxlarge" = f.text_field :label_list, maxlength: 2000, class: "input-lg"
%p.hint Separate labels with commas. %p.hint Separate labels with commas.
.form-group .form-group
= f.label :description, "Details" = f.label :description, "Details"
.col-sm-10 .col-sm-10
= f.text_area :description, class: "input-xxlarge js-gfm-input", rows: 14 = 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'}. %p.hint Issues are parsed with #{link_to "GitLab Flavored Markdown", help_markdown_path, target: '_blank'}.
......
...@@ -17,9 +17,10 @@ ...@@ -17,9 +17,10 @@
%li.pull-right %li.pull-right
.pull-right .pull-right
= form_tag project_issues_path(@project), method: :get, id: "issue_search_form", class: 'inline issue-search-form' do
.append-right-10
= search_field_tag :issue_search, nil, { placeholder: 'Filter by title or description', class: 'form-control issue_search search-text-input' }
- if can? current_user, :write_issue, @project - if can? current_user, :write_issue, @project
= link_to new_project_issue_path(@project, issue: { assignee_id: params[:assignee_id], milestone_id: params[:milestone_id]}), class: "btn btn-new pull-right", title: "New Issue", id: "new_issue_link" do = link_to new_project_issue_path(@project, issue: { assignee_id: params[:assignee_id], milestone_id: params[:milestone_id]}), class: "btn btn-new", title: "New Issue", id: "new_issue_link" do
%i.icon-plus %i.icon-plus
New Issue New Issue
= form_tag project_issues_path(@project), method: :get, id: "issue_search_form", class: 'pull-right issue-search-form' do
= search_field_tag :issue_search, nil, { placeholder: 'Filter by title or description', class: 'input-xpadding issue_search input-xlarge append-right-10 search-text-input' }
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
.form-group .form-group
= f.label :title do = f.label :title do
%strong= "Title *" %strong= "Title *"
.col-sm-10= f.text_field :title, class: "input-xxlarge pad js-gfm-input", maxlength: 255, rows: 5, required: true .col-sm-10= f.text_field :title, class: "input-lg pad js-gfm-input", maxlength: 255, rows: 5, required: true
.form-group .form-group
.left .left
= f.label :assignee_id do = f.label :assignee_id do
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
.form-group .form-group
= f.label :description, "Description" = f.label :description, "Description"
.col-sm-10 .col-sm-10
= f.text_area :description, class: "input-xxlarge js-gfm-input", rows: 14 = f.text_area :description, class: "input-lg js-gfm-input", rows: 14
%p.hint Description is parsed with #{link_to "GitLab Flavored Markdown", help_markdown_path, target: '_blank'}. %p.hint Description is parsed with #{link_to "GitLab Flavored Markdown", help_markdown_path, target: '_blank'}.
......
...@@ -16,12 +16,12 @@ ...@@ -16,12 +16,12 @@
.form-group .form-group
= f.label :title, "Title", class: "control-label" = f.label :title, "Title", class: "control-label"
.col-sm-10 .col-sm-10
= f.text_field :title, maxlength: 255, class: "input-xlarge" = f.text_field :title, maxlength: 255, class: "input-lg"
%p.hint Required %p.hint Required
.form-group .form-group
= f.label :description, "Description", class: "control-label" = f.label :description, "Description", class: "control-label"
.col-sm-10 .col-sm-10
= f.text_area :description, maxlength: 2000, class: "input-xlarge", rows: 10 = f.text_area :description, maxlength: 2000, class: "input-lg", rows: 10
%p.hint Milestones are parsed with #{link_to "GitLab Flavored Markdown", help_markdown_path, target: '_blank'}. %p.hint Milestones are parsed with #{link_to "GitLab Flavored Markdown", help_markdown_path, target: '_blank'}.
.col-md-6 .col-md-6
.form-group .form-group
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
.form-group .form-group
= label_tag :search , "Looking for commit:", class: 'control-label light' = label_tag :search , "Looking for commit:", class: 'control-label light'
.col-sm-10 .col-sm-10
= text_field_tag :extended_sha1, @options[:extended_sha1], placeholder: "Input an extended SHA1 syntax", class: "search-input input-xlarge" = text_field_tag :extended_sha1, @options[:extended_sha1], placeholder: "Input an extended SHA1 syntax", class: "search-input input-lg"
= button_tag type: 'submit', class: 'btn vtop' do = button_tag type: 'submit', class: 'btn vtop' do
%i.icon-search %i.icon-search
- @options.each do |key, value| - @options.each do |key, value|
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
= f.label :name do = f.label :name do
%strong Project name %strong Project name
.col-sm-10 .col-sm-10
= f.text_field :name, placeholder: "Example Project", class: "input-xlarge", tabindex: 1, autofocus: true = f.text_field :name, placeholder: "Example Project", class: "input-lg", tabindex: 1, autofocus: true
%span.help-inline %span.help-inline
= link_to "#", class: 'js-toggle-visibility-link' do = link_to "#", class: 'js-toggle-visibility-link' do
%span Customize repository name? %span Customize repository name?
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
= f.label :import_url do = f.label :import_url do
%span Import existing repo %span Import existing repo
.col-sm-10 .col-sm-10
= f.text_field :import_url, class: 'input-xlarge', placeholder: 'https://github.com/randx/six.git' = f.text_field :import_url, class: 'input-lg', placeholder: 'https://github.com/randx/six.git'
.light .light
URL must be cloneable URL must be cloneable
.form-group .form-group
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
Description Description
%span.light (optional) %span.light (optional)
.col-sm-10 .col-sm-10
= f.text_area :description, placeholder: "Awesome project", class: "input-xlarge", rows: 3, maxlength: 250, tabindex: 3 = f.text_area :description, placeholder: "Awesome project", class: "input-lg", rows: 3, maxlength: 250, tabindex: 3
= render "visibility_level", f: f, visibility_level: gitlab_config.default_projects_features.visibility_level, can_change_visibility_level: true = render "visibility_level", f: f, visibility_level: gitlab_config.default_projects_features.visibility_level, can_change_visibility_level: true
.form-actions .form-actions
......
...@@ -32,9 +32,9 @@ ...@@ -32,9 +32,9 @@
= f.label name, class: "control-label" = f.label name, class: "control-label"
.col-sm-10 .col-sm-10
- if type == 'text' - if type == 'text'
= f.text_field name, class: "input-xlarge", placeholder: placeholder = f.text_field name, class: "input-lg", placeholder: placeholder
- elsif type == 'textarea' - elsif type == 'textarea'
= f.text_area name, rows: 5, class: "input-xxlarge", placeholder: placeholder = f.text_area name, rows: 5, class: "input-lg", placeholder: placeholder
- elsif type == 'checkbox' - elsif type == 'checkbox'
= f.check_box name = f.check_box name
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
.form-group .form-group
= f.label :title = f.label :title
.col-sm-10= f.text_field :title, placeholder: "Example Snippet", class: 'input-xlarge', required: true .col-sm-10= f.text_field :title, placeholder: "Example Snippet", class: 'input-lg', required: true
.form-group .form-group
= f.label "Lifetime" = f.label "Lifetime"
.col-sm-10= f.select :expires_at, lifetime_select_options, {}, {class: 'chosen span2'} .col-sm-10= f.select :expires_at, lifetime_select_options, {}, {class: 'chosen span2'}
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
= form_tag apply_import_project_team_members_path(@project), method: 'post' do = form_tag apply_import_project_team_members_path(@project), method: 'post' do
.padded .padded
= label_tag :source_project_id, "Project" = label_tag :source_project_id, "Project"
.col-sm-10= select_tag(:source_project_id, options_from_collection_for_select(current_user.authorized_projects, :id, :name_with_namespace), prompt: "Select project", class: "chosen xxlarge", required: true) .col-sm-10= select_tag(:source_project_id, options_from_collection_for_select(current_user.authorized_projects, :id, :name_with_namespace), prompt: "Select project", class: "chosen lg", required: true)
.form-actions .form-actions
= submit_tag 'Import project members', class: "btn btn-create" = submit_tag 'Import project members', class: "btn btn-create"
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
.modal-body .modal-body
= label_tag :new_wiki_path do = label_tag :new_wiki_path do
%span Page slug %span Page slug
= text_field_tag :new_wiki_path, nil, placeholder: 'how-to-setup', class: 'input-xlarge', required: true, :'data-wikis-path' => project_wikis_path(@project) = text_field_tag :new_wiki_path, nil, placeholder: 'how-to-setup', class: 'input-lg', required: true, :'data-wikis-path' => project_wikis_path(@project)
%p.hint %p.hint
Please don't use spaces and slashes Please don't use spaces and slashes
.modal-footer .modal-footer
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
.git-clone-holder .git-clone-holder
%button{class: "btn active", :"data-clone" => @gollum_wiki.ssh_url_to_repo} SSH %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 %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-xxlarge", readonly: true = text_field_tag :project_clone, @gollum_wiki.url_to_repo, class: "one_click_select input-lg", readonly: true
.git-empty .git-empty
%fieldset %fieldset
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
= label_tag :search do = label_tag :search do
%span Looking for %span Looking for
.col-sm-10 .col-sm-10
= search_field_tag :search, params[:search], placeholder: "issue 143", class: "input-xxlarge search-text-input", id: "dashboard_search" = search_field_tag :search, params[:search], placeholder: "issue 143", class: "input-lg search-text-input", id: "dashboard_search"
= hidden_field_tag :project_id, params[:project_id] = hidden_field_tag :project_id, params[:project_id]
= hidden_field_tag :group_id, params[:group_id] = hidden_field_tag :group_id, params[:group_id]
= hidden_field_tag :search_code, params[:search_code] = hidden_field_tag :search_code, params[:search_code]
......
.git-clone-holder .git-clone-holder
.protocol-btns
%button{class: "btn #{ 'active' if default_clone_protocol == 'ssh' }", :"data-clone" => @project.ssh_url_to_repo} SSH %button{class: "btn #{ 'active' if default_clone_protocol == 'ssh' }", :"data-clone" => @project.ssh_url_to_repo} SSH
%button{class: "btn #{ 'active' if default_clone_protocol == 'http' }", :"data-clone" => @project.http_url_to_repo}= gitlab_config.protocol.upcase %button{class: "btn #{ 'active' if default_clone_protocol == 'http' }", :"data-clone" => @project.http_url_to_repo}= gitlab_config.protocol.upcase
.protocol-clone
= text_field_tag :project_clone, default_url_to_repo, class: "one_click_select span4", readonly: true = text_field_tag :project_clone, default_url_to_repo, class: "one_click_select span4", readonly: true
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
.form-group .form-group
= f.label :title = f.label :title
.col-sm-10= f.text_field :title, placeholder: "Example Snippet", class: 'input-xlarge', required: true .col-sm-10= f.text_field :title, placeholder: "Example Snippet", class: 'input-lg', required: true
.form-group .form-group
= f.label "Access" = f.label "Access"
.col-sm-10 .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