Commit 6cf554bd authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge branch 'style-ci-page' into 'master'

Style CI projects page and builds list

Partly implements #2545

See merge request !1315
parents f7365ae3 07d20657
...@@ -6,19 +6,54 @@ ...@@ -6,19 +6,54 @@
line-height: 1.5; line-height: 1.5;
} }
.builds { .wide-table-holder {
@extend .table; margin-left: -$gl-padding;
margin-right: -$gl-padding;
.build {
&.alert{
margin-bottom: 6px;
}
}
} }
.builds,
.projects-table { .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 { td {
vertical-align: middle !important; vertical-align: middle !important;
border-color: inherit !important;
a {
font-weight: normal;
text-decoration: none;
}
} }
} }
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
%tr.alert{class: commit_status_alert_class(last_commit) } %tr.alert{class: commit_status_alert_class(last_commit) }
%td %td
= link_to [:ci, project] do = link_to [:ci, project] do
%strong= project.name = project.name
%td %td
- if last_commit - if last_commit
#{last_commit.status} (#{commit_link(last_commit)}) #{last_commit.status} (#{commit_link(last_commit)})
......
- if @offset == 0 - if @offset == 0
.clearfix.light .gray-content-block.clearfix.light.second-block
.pull-left.fetch-status .pull-left.fetch-status
- if params[:search].present? - if params[:search].present?
by keyword: "#{params[:search]}", by keyword: "#{params[:search]}",
#{@total_count} projects, #{@projects.size} of them added to CI #{@total_count} projects, #{@projects.size} of them added to CI
%br
%table.table.projects-table.content-list .wide-table-holder
%thead %table.table.projects-table.content-list
%tr %thead
%th Project Name %tr
%th Last commit %th Project Name
%th Access %th Last commit
%th Commits %th Access
%th Commits
= render @projects = render @projects
= render "gl_projects" = render "gl_projects"
%p.text-center.hide.loading %p.text-center.hide.loading
%i.fa.fa-refresh.fa-spin %i.fa.fa-refresh.fa-spin
......
- if current_user - if current_user
.gray-content-block.top-block .gray-content-block.top-block
= render "search" = render "search"
.projects.prepend-top-default .projects
%p.fetch-status.light %p.fetch-status.light
%i.fa.fa-refresh.fa-spin %i.fa.fa-refresh.fa-spin
:coffeescript :coffeescript
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment