Increase input padding. Minor ui fixes

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