diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-09-16 19:59:21 +0200 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-09-16 19:59:21 +0200 |
commit | 07d20657ceb0ac74f7f03149e1e4369a73c99c26 (patch) | |
tree | b27bcbe6358b16c694d10d675b9a10cb667921af | |
parent | a0aa6453bd0099a0e1d0bfd6725fff8aaa9d29a9 (diff) | |
download | gitlab-ce-07d20657ceb0ac74f7f03149e1e4369a73c99c26.tar.gz |
Style CI projects page and builds list
-rw-r--r-- | app/assets/stylesheets/ci/projects.scss | 51 | ||||
-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 |
4 files changed, 56 insertions, 21 deletions
diff --git a/app/assets/stylesheets/ci/projects.scss b/app/assets/stylesheets/ci/projects.scss index b246fb9e07d..e5d69360c2c 100644 --- a/app/assets/stylesheets/ci/projects.scss +++ b/app/assets/stylesheets/ci/projects.scss @@ -6,19 +6,54 @@ line-height: 1.5; } - .builds { - @extend .table; - - .build { - &.alert{ - margin-bottom: 6px; - } - } + .wide-table-holder { + margin-left: -$gl-padding; + margin-right: -$gl-padding; } + .builds, .projects-table { + .alert-success { + background-color: #6fc995; + border-color: #5bba83; + } + + .alert-danger { + background-color: #eb897f; + border-color: #d4776e; + } + + .alert-info { + background-color: #3498db; + border-color: #2e8ece; + } + + .alert-warning { + background-color: #EB974E; + border-color: #E87E04; + } + + .alert-disabled { + background: $background-color; + border-color: $border-color; + } + + .light { + border-color: $border-color; + } + + th, td { + padding: 10px $gl-padding; + } + td { vertical-align: middle !important; + border-color: inherit !important; + + a { + font-weight: normal; + text-decoration: none; + } } } 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 |