Download as
Browse Code »

Commit b2152847b162577ca3d58afcee3486537e0b6b81

Authored by Dmitriy Zaporozhets
1 parent 846e5950
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Replace xlarge and xxlarge classes

Showing 10 changed files with 17 additions and 28 deletions   Show diff stats
app/assets/stylesheets/gitlab_bootstrap/forms.scss
  Diff comments   View file @b215284
... ... @@ -4,17 +4,6 @@ form {
4 4 label {
5 5 @extend .control-label;
6 6 }
7   -
8   - .actions {
9   - @extend .form-actions;
10   - }
11   -
12   - .xlarge {
13   - @extend .input-xlarge;
14   - }
15   - .xxlarge {
16   - @extend .input-xxlarge;
17   - }
18 7 }
19 8  
20 9 input {
... ...
app/views/admin/groups/edit.html.haml
  Diff comments   View file @b215284
... ... @@ -8,18 +8,18 @@
8 8 = f.label :name do
9 9 Group name is
10 10 .controls
11   - = f.text_field :name, placeholder: "Example Group", class: "xxlarge"
  11 + = f.text_field :name, placeholder: "Example Group", class: "input-xxlarge"
12 12  
13 13 .control-group.group-description-holder
14 14 = f.label :description, "Details"
15 15 .controls
16   - = f.text_area :description, maxlength: 250, class: "xxlarge js-gfm-input", rows: 4
  16 + = f.text_area :description, maxlength: 250, class: "input-xxlarge js-gfm-input", rows: 4
17 17  
18 18 .control-group.group_name_holder
19 19 = f.label :path do
20 20 %span.cred Group path is
21 21 .controls
22   - = f.text_field :path, placeholder: "example-group", class: "xxlarge danger"
  22 + = f.text_field :path, placeholder: "example-group", class: "input-xxlarge 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 @b215284
... ... @@ -8,11 +8,11 @@
8 8 = f.label :name do
9 9 Group name is
10 10 .controls
11   - = f.text_field :name, placeholder: "Ex. OpenSource", class: "xxlarge left"
  11 + = f.text_field :name, placeholder: "Ex. OpenSource", class: "input-xxlarge left"
12 12 .control-group.group-description-holder
13 13 = f.label :description, "Details"
14 14 .controls
15   - = f.text_area :description, maxlength: 250, class: "xxlarge js-gfm-input", rows: 4
  15 + = f.text_area :description, maxlength: 250, class: "input-xxlarge js-gfm-input", rows: 4
16 16  
17 17 .form-actions
18 18 = f.submit 'Create group', class: "btn btn-create"
... ...
app/views/groups/edit.html.haml
  Diff comments   View file @b215284
... ... @@ -30,12 +30,12 @@
30 30 = f.label :name do
31 31 Group name is
32 32 .controls
33   - = f.text_field :name, placeholder: "Ex. OpenSource", class: "xxlarge left"
  33 + = f.text_field :name, placeholder: "Ex. OpenSource", class: "input-xxlarge left"
34 34  
35 35 .control-group.group-description-holder
36 36 = f.label :description, "Details"
37 37 .controls
38   - = f.text_area :description, maxlength: 250, class: "xxlarge js-gfm-input", rows: 4
  38 + = f.text_area :description, maxlength: 250, class: "input-xxlarge js-gfm-input", rows: 4
39 39  
40 40 .form-actions
41 41 = f.submit 'Save group', class: "btn btn-save"
... ...
app/views/groups/new.html.haml
  Diff comments   View file @b215284
... ... @@ -6,12 +6,12 @@
6 6 = f.label :name do
7 7 Group name is
8 8 .controls
9   - = f.text_field :name, placeholder: "Ex. OpenSource", class: "xxlarge left"
  9 + = f.text_field :name, placeholder: "Ex. OpenSource", class: "input-xxlarge left"
10 10  
11 11 .control-group.group-description-holder
12 12 = f.label :description, "Details"
13 13 .controls
14   - = f.text_area :description, maxlength: 250, class: "xxlarge js-gfm-input", rows: 4
  14 + = f.text_area :description, maxlength: 250, class: "input-xxlarge js-gfm-input", rows: 4
15 15  
16 16 .control-group
17 17 .controls
... ...
app/views/profiles/account.html.haml
  Diff comments   View file @b215284
... ... @@ -54,7 +54,7 @@
54 54 It can be used for atom feed or API
55 55 %p.cgray
56 56 - if current_user.private_token
57   - = text_field_tag "token", current_user.private_token, class: "xxlarge large_text"
  57 + = text_field_tag "token", current_user.private_token, class: "input-xxlarge large_text"
58 58 = f.submit 'Reset', confirm: "Are you sure?", class: "btn btn-primary btn-build-token"
59 59 - else
60 60 %span You don`t have one yet. Click generate to fix it.
... ...
app/views/projects/compare/_form.html.haml
  Diff comments   View file @b215284
... ... @@ -14,9 +14,9 @@
14 14 .pull-left
15 15 - if params[:to] && params[:from]
16 16 = link_to 'switch', {from: params[:to], to: params[:from]}, {class: 'commits-compare-switch has_tooltip', title: 'Switch base of comparison'}
17   - = text_field_tag :from, params[:from], placeholder: "master", class: "xlarge input-xpadding"
  17 + = text_field_tag :from, params[:from], placeholder: "master", class: "input-xlarge input-xpadding"
18 18 = "..."
19   - = text_field_tag :to, params[:to], placeholder: "aa8b4ef", class: "xlarge input-xpadding"
  19 + = text_field_tag :to, params[:to], placeholder: "aa8b4ef", class: "input-xlarge input-xpadding"
20 20 .pull-left
21 21  
22 22 = submit_tag "Compare", class: "btn btn-create commits-compare-btn"
... ...
app/views/projects/issues/_form.html.haml
  Diff comments   View file @b215284
... ... @@ -12,7 +12,7 @@
12 12 = f.label :title do
13 13 %strong= "Subject *"
14 14 .controls
15   - = f.text_field :title, maxlength: 255, class: "xxlarge js-gfm-input", autofocus: true, required: true
  15 + = f.text_field :title, maxlength: 255, class: "input-xxlarge js-gfm-input", autofocus: true, required: true
16 16 .ui-box-body
17 17 .control-group
18 18 .issue_assignee.pull-left
... ... @@ -37,13 +37,13 @@
37 37 %i.icon-tag
38 38 Labels
39 39 .controls
40   - = f.text_field :label_list, maxlength: 2000, class: "xxlarge"
  40 + = f.text_field :label_list, maxlength: 2000, class: "input-xxlarge"
41 41 %p.hint Separate labels with commas.
42 42  
43 43 .control-group
44 44 = f.label :description, "Details"
45 45 .controls
46   - = f.text_area :description, class: "xxlarge js-gfm-input", rows: 14
  46 + = f.text_area :description, class: "input-xxlarge js-gfm-input", rows: 14
47 47 %p.hint Issues are parsed with #{link_to "GitLab Flavored Markdown", help_markdown_path, target: '_blank'}.
48 48  
49 49  
... ...
app/views/projects/network/_head.html.haml
  Diff comments   View file @b215284
... ... @@ -15,7 +15,7 @@
15 15 .control-group
16 16 = label_tag :search , "Looking for commit:", class: 'control-label light'
17 17 .controls
18   - = text_field_tag :q, @options[:q], placeholder: "Input SHA", class: "search-input xlarge"
  18 + = text_field_tag :q, @options[:q], placeholder: "Input SHA", class: "search-input input-xlarge"
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/new.html.haml
  Diff comments   View file @b215284
... ... @@ -7,7 +7,7 @@
7 7 = f.label :name do
8 8 Project name is
9 9 .controls
10   - = f.text_field :name, placeholder: "Example Project", class: "xxlarge", tabindex: 1, autofocus: true
  10 + = f.text_field :name, placeholder: "Example Project", class: "input-xxlarge", tabindex: 1, autofocus: true
11 11  
12 12 - if current_user.can_select_namespace?
13 13 .control-group
... ...