Download as
Browse Code »

Commit acc21d30fb7a38e8ae069116a37d67b535da3996

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

Increase input padding. Minor ui fixes

Showing 11 changed files with 42 additions and 32 deletions   Show diff stats
app/assets/stylesheets/gitlab_bootstrap/blocks.scss
  Diff comments   View file @acc21d3
@@ -34,6 +34,10 @@ @@ -34,6 +34,10 @@
34 &.ui-box-show { 34 &.ui-box-show {
35 margin:20px 0; 35 margin:20px 0;
36 background: #FFF; 36 background: #FFF;
  37 +
  38 + .control-group {
  39 + margin-bottom: 0;
  40 + }
37 } 41 }
38 42
39 &.ui-box-danger { 43 &.ui-box-danger {
app/assets/stylesheets/gitlab_bootstrap/forms.scss
  Diff comments   View file @acc21d3
@@ -12,3 +12,18 @@ input { @@ -12,3 +12,18 @@ input {
12 } 12 }
13 } 13 }
14 14
  15 +.control-group {
  16 + .control-label {
  17 + padding-top: 6px;
  18 + }
  19 + .controls {
  20 + input, textarea {
  21 + padding: 6px 10px;
  22 + }
  23 +
  24 + input[type="radio"], input[type="checkbox"] {
  25 + margin-top: 6px;
  26 + }
  27 + }
  28 +}
  29 +
app/assets/stylesheets/sections/projects.scss
  Diff comments   View file @acc21d3
1 .new_project, 1 .new_project,
2 .edit_project { 2 .edit_project {
3 - .project_name_holder {  
4 - input,  
5 - label {  
6 - font-size: 16px;  
7 - line-height: 20px;  
8 - padding: 8px;  
9 - }  
10 - }  
11 - .adv_settings {  
12 - h6 { margin-left: 40px; }  
13 - }  
14 -  
15 fieldset.features { 3 fieldset.features {
16 .control-label { 4 .control-label {
17 font-weight: bold; 5 font-weight: bold;
app/views/admin/hooks/index.html.haml
  Diff comments   View file @acc21d3
@@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@
13 .control-group 13 .control-group
14 = f.label :url, "URL:" 14 = f.label :url, "URL:"
15 .controls 15 .controls
16 - = f.text_field :url, class: "text_field xxlarge input-xpadding" 16 + = f.text_field :url, class: "text_field input-xxlarge input-xpadding"
17   17  
18 = f.submit "Add System Hook", class: "btn btn-create" 18 = f.submit "Add System Hook", class: "btn btn-create"
19 %hr 19 %hr
app/views/profiles/account.html.haml
  Diff comments   View file @acc21d3
@@ -54,7 +54,7 @@ @@ -54,7 +54,7 @@
54 It can be used for atom feed or API 54 It can be used for atom feed or API
55 %p.cgray 55 %p.cgray
56 - if current_user.private_token 56 - if current_user.private_token
57 - = text_field_tag "token", current_user.private_token, class: "input-xxlarge large_text" 57 + = text_field_tag "token", current_user.private_token, class: "input-xxlarge large_text input-xpadding"
58 = f.submit 'Reset', confirm: "Are you sure?", class: "btn btn-primary btn-build-token" 58 = f.submit 'Reset', confirm: "Are you sure?", class: "btn btn-primary btn-build-token"
59 - else 59 - else
60 %span You don`t have one yet. Click generate to fix it. 60 %span You don`t have one yet. Click generate to fix it.
app/views/profiles/keys/_form.html.haml
  Diff comments   View file @acc21d3
@@ -8,13 +8,13 @@ @@ -8,13 +8,13 @@
8 8
9 .control-group 9 .control-group
10 = f.label :title 10 = f.label :title
11 - .controls= f.text_field :title 11 + .controls= f.text_field :title, class: "input-xlarge"
12 .control-group 12 .control-group
13 = f.label :key 13 = f.label :key
14 .controls 14 .controls
15 %p.light 15 %p.light
16 Paste your public key here. Read more about how generate it #{link_to "here", help_ssh_path} 16 Paste your public key here. Read more about how generate it #{link_to "here", help_ssh_path}
17 - = f.text_area :key, class: [:xxlarge, :thin_area] 17 + = f.text_area :key, class: "input-xxlarge thin_area"
18 18
19 19
20 .form-actions 20 .form-actions
app/views/projects/deploy_keys/_form.html.haml
  Diff comments   View file @acc21d3
@@ -8,14 +8,14 @@ @@ -8,14 +8,14 @@
8 8
9 .control-group 9 .control-group
10 = f.label :title 10 = f.label :title
11 - .controls= f.text_field :title 11 + .controls= f.text_field :title, class: 'input-xlarge'
12 .control-group 12 .control-group
13 = f.label :key 13 = f.label :key
14 .controls 14 .controls
15 - = f.text_area :key, class: [:xxlarge, :thin_area]  
16 - %p.hint 15 + %p.light
17 Paste a machine public key here. Read more about how generate it 16 Paste a machine public key here. Read more about how generate it
18 = link_to "here", help_ssh_path 17 = link_to "here", help_ssh_path
  18 + = f.text_area :key, class: "input-xxlarge 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 @acc21d3
@@ -14,7 +14,7 @@ @@ -14,7 +14,7 @@
14 .control-group 14 .control-group
15 = f.label :url, "URL:" 15 = f.label :url, "URL:"
16 .controls 16 .controls
17 - = f.text_field :url, class: "text_field xxlarge input-xpadding", placeholder: 'http://example.com/trigger-ci.json' 17 + = f.text_field :url, class: "text_field input-xxlarge input-xpadding", placeholder: 'http://example.com/trigger-ci.json'
18   18  
19 = f.submit "Add Web Hook", class: "btn btn-create" 19 = f.submit "Add Web Hook", class: "btn btn-create"
20 %hr 20 %hr
app/views/projects/new.html.haml
  Diff comments   View file @acc21d3
1 -.project-edit-container 1 +%p.slead
  2 + New projects are private by default. You choose who can see the project and commit to repository.
  3 +%hr
  4 +.project-edit-container.prepend-top-10
2 .project-edit-errors 5 .project-edit-errors
3 = render 'projects/errors' 6 = render 'projects/errors'
4 .project-edit-content 7 .project-edit-content
5 = form_for @project, remote: true do |f| 8 = form_for @project, remote: true do |f|
6 .control-group.project_name_holder 9 .control-group.project_name_holder
7 = f.label :name do 10 = f.label :name do
8 - Project name is 11 + %strong Project name is
9 .controls 12 .controls
10 - = f.text_field :name, placeholder: "Example Project", class: "input-xxlarge", tabindex: 1, autofocus: true 13 + = f.text_field :name, placeholder: "Example Project", class: "input-xlarge", tabindex: 1, autofocus: true
11 14
12 - if current_user.can_select_namespace? 15 - if current_user.can_select_namespace?
13 .control-group 16 .control-group
@@ -25,7 +28,7 @@ @@ -25,7 +28,7 @@
25 = f.label :import_url do 28 = f.label :import_url do
26 %span Import existing repo 29 %span Import existing repo
27 .controls 30 .controls
28 - = f.text_field :import_url, class: 'xlarge', placeholder: 'https://github.com/randx/six.git' 31 + = f.text_field :import_url, class: 'input-xlarge', placeholder: 'https://github.com/randx/six.git'
29 .light 32 .light
30 URL must be cloneable 33 URL must be cloneable
31 .control-group 34 .control-group
@@ -33,10 +36,8 @@ @@ -33,10 +36,8 @@
33 Description 36 Description
34 %span.light (optional) 37 %span.light (optional)
35 .controls 38 .controls
36 - = f.text_area :description, placeholder: "awesome project", class: "span5", rows: 3, maxlength: 250, tabindex: 3 39 + = f.text_area :description, placeholder: "awesome project", class: "input-xlarge", rows: 3, maxlength: 250, tabindex: 3
37 40
38 - %p.padded  
39 - New projects are private by default. You choose who can see the project and commit to repository.  
40 .form-actions 41 .form-actions
41 = f.submit 'Create project', class: "btn btn-create project-submit", tabindex: 4 42 = f.submit 'Create project', class: "btn btn-create project-submit", tabindex: 4
42 43
app/views/projects/wikis/_form.html.haml
  Diff comments   View file @acc21d3
@@ -23,11 +23,13 @@ @@ -23,11 +23,13 @@
23 \. 23 \.
24 24
25 .ui-box-bottom 25 .ui-box-bottom
26 - = f.label :content  
27 - .controls= f.text_area :content, class: 'span8 js-gfm-input' 26 + .control-group
  27 + = f.label :content
  28 + .controls= f.text_area :content, class: 'span8 js-gfm-input'
28 .ui-box-bottom 29 .ui-box-bottom
29 - = f.label :commit_message  
30 - .controls= f.text_field :message, class: 'span8' 30 + .control-group
  31 + = f.label :commit_message
  32 + .controls= f.text_field :message, class: 'span8'
31 .form-actions 33 .form-actions
32 - if @wiki && @wiki.persisted? 34 - if @wiki && @wiki.persisted?
33 = f.submit 'Save changes', class: "btn-save btn" 35 = f.submit 'Save changes', class: "btn-save btn"
app/views/projects/wikis/_new.html.haml
  Diff comments   View file @acc21d3
1 %div#modal-new-wiki.modal.hide 1 %div#modal-new-wiki.modal.hide
2 .modal-header 2 .modal-header
3 - %a.close{href: "#"} × 3 + %a.close{href: "#", "data-dismiss" => "modal"} ×
4 %h3.page-title New Wiki Page 4 %h3.page-title New Wiki Page
5 .modal-body 5 .modal-body
6 = label_tag :new_wiki_path do 6 = label_tag :new_wiki_path do