Download as
Browse Code »

Commit 010a770b3fa15119b40a994fde6ffdde3acf6d2d

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

Migrate forms and inputs pt1 

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