diff options
| -rw-r--r-- | app/assets/stylesheets/ci/projects.scss | 6 | ||||
| -rw-r--r-- | app/helpers/ci/commits_helper.rb | 2 | ||||
| -rw-r--r-- | app/views/ci/charts/show.html.haml | 2 | ||||
| -rw-r--r-- | app/views/ci/projects/_search.html.haml | 15 | ||||
| -rw-r--r-- | app/views/ci/projects/gitlab.html.haml | 3 | ||||
| -rw-r--r-- | app/views/ci/projects/index.html.haml | 5 | ||||
| -rw-r--r-- | app/views/layouts/ci/_info.html.haml | 5 |
7 files changed, 20 insertions, 18 deletions
diff --git a/app/assets/stylesheets/ci/projects.scss b/app/assets/stylesheets/ci/projects.scss index 167df54453a..b246fb9e07d 100644 --- a/app/assets/stylesheets/ci/projects.scss +++ b/app/assets/stylesheets/ci/projects.scss @@ -47,4 +47,10 @@ .loading{ font-size: 20px; } + + .ci-charts { + fieldset { + margin-bottom: 16px; + } + } } diff --git a/app/helpers/ci/commits_helper.rb b/app/helpers/ci/commits_helper.rb index 994157ed84b..74de30e006e 100644 --- a/app/helpers/ci/commits_helper.rb +++ b/app/helpers/ci/commits_helper.rb @@ -1,7 +1,7 @@ module Ci module CommitsHelper def commit_status_alert_class(commit) - return unless commit + return 'alert-info' unless commit case commit.status when 'success' diff --git a/app/views/ci/charts/show.html.haml b/app/views/ci/charts/show.html.haml index b5fcfc1563c..0497f037721 100644 --- a/app/views/ci/charts/show.html.haml +++ b/app/views/ci/charts/show.html.haml @@ -1,4 +1,4 @@ -#charts +#charts.ci-charts = render 'builds' = render 'build_times' = render 'overall' diff --git a/app/views/ci/projects/_search.html.haml b/app/views/ci/projects/_search.html.haml index e65aaa3870d..6d84b25a6af 100644 --- a/app/views/ci/projects/_search.html.haml +++ b/app/views/ci/projects/_search.html.haml @@ -1,16 +1,15 @@ .search - = form_tag "#", method: :get, class: 'navbar-form' do |f| - .form-group - .input-group - = search_field_tag "search", params[:search], placeholder: "Search", class: "search-input form-control" - .input-group-addon - %i.fa.fa-search + = form_tag "#", method: :get, class: 'ci-search-form' do |f| + .input-group + = search_field_tag "search", params[:search], placeholder: "Search", class: "search-input form-control" + .input-group-addon + %i.fa.fa-search :coffeescript - $('.search .navbar-form').submit -> + $('.ci-search-form').submit -> NProgress.start() - query = $('.search .navbar-form .search-input').val() + query = $('.ci-search-form .search-input').val() $.get '#{gitlab_ci_projects_path}', { search: query }, (data) -> $(".projects").html data.html NProgress.done() diff --git a/app/views/ci/projects/gitlab.html.haml b/app/views/ci/projects/gitlab.html.haml index 690b6cf3cdb..f57dfcb0790 100644 --- a/app/views/ci/projects/gitlab.html.haml +++ b/app/views/ci/projects/gitlab.html.haml @@ -3,9 +3,6 @@ .pull-left.fetch-status - if params[:search].present? by keyword: "#{params[:search]}", - %br - - .pull-right #{@total_count} projects, #{@projects.size} of them added to CI %br diff --git a/app/views/ci/projects/index.html.haml b/app/views/ci/projects/index.html.haml index 4c74610a575..085a70811ae 100644 --- a/app/views/ci/projects/index.html.haml +++ b/app/views/ci/projects/index.html.haml @@ -1,6 +1,7 @@ - if current_user - = render "search" - .projects + .gray-content-block.top-block + = render "search" + .projects.prepend-top-default %p.fetch-status.light %i.fa.fa-refresh.fa-spin :coffeescript diff --git a/app/views/layouts/ci/_info.html.haml b/app/views/layouts/ci/_info.html.haml index f7230f44242..24c68a6dbf5 100644 --- a/app/views/layouts/ci/_info.html.haml +++ b/app/views/layouts/ci/_info.html.haml @@ -1,3 +1,2 @@ -.container - - if current_user && current_user.is_admin? && Ci::Runner.count.zero? - = render 'ci/shared/no_runners' +- if current_user && current_user.is_admin? && Ci::Runner.count.zero? + = render 'ci/shared/no_runners' |