mirror of
https://github.com/wahyd4/gitlabhq.git
synced 2026-08-20 10:06:04 +10:00
Merge branch 'ui-improvements' into 'master'
Ui improvements * improve UI for commits, issues and merge requests lists * refactor commit css See merge request !1550
This commit is contained in:
Dmitriy Zaporozhets
@@ -1,5 +1,5 @@
|
||||
v 7.9.0 (unreleased)
|
||||
- Fix broken access control for note attachments (Hannes Rosenögger)
|
||||
- Move labels/milestones tabs to sidebar
|
||||
|
||||
v 7.8.0 (unreleased)
|
||||
- Replace highlight.js with rouge-fork rugments (Stefan Tatschner)
|
||||
|
||||
@@ -0,0 +1,131 @@
|
||||
.commit-title{
|
||||
display: block;
|
||||
}
|
||||
|
||||
.commit-title{
|
||||
margin-bottom: 10px;
|
||||
}
|
||||
|
||||
.commit-author, .commit-committer{
|
||||
display: block;
|
||||
color: #999;
|
||||
font-weight: normal;
|
||||
font-style: italic;
|
||||
}
|
||||
|
||||
.commit-author strong, .commit-committer strong{
|
||||
font-weight: bold;
|
||||
font-style: normal;
|
||||
}
|
||||
|
||||
.commit-description {
|
||||
background: none;
|
||||
border: none;
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
margin-top: 10px;
|
||||
}
|
||||
|
||||
.commit-stat-summary {
|
||||
color: #666;
|
||||
font-size: 14px;
|
||||
font-weight: normal;
|
||||
padding: 10px 0;
|
||||
}
|
||||
|
||||
.commit-info-row {
|
||||
margin-bottom: 10px;
|
||||
.avatar {
|
||||
@extend .avatar-inline;
|
||||
}
|
||||
.commit-committer-link,
|
||||
.commit-author-link {
|
||||
color: #444;
|
||||
font-weight: bold;
|
||||
}
|
||||
}
|
||||
|
||||
.commit-committer-link,
|
||||
.commit-author-link {
|
||||
font-size: 13px;
|
||||
color: #555;
|
||||
&:hover {
|
||||
color: #999;
|
||||
}
|
||||
}
|
||||
|
||||
.commit-box {
|
||||
margin: 10px 0;
|
||||
border-top: 1px solid #ddd;
|
||||
border-bottom: 1px solid #ddd;
|
||||
padding: 20px 0;
|
||||
|
||||
.commit-title {
|
||||
margin: 0;
|
||||
}
|
||||
|
||||
.commit-description {
|
||||
margin-top: 15px;
|
||||
}
|
||||
}
|
||||
|
||||
.file-stats a {
|
||||
color: $style_color;
|
||||
}
|
||||
|
||||
.file-stats {
|
||||
.new-file {
|
||||
a {
|
||||
color: #090;
|
||||
}
|
||||
i {
|
||||
color: #1BCF00;
|
||||
}
|
||||
}
|
||||
.renamed-file {
|
||||
i {
|
||||
color: #FE9300;
|
||||
}
|
||||
}
|
||||
.deleted-file {
|
||||
a {
|
||||
color: #B00;
|
||||
}
|
||||
i {
|
||||
color: #EE0000;
|
||||
}
|
||||
}
|
||||
.edit-file{
|
||||
i{
|
||||
color: #555;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
* Commit message textarea for web editor and
|
||||
* custom merge request message
|
||||
*/
|
||||
.commit-message-container {
|
||||
background-color: $body-bg;
|
||||
position: relative;
|
||||
font-family: $monospace_font;
|
||||
$left: 12px;
|
||||
.max-width-marker {
|
||||
width: 72ch;
|
||||
color: rgba(0, 0, 0, 0.0);
|
||||
font-family: inherit;
|
||||
left: $left;
|
||||
height: 100%;
|
||||
border-right: 1px solid mix($input-border, white);
|
||||
position: absolute;
|
||||
z-index: 1;
|
||||
}
|
||||
> textarea {
|
||||
background-color: rgba(0, 0, 0, 0.0);
|
||||
font-family: inherit;
|
||||
padding-left: $left;
|
||||
position: relative;
|
||||
z-index: 2;
|
||||
}
|
||||
}
|
||||
@@ -1,77 +1,3 @@
|
||||
/**
|
||||
* Commit file
|
||||
*/
|
||||
.commit-committer-link,
|
||||
.commit-author-link {
|
||||
font-size: 13px;
|
||||
color: #555;
|
||||
&:hover {
|
||||
color: #999;
|
||||
}
|
||||
}
|
||||
|
||||
/** COMMIT BLOCK **/
|
||||
.commit-title{
|
||||
display: block;
|
||||
}
|
||||
.commit-title{
|
||||
margin-bottom: 10px;
|
||||
}
|
||||
.commit-author, .commit-committer{
|
||||
display: block;
|
||||
color: #999;
|
||||
font-weight: normal;
|
||||
font-style: italic;
|
||||
}
|
||||
.commit-author strong, .commit-committer strong{
|
||||
font-weight: bold;
|
||||
font-style: normal;
|
||||
}
|
||||
|
||||
|
||||
.file-stats a {
|
||||
color: $style_color;
|
||||
}
|
||||
|
||||
.file-stats {
|
||||
.new-file {
|
||||
a {
|
||||
color: #090;
|
||||
}
|
||||
i {
|
||||
color: #1BCF00;
|
||||
}
|
||||
}
|
||||
.renamed-file {
|
||||
i {
|
||||
color: #FE9300;
|
||||
}
|
||||
}
|
||||
.deleted-file {
|
||||
a {
|
||||
color: #B00;
|
||||
}
|
||||
i {
|
||||
color: #EE0000;
|
||||
}
|
||||
}
|
||||
.edit-file{
|
||||
i{
|
||||
color: #555;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.label_commit {
|
||||
@include border-radius(4px);
|
||||
padding: 2px 4px;
|
||||
font-size: 13px;
|
||||
background: #474D57;
|
||||
color: #fff;
|
||||
font-family: $monospace_font;
|
||||
}
|
||||
|
||||
|
||||
.commits-compare-switch{
|
||||
background: image-url("switch_icon.png") no-repeat center center;
|
||||
width: 32px;
|
||||
@@ -85,60 +11,40 @@
|
||||
background-color: #EEE;
|
||||
}
|
||||
|
||||
.commit-description {
|
||||
background: none;
|
||||
border: none;
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
margin-top: 10px;
|
||||
}
|
||||
|
||||
.commit-box {
|
||||
margin: 10px 0;
|
||||
border-top: 1px solid #ddd;
|
||||
border-bottom: 1px solid #ddd;
|
||||
padding: 20px 0;
|
||||
|
||||
.commit-title {
|
||||
margin: 0;
|
||||
}
|
||||
|
||||
.commit-description {
|
||||
margin-top: 15px;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
.commit-stat-summary {
|
||||
color: #666;
|
||||
font-size: 14px;
|
||||
font-weight: normal;
|
||||
padding: 10px 0;
|
||||
}
|
||||
|
||||
.commit-info-row {
|
||||
margin-bottom: 10px;
|
||||
.avatar {
|
||||
@extend .avatar-inline;
|
||||
}
|
||||
.commit-committer-link,
|
||||
.commit-author-link {
|
||||
color: #444;
|
||||
font-weight: bold;
|
||||
}
|
||||
}
|
||||
|
||||
.lists-separator {
|
||||
margin: 10px 0;
|
||||
border-top: 1px dashed #CCC;
|
||||
}
|
||||
|
||||
/**
|
||||
* COMMIT ROW
|
||||
*/
|
||||
.commits-row {
|
||||
ul {
|
||||
margin: 0;
|
||||
|
||||
li.commit {
|
||||
padding: 8px 0;
|
||||
}
|
||||
}
|
||||
|
||||
.commits-row-date {
|
||||
font-size: 15px;
|
||||
line-height: 20px;
|
||||
margin-bottom: 5px;
|
||||
}
|
||||
}
|
||||
|
||||
.commits-feed-holder {
|
||||
float: right;
|
||||
|
||||
.btn {
|
||||
padding: 4px 12px;
|
||||
}
|
||||
}
|
||||
|
||||
li.commit {
|
||||
.commit-row-title {
|
||||
font-size: $list-font-size;
|
||||
line-height: 20px;
|
||||
margin-bottom: 2px;
|
||||
|
||||
.notes_count {
|
||||
@@ -156,9 +62,9 @@ li.commit {
|
||||
}
|
||||
|
||||
.commit-row-message {
|
||||
color: #333;
|
||||
color: #444;
|
||||
|
||||
&:hover {
|
||||
color: #444;
|
||||
text-decoration: underline;
|
||||
}
|
||||
}
|
||||
@@ -193,13 +99,14 @@ li.commit {
|
||||
|
||||
.commit-row-info {
|
||||
color: #777;
|
||||
line-height: 24px;
|
||||
|
||||
a {
|
||||
color: #777;
|
||||
}
|
||||
|
||||
.committed_ago {
|
||||
float: right;
|
||||
display: inline-block;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -214,34 +121,3 @@ li.commit {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.commits-feed-holder {
|
||||
float: right;
|
||||
.btn {
|
||||
padding: 4px 12px;
|
||||
}
|
||||
}
|
||||
|
||||
.commit-message-container {
|
||||
background-color: $body-bg;
|
||||
position: relative;
|
||||
font-family: $monospace_font;
|
||||
$left: 12px;
|
||||
.max-width-marker {
|
||||
width: 72ch;
|
||||
color: rgba(0, 0, 0, 0.0);
|
||||
font-family: inherit;
|
||||
left: $left;
|
||||
height: 100%;
|
||||
border-right: 1px solid mix($input-border, white);
|
||||
position: absolute;
|
||||
z-index: 1;
|
||||
}
|
||||
> textarea {
|
||||
background-color: rgba(0, 0, 0, 0.0);
|
||||
font-family: inherit;
|
||||
padding-left: $left;
|
||||
position: relative;
|
||||
z-index: 2;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -6,6 +6,7 @@
|
||||
.issue-title {
|
||||
margin-bottom: 5px;
|
||||
font-size: $list-font-size;
|
||||
font-weight: bold;
|
||||
}
|
||||
|
||||
.issue-info {
|
||||
|
||||
@@ -91,6 +91,7 @@
|
||||
.merge-request-title {
|
||||
margin-bottom: 5px;
|
||||
font-size: $list-font-size;
|
||||
font-weight: bold;
|
||||
}
|
||||
|
||||
.merge-request-info {
|
||||
|
||||
@@ -1,8 +1,6 @@
|
||||
%li.commit.js-toggle-container
|
||||
.commit-row-title
|
||||
= link_to commit.short_id, project_commit_path(project, commit), class: "commit_short_id"
|
||||
|
||||
%span.str-truncated
|
||||
%strong.str-truncated
|
||||
= link_to_gfm commit.title, project_commit_path(project, commit.id), class: "commit-row-message"
|
||||
- if commit.description?
|
||||
%a.text-expander.js-toggle-button ...
|
||||
@@ -26,6 +24,9 @@
|
||||
= preserve(gfm(escape_once(commit.description)))
|
||||
|
||||
.commit-row-info
|
||||
= commit_author_link(commit, avatar: true, size: 16)
|
||||
= commit_author_link(commit, avatar: true, size: 24)
|
||||
authored
|
||||
.committed_ago
|
||||
#{time_ago_with_tooltip(commit.committed_date)}
|
||||
.pull-right
|
||||
= link_to commit.short_id, project_commit_path(project, commit), class: "commit_short_id"
|
||||
|
||||
@@ -3,12 +3,13 @@
|
||||
|
||||
- @commits.group_by { |c| c.committed_date.to_date }.sort.reverse.each do |day, commits|
|
||||
.row.commits-row
|
||||
.col-md-2
|
||||
%h4
|
||||
.col-md-2.hidden-xs.hidden-sm
|
||||
%h5.commits-row-date
|
||||
%i.fa.fa-calendar
|
||||
%span= day.stamp("28 Aug, 2010")
|
||||
%p= pluralize(commits.count, 'commit')
|
||||
.col-md-10
|
||||
.light
|
||||
= pluralize(commits.count, 'commit')
|
||||
.col-md-10.col-sm-12
|
||||
%ul.bordered-list
|
||||
= render commits, project: project
|
||||
%hr.lists-separator
|
||||
|
||||
@@ -6,9 +6,15 @@
|
||||
.issue-title
|
||||
%span.str-truncated
|
||||
= link_to_gfm issue.title, project_issue_path(issue.project, issue), class: "row_title"
|
||||
- if issue.closed?
|
||||
%small.pull-right
|
||||
CLOSED
|
||||
.pull-right
|
||||
- if issue.closed?
|
||||
%span
|
||||
CLOSED
|
||||
- if issue.notes.any?
|
||||
|
||||
%span
|
||||
%i.fa.fa-comments
|
||||
= issue.notes.count
|
||||
|
||||
.issue-info
|
||||
%span.light= "##{issue.iid}"
|
||||
@@ -16,10 +22,6 @@
|
||||
assigned to #{link_to_member(@project, issue.assignee)}
|
||||
- if issue.votes_count > 0
|
||||
= render 'votes/votes_inline', votable: issue
|
||||
- if issue.notes.any?
|
||||
%span
|
||||
%i.fa.fa-comments
|
||||
= issue.notes.count
|
||||
- if issue.milestone
|
||||
%span
|
||||
%i.fa.fa-clock-o
|
||||
|
||||
@@ -1,18 +1,26 @@
|
||||
%li{ class: mr_css_classes(merge_request) }
|
||||
.merge-request-title
|
||||
= link_to_gfm truncate(merge_request.title, length: 80), project_merge_request_path(merge_request.target_project, merge_request), class: "row_title"
|
||||
- if merge_request.merged?
|
||||
%small.pull-right
|
||||
%i.fa.fa-check
|
||||
MERGED
|
||||
- else
|
||||
%span.pull-right.hidden-xs
|
||||
- if merge_request.for_fork?
|
||||
%span.light
|
||||
#{merge_request.source_project_namespace}:
|
||||
= truncate merge_request.source_branch, length: 25
|
||||
%i.fa.fa-angle-right.light
|
||||
= merge_request.target_branch
|
||||
%span.str-truncated
|
||||
= link_to_gfm merge_request.title, project_merge_request_path(merge_request.target_project, merge_request), class: "row_title"
|
||||
.pull-right
|
||||
- if merge_request.merged?
|
||||
%span
|
||||
%i.fa.fa-check
|
||||
MERGED
|
||||
- elsif merge_request.closed?
|
||||
%span
|
||||
%i.fa.fa-close
|
||||
CLOSED
|
||||
- else
|
||||
%span.hidden-xs.hidden-sm
|
||||
%span.label-branch<
|
||||
%i.fa.fa-code-fork
|
||||
%span= merge_request.target_branch
|
||||
- if merge_request.notes.any?
|
||||
|
||||
%span
|
||||
%i.fa.fa-comments
|
||||
= merge_request.mr_and_commit_notes.count
|
||||
.merge-request-info
|
||||
%span.light= "##{merge_request.iid}"
|
||||
- if merge_request.assignee
|
||||
@@ -21,10 +29,6 @@
|
||||
Unassigned
|
||||
- if merge_request.votes_count > 0
|
||||
= render 'votes/votes_inline', votable: merge_request
|
||||
- if merge_request.notes.any?
|
||||
%span
|
||||
%i.fa.fa-comments
|
||||
= merge_request.mr_and_commit_notes.count
|
||||
- if merge_request.milestone_id?
|
||||
%span
|
||||
%i.fa.fa-clock-o
|
||||
@@ -33,6 +37,7 @@
|
||||
%span.task-status
|
||||
= merge_request.task_status
|
||||
|
||||
|
||||
.pull-right.hidden-xs
|
||||
%small updated #{time_ago_with_tooltip(merge_request.updated_at, 'bottom', 'merge_request_updated_ago')}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user