diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-01-02 14:33:15 +0200 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-01-02 14:33:15 +0200 |
| commit | b512fbc0ecba0a8de9c9efe5c7d82a97f0ea744c (patch) | |
| tree | 8fbb473fbf589c11439908a78269df132b9fb66d | |
| parent | 7617ff56f290218dc80c78f5c941a28ac9f8538c (diff) | |
| download | gitlab-ce-b512fbc0ecba0a8de9c9efe5c7d82a97f0ea744c.tar.gz | |
Style search page for twbs3
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| -rw-r--r-- | app/views/projects/commits/_diffs.html.haml | 4 | ||||
| -rw-r--r-- | app/views/search/show.html.haml | 22 |
2 files changed, 15 insertions, 11 deletions
diff --git a/app/views/projects/commits/_diffs.html.haml b/app/views/projects/commits/_diffs.html.haml index 2a32f56e8f0..a41a89bb972 100644 --- 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 52efdb608bc..3b6f10d4d9c 100644 --- 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? |