Download as
Browse Code »

Commit b512fbc0ecba0a8de9c9efe5c7d82a97f0ea744c

Authored by Dmitriy Zaporozhets
1 parent 7617ff56
Exists in spb-stable and in 3 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb

Style search page for twbs3 

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Showing 2 changed files with 15 additions and 11 deletions   Show diff stats
app/views/projects/commits/_diffs.html.haml
  Diff comments   View file @b512fbc
1 1 - @suppress_diff ||= @suppress_diff || @force_suppress_diff
2 2 - if @suppress_diff
3   - .alert.alert-block
  3 + .alert.alert-warning
4 4 %p
5 5 %strong Warning! This is a large diff.
6 6 %p
... ... @@ -67,7 +67,7 @@
67 67 - next unless file.respond_to?('text?')
68 68 - if file.text?
69 69 - if params[:view] == 'parallel'
70   - = render "projects/commits/parallel_view", diff: diff, project: project, file: file, index: i
  70 + = render "projects/commits/parallel_view", diff: diff, project: project, file: file, index: i
71 71 - else
72 72 = render "projects/commits/text_file", diff: diff, index: i
73 73 - elsif file.image?
... ...
app/views/search/show.html.haml
  Diff comments   View file @b512fbc
1   -= form_tag search_path, method: :get, class: 'form-inline' do |f|
2   - .search-holder
3   - = label_tag :search do
4   - %span Looking for
5   - .col-sm-10
6   - = search_field_tag :search, params[:search], placeholder: "issue 143", class: "form-control search-text-input", id: "dashboard_search"
  1 += form_tag search_path, method: :get, class: 'form-horizontal' do |f|
  2 + .search-holder.clearfix
  3 + .form-group
  4 + = label_tag :search, class: 'control-label' do
  5 + %span Looking for
  6 + .col-sm-6
  7 + = search_field_tag :search, params[:search], placeholder: "issue 143", class: "form-control search-text-input", id: "dashboard_search"
  8 + .col-sm-4
  9 + = submit_tag 'Search', class: "btn btn-create"
  10 + .form-group
  11 + .col-sm-2
  12 + .col-sm-10
  13 + = render 'filter', f: f
7 14 = hidden_field_tag :project_id, params[:project_id]
8 15 = hidden_field_tag :group_id, params[:group_id]
9 16 = hidden_field_tag :search_code, params[:search_code]
10   - = submit_tag 'Search', class: "btn btn-create"
11   - .prepend-top-10
12   - = render 'filter', f: f
13 17  
14 18 .results.prepend-top-10
15 19 - if params[:search].present?
... ...