diff --git a/app/assets/stylesheets/gitlab_bootstrap/forms.scss b/app/assets/stylesheets/gitlab_bootstrap/forms.scss index b498ce160a61da6687997383286e8bd14f9e5f9f..ad14b003c73d3ebf72b7311e2d99cb4779cbc7ac 100644 --- a/app/assets/stylesheets/gitlab_bootstrap/forms.scss +++ b/app/assets/stylesheets/gitlab_bootstrap/forms.scss @@ -4,17 +4,6 @@ form { label { @extend .control-label; } - - .actions { - @extend .form-actions; - } - - .xlarge { - @extend .input-xlarge; - } - .xxlarge { - @extend .input-xxlarge; - } } input { diff --git a/app/views/admin/groups/edit.html.haml b/app/views/admin/groups/edit.html.haml index 027f663891af4f7fdbfd6eed484e998574eb9261..8ed463a819171be9ca0cc42a900d5b3e38ab8eb5 100644 --- a/app/views/admin/groups/edit.html.haml +++ b/app/views/admin/groups/edit.html.haml @@ -8,18 +8,18 @@ = f.label :name do Group name is .controls - = f.text_field :name, placeholder: "Example Group", class: "xxlarge" + = f.text_field :name, placeholder: "Example Group", class: "input-xxlarge" .control-group.group-description-holder = f.label :description, "Details" .controls - = f.text_area :description, maxlength: 250, class: "xxlarge js-gfm-input", rows: 4 + = f.text_area :description, maxlength: 250, class: "input-xxlarge js-gfm-input", rows: 4 .control-group.group_name_holder = f.label :path do %span.cred Group path is .controls - = f.text_field :path, placeholder: "example-group", class: "xxlarge danger" + = f.text_field :path, placeholder: "example-group", class: "input-xxlarge danger" %ul.cred %li Changing group path can have unintended side effects. %li Renaming group path will rename directory for all related projects diff --git a/app/views/admin/groups/new.html.haml b/app/views/admin/groups/new.html.haml index dcb91d586e6ef725f777c5da15964866fd1369a2..0ae35eb6b43cdb244f9718d5f8fce8fac306b0ca 100644 --- a/app/views/admin/groups/new.html.haml +++ b/app/views/admin/groups/new.html.haml @@ -8,11 +8,11 @@ = f.label :name do Group name is .controls - = f.text_field :name, placeholder: "Ex. OpenSource", class: "xxlarge left" + = f.text_field :name, placeholder: "Ex. OpenSource", class: "input-xxlarge left" .control-group.group-description-holder = f.label :description, "Details" .controls - = f.text_area :description, maxlength: 250, class: "xxlarge js-gfm-input", rows: 4 + = f.text_area :description, maxlength: 250, class: "input-xxlarge js-gfm-input", rows: 4 .form-actions = f.submit 'Create group', class: "btn btn-create" diff --git a/app/views/groups/edit.html.haml b/app/views/groups/edit.html.haml index 2017be5aaf37a51729f127054c9526ebd317f7b4..fe66f89626fe658d89a54db4d1c7129e274ca102 100644 --- a/app/views/groups/edit.html.haml +++ b/app/views/groups/edit.html.haml @@ -30,12 +30,12 @@ = f.label :name do Group name is .controls - = f.text_field :name, placeholder: "Ex. OpenSource", class: "xxlarge left" + = f.text_field :name, placeholder: "Ex. OpenSource", class: "input-xxlarge left" .control-group.group-description-holder = f.label :description, "Details" .controls - = f.text_area :description, maxlength: 250, class: "xxlarge js-gfm-input", rows: 4 + = f.text_area :description, maxlength: 250, class: "input-xxlarge js-gfm-input", rows: 4 .form-actions = f.submit 'Save group', class: "btn btn-save" diff --git a/app/views/groups/new.html.haml b/app/views/groups/new.html.haml index ccf610b8c3618e8b8905ff8d5563c2a7ccdc7e44..02049bb2ee671c7bbf17cfce62b598d972c8b17f 100644 --- a/app/views/groups/new.html.haml +++ b/app/views/groups/new.html.haml @@ -6,12 +6,12 @@ = f.label :name do Group name is .controls - = f.text_field :name, placeholder: "Ex. OpenSource", class: "xxlarge left" + = f.text_field :name, placeholder: "Ex. OpenSource", class: "input-xxlarge left" .control-group.group-description-holder = f.label :description, "Details" .controls - = f.text_area :description, maxlength: 250, class: "xxlarge js-gfm-input", rows: 4 + = f.text_area :description, maxlength: 250, class: "input-xxlarge js-gfm-input", rows: 4 .control-group .controls diff --git a/app/views/profiles/account.html.haml b/app/views/profiles/account.html.haml index f1cd8fe3fbf846295f8da12e3a77fbda8e2a9ce7..b8325e5d9e7c4a35744f1bae77d401ea2bf32d30 100644 --- a/app/views/profiles/account.html.haml +++ b/app/views/profiles/account.html.haml @@ -54,7 +54,7 @@ It can be used for atom feed or API %p.cgray - if current_user.private_token - = text_field_tag "token", current_user.private_token, class: "xxlarge large_text" + = text_field_tag "token", current_user.private_token, class: "input-xxlarge large_text" = f.submit 'Reset', confirm: "Are you sure?", class: "btn btn-primary btn-build-token" - else %span You don`t have one yet. Click generate to fix it. diff --git a/app/views/projects/compare/_form.html.haml b/app/views/projects/compare/_form.html.haml index a83380841fa004b009895c0c6c6abcad9670d36c..ee733f8095493897aeee232fa03c93be80ebe5ef 100644 --- a/app/views/projects/compare/_form.html.haml +++ b/app/views/projects/compare/_form.html.haml @@ -14,9 +14,9 @@ .pull-left - if params[:to] && params[:from] = link_to 'switch', {from: params[:to], to: params[:from]}, {class: 'commits-compare-switch has_tooltip', title: 'Switch base of comparison'} - = text_field_tag :from, params[:from], placeholder: "master", class: "xlarge input-xpadding" + = text_field_tag :from, params[:from], placeholder: "master", class: "input-xlarge input-xpadding" = "..." - = text_field_tag :to, params[:to], placeholder: "aa8b4ef", class: "xlarge input-xpadding" + = text_field_tag :to, params[:to], placeholder: "aa8b4ef", class: "input-xlarge input-xpadding" .pull-left = submit_tag "Compare", class: "btn btn-create commits-compare-btn" diff --git a/app/views/projects/issues/_form.html.haml b/app/views/projects/issues/_form.html.haml index a03453c162f39501b55012cffbea3558594a5fc5..2672fbb2cde297116d911cfdd1bb31446a89b5ca 100644 --- a/app/views/projects/issues/_form.html.haml +++ b/app/views/projects/issues/_form.html.haml @@ -12,7 +12,7 @@ = f.label :title do %strong= "Subject *" .controls - = f.text_field :title, maxlength: 255, class: "xxlarge js-gfm-input", autofocus: true, required: true + = f.text_field :title, maxlength: 255, class: "input-xxlarge js-gfm-input", autofocus: true, required: true .ui-box-body .control-group .issue_assignee.pull-left @@ -37,13 +37,13 @@ %i.icon-tag Labels .controls - = f.text_field :label_list, maxlength: 2000, class: "xxlarge" + = f.text_field :label_list, maxlength: 2000, class: "input-xxlarge" %p.hint Separate labels with commas. .control-group = f.label :description, "Details" .controls - = f.text_area :description, class: "xxlarge js-gfm-input", rows: 14 + = f.text_area :description, class: "input-xxlarge js-gfm-input", rows: 14 %p.hint Issues are parsed with #{link_to "GitLab Flavored Markdown", help_markdown_path, target: '_blank'}. diff --git a/app/views/projects/network/_head.html.haml b/app/views/projects/network/_head.html.haml index 59ce787e187f71fe5447821025a14ca7197d78a5..ed9fcaace250611761f5594f6a775eff7e568cfe 100644 --- a/app/views/projects/network/_head.html.haml +++ b/app/views/projects/network/_head.html.haml @@ -15,7 +15,7 @@ .control-group = label_tag :search , "Looking for commit:", class: 'control-label light' .controls - = text_field_tag :q, @options[:q], placeholder: "Input SHA", class: "search-input xlarge" + = text_field_tag :q, @options[:q], placeholder: "Input SHA", class: "search-input input-xlarge" = button_tag type: 'submit', class: 'btn vtop' do %i.icon-search - @options.each do |key, value| diff --git a/app/views/projects/new.html.haml b/app/views/projects/new.html.haml index 90bc93adde7199ec139f2839bb9da94f95611a9a..38eb6d401c5d5c03ba9cf5d144c52a3bd45772ec 100644 --- a/app/views/projects/new.html.haml +++ b/app/views/projects/new.html.haml @@ -7,7 +7,7 @@ = f.label :name do Project name is .controls - = f.text_field :name, placeholder: "Example Project", class: "xxlarge", tabindex: 1, autofocus: true + = f.text_field :name, placeholder: "Example Project", class: "input-xxlarge", tabindex: 1, autofocus: true - if current_user.can_select_namespace? .control-group