Style search page for twbs3

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

diff --git a/app/views/projects/commits/_diffs.html.haml b/app/views/projects/commits/_diffs.html.haml
index 2a32f56..a41a89b 100644 (file)
--- a/app/views/projects/commits/_diffs.html.haml
+++ b/app/views/projects/commits/_diffs.html.haml
@@ -1,6 +1,6 @@
 - @suppress_diff ||= @suppress_diff || @force_suppress_diff
 - if @suppress_diff
-  .alert.alert-block
+  .alert.alert-warning
     %p
       %strong Warning! This is a large diff.
     %p
@@ -67,7 +67,7 @@
           - next unless file.respond_to?('text?')
           - if file.text?
             - if params[:view] == 'parallel'
-              = render "projects/commits/parallel_view", diff: diff, project: project, file: file, index: i            
+              = render "projects/commits/parallel_view", diff: diff, project: project, file: file, index: i
             - else
               = render "projects/commits/text_file", diff: diff, index: i
           - elsif file.image?

diff --git a/app/views/search/show.html.haml b/app/views/search/show.html.haml
index 52efdb6..3b6f10d 100644 (file)
--- a/app/views/search/show.html.haml
+++ b/app/views/search/show.html.haml
@@ -1,15 +1,19 @@
-= form_tag search_path, method: :get, class: 'form-inline' do |f|
-  .search-holder
-    = label_tag :search do
-      %span Looking for
-    .col-sm-10
-      = search_field_tag :search, params[:search], placeholder: "issue 143", class: "form-control search-text-input", id: "dashboard_search"
+= form_tag search_path, method: :get, class: 'form-horizontal' do |f|
+  .search-holder.clearfix
+    .form-group
+      = label_tag :search, class: 'control-label' do
+        %span Looking for
+      .col-sm-6
+        = search_field_tag :search, params[:search], placeholder: "issue 143", class: "form-control search-text-input", id: "dashboard_search"
+      .col-sm-4
+        = submit_tag 'Search', class: "btn btn-create"
+    .form-group
+      .col-sm-2
+      .col-sm-10
+        = render 'filter', f: f
       = hidden_field_tag :project_id, params[:project_id]
       = hidden_field_tag :group_id, params[:group_id]
       = hidden_field_tag :search_code, params[:search_code]
-      = submit_tag 'Search', class: "btn btn-create"
-      .prepend-top-10
-        = render 'filter', f: f
 
   .results.prepend-top-10
     - if params[:search].present?