Merge branch 'style-ci-page' into 'master'
Style CI projects page and builds list Partly implements #2545 See merge request !1315
This commit is contained in:
commit
6cf554bd3c
4 changed files with 56 additions and 21 deletions
|
@ -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;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -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)})
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue