Increase input padding. Minor ui fixes

8 files changed, 23 insertions, 20 deletions

diff --git a/app/views/admin/hooks/index.html.haml b/app/views/admin/hooks/index.html.haml
index 0830bc32b91..8f302dce5d4 100644
--- a/app/views/admin/hooks/index.html.haml
+++ b/app/views/admin/hooks/index.html.haml
@@ -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"
        
       = f.submit "Add System Hook", class: "btn btn-create"
 %hr
diff --git a/app/views/profiles/account.html.haml b/app/views/profiles/account.html.haml
index b8325e5d9e7..122ff1b4a01 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: "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.
diff --git a/app/views/profiles/keys/_form.html.haml b/app/views/profiles/keys/_form.html.haml
index f41ae1c2591..3a0b6cd48a1 100644
--- a/app/views/profiles/keys/_form.html.haml
+++ b/app/views/profiles/keys/_form.html.haml
@@ -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
diff --git a/app/views/projects/deploy_keys/_form.html.haml b/app/views/projects/deploy_keys/_form.html.haml
index 84a81ac58b1..00b41e657b6 100644
--- a/app/views/projects/deploy_keys/_form.html.haml
+++ b/app/views/projects/deploy_keys/_form.html.haml
@@ -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"
diff --git a/app/views/projects/hooks/index.html.haml b/app/views/projects/hooks/index.html.haml
index eed76a7366d..53e54103617 100644
--- a/app/views/projects/hooks/index.html.haml
+++ b/app/views/projects/hooks/index.html.haml
@@ -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'
        
       = f.submit "Add Web Hook", class: "btn btn-create"
 %hr
diff --git a/app/views/projects/new.html.haml b/app/views/projects/new.html.haml
index 38eb6d401c5..d309f0686e0 100644
--- a/app/views/projects/new.html.haml
+++ b/app/views/projects/new.html.haml
@@ -1,13 +1,16 @@
-.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
 
diff --git a/app/views/projects/wikis/_form.html.haml b/app/views/projects/wikis/_form.html.haml
index c8c02818e25..16061c9dcbb 100644
--- a/app/views/projects/wikis/_form.html.haml
+++ b/app/views/projects/wikis/_form.html.haml
@@ -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"
diff --git a/app/views/projects/wikis/_new.html.haml b/app/views/projects/wikis/_new.html.haml
index c52fbcb58f6..f64772b2001 100644
--- a/app/views/projects/wikis/_new.html.haml
+++ b/app/views/projects/wikis/_new.html.haml
@@ -1,6 +1,6 @@
 %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