Fix forms and header

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

9 files changed, 37 insertions, 8 deletions

diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index c428d905de2..01cdbb4e8cf 100644
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -209,7 +209,7 @@ li.note {
 }
 
 .git_error_tips {
-  @extend .span6;
+  @extend .col-md-6;
   text-align: left;
   margin-top: 40px;
   pre {
diff --git a/app/assets/stylesheets/gitlab_bootstrap/forms.scss b/app/assets/stylesheets/gitlab_bootstrap/forms.scss
index 39dd1f6c747..20341aaf71c 100644
--- a/app/assets/stylesheets/gitlab_bootstrap/forms.scss
+++ b/app/assets/stylesheets/gitlab_bootstrap/forms.scss
@@ -1,8 +1,13 @@
+input[type="text"], input[type="password"], input[type="search"], input[type="email"] {
+  @extend .form-control;
+}
+
 form {
   @extend .form-horizontal;
 
   label {
     @extend .control-label;
+    @extend .col-sm-2;
 
     &.radio-label {
       text-align: left;
@@ -33,10 +38,14 @@ input.input-xpadding,
 }
 
 .control-group {
+  @extend .form-group;
+
   .control-label {
     padding-top: 6px;
   }
   .controls {
+    @extend .col-sm-10;
+
     input, textarea {
       padding: 6px 10px;
     }
@@ -76,3 +85,12 @@ fieldset legend {
     width: 100px;
   }
 }
+
+.form-actions {
+  padding: 17px 20px 18px;
+  margin-top: 18px;
+  margin-bottom: 18px;
+  background-color: whitesmoke;
+  border-top: 1px solid #e5e5e5;
+  padding-left: 180px;
+}
diff --git a/app/assets/stylesheets/gitlab_bootstrap/ui_box.scss b/app/assets/stylesheets/gitlab_bootstrap/ui_box.scss
index 056b4eeaaf4..e25d33468a7 100644
--- a/app/assets/stylesheets/gitlab_bootstrap/ui_box.scss
+++ b/app/assets/stylesheets/gitlab_bootstrap/ui_box.scss
@@ -43,6 +43,7 @@
 
   ul {
     margin: 0;
+    padding: 0;
   }
 
   .title {
diff --git a/app/assets/stylesheets/sections/dashboard.scss b/app/assets/stylesheets/sections/dashboard.scss
index 720d3a8fbd5..09053afd74f 100644
--- a/app/assets/stylesheets/sections/dashboard.scss
+++ b/app/assets/stylesheets/sections/dashboard.scss
@@ -20,7 +20,7 @@
 
   .search-text-input {
     float:left;
-    @extend .span2;
+    @extend .col-md-2;
   }
   .btn {
     margin-left: 5px;
diff --git a/app/assets/stylesheets/sections/editor.scss b/app/assets/stylesheets/sections/editor.scss
index a71e5438936..0bfbc0f2ad5 100644
--- a/app/assets/stylesheets/sections/editor.scss
+++ b/app/assets/stylesheets/sections/editor.scss
@@ -42,7 +42,7 @@
       line-height: 20px;
     }
     textarea {
-      @extend .span8;
+      @extend .col-md-8;
     }
   }
 }
diff --git a/app/assets/stylesheets/sections/events.scss b/app/assets/stylesheets/sections/events.scss
index 966282750d9..9cd6c6546a1 100644
--- a/app/assets/stylesheets/sections/events.scss
+++ b/app/assets/stylesheets/sections/events.scss
@@ -147,7 +147,7 @@
       float: left;
       padding: 9px 6px;
       font-size: 18px;
-      width: 26px;
+      width: 40px;
       @include border-radius(3px);
     }
 
diff --git a/app/assets/stylesheets/sections/header.scss b/app/assets/stylesheets/sections/header.scss
index 276dd872fbc..049b6b13dae 100644
--- a/app/assets/stylesheets/sections/header.scss
+++ b/app/assets/stylesheets/sections/header.scss
@@ -5,6 +5,9 @@
 header {
   &.navbar-gitlab {
     margin-bottom: 0;
+    height: 40px;
+    overflow: hidden;
+
     .navbar-inner {
       /*height: 40px;*/
       padding: 3px;
@@ -92,12 +95,19 @@ header {
   .search {
     margin-right: 10px;
     margin-left: 10px;
+    margin-top: 5px;
+
+    form {
+      margin: 0;
+    }
 
     .search-input {
-      @extend .span3;
+      width: 300px;
       background-image: url("icon-search.png");
       background-repeat: no-repeat;
       background-position: 10px;
+      height: inherit;
+      padding: 4px 6px;
       padding-left: 25px;
       font-size: 13px;
       @include border-radius(3px);
@@ -105,7 +115,7 @@ header {
       box-shadow: none;
       @include transition(all 0.15s ease-in 0s);
       &:focus {
-        @extend .span4;
+        @extend .col-md-4;
       }
     }
   }
diff --git a/app/assets/stylesheets/sections/notes.scss b/app/assets/stylesheets/sections/notes.scss
index af1f7880a71..717fb50b786 100644
--- a/app/assets/stylesheets/sections/notes.scss
+++ b/app/assets/stylesheets/sections/notes.scss
@@ -302,7 +302,7 @@ ul.notes {
 }
 
 .note-image-attach {
-  @extend .span4;
+  @extend .col-md-4;
   @extend .thumbnail;
   margin-left: 45px;
 }
diff --git a/app/assets/stylesheets/sections/wall.scss b/app/assets/stylesheets/sections/wall.scss
index d6ac08fcf6f..3705afdb87c 100644
--- a/app/assets/stylesheets/sections/wall.scss
+++ b/app/assets/stylesheets/sections/wall.scss
@@ -1,6 +1,6 @@
 .wall-page {
   .wall-note-form {
-    @extend .span12;
+    @extend .col-md-12;
 
     margin: 0;
     height: 140px;