diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-09-16 18:57:35 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-09-16 18:57:35 +0000 |
| commit | 6cf554bd3c41ceba1f02424ff12120b3b768759d (patch) | |
| tree | aea0e4ab0430f4e43e8aa72baf33bd14cf8a16a8 /app/views | |
| parent | f7365ae33efb0690bb1b00260f9dc66bba4b794d (diff) | |
| parent | 07d20657ceb0ac74f7f03149e1e4369a73c99c26 (diff) | |
| download | gitlab-ce-6cf554bd3c41ceba1f02424ff12120b3b768759d.tar.gz | |
Merge branch 'style-ci-page' into 'master'
Style CI projects page and builds list
Partly implements #2545
See merge request !1315
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/ci/projects/_project.html.haml | 2 | ||||
| -rw-r--r-- | app/views/ci/projects/gitlab.html.haml | 22 | ||||
| -rw-r--r-- | app/views/ci/projects/index.html.haml | 2 |
3 files changed, 13 insertions, 13 deletions
diff --git a/app/views/ci/projects/_project.html.haml b/app/views/ci/projects/_project.html.haml index b3ad47ce432..e4a811119e1 100644 --- a/app/views/ci/projects/_project.html.haml +++ b/app/views/ci/projects/_project.html.haml @@ -2,7 +2,7 @@ %tr.alert{class: commit_status_alert_class(last_commit) } %td = link_to [:ci, project] do - %strong= project.name + = project.name %td - if last_commit #{last_commit.status} (#{commit_link(last_commit)}) diff --git a/app/views/ci/projects/gitlab.html.haml b/app/views/ci/projects/gitlab.html.haml index f57dfcb0790..2101aa932a4 100644 --- a/app/views/ci/projects/gitlab.html.haml +++ b/app/views/ci/projects/gitlab.html.haml @@ -1,22 +1,22 @@ - if @offset == 0 - .clearfix.light + .gray-content-block.clearfix.light.second-block .pull-left.fetch-status - if params[:search].present? by keyword: "#{params[:search]}", #{@total_count} projects, #{@projects.size} of them added to CI - %br - %table.table.projects-table.content-list - %thead - %tr - %th Project Name - %th Last commit - %th Access - %th Commits + .wide-table-holder + %table.table.projects-table.content-list + %thead + %tr + %th Project Name + %th Last commit + %th Access + %th Commits - = render @projects + = render @projects - = render "gl_projects" + = render "gl_projects" %p.text-center.hide.loading %i.fa.fa-refresh.fa-spin diff --git a/app/views/ci/projects/index.html.haml b/app/views/ci/projects/index.html.haml index 085a70811ae..60ab29a66cf 100644 --- a/app/views/ci/projects/index.html.haml +++ b/app/views/ci/projects/index.html.haml @@ -1,7 +1,7 @@ - if current_user .gray-content-block.top-block = render "search" - .projects.prepend-top-default + .projects %p.fetch-status.light %i.fa.fa-refresh.fa-spin :coffeescript |