Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Project board improvements #15429

Merged
merged 6 commits into from
Apr 20, 2021
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 19 additions & 17 deletions templates/repo/projects/view.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -73,13 +73,13 @@
{{ range $board := .Boards }}

<div class="ui segment board-column" data-id="{{.ID}}" data-sorting="{{.Sorting}}" data-url="{{$.RepoLink}}/projects/{{$.Project.ID}}/{{.ID}}">
<div class="board-column-header">
<div class="ui large label board-label">{{.Title}}</div>
<div class="board-column-header df ac sb">
<div class="ui large label board-label py-2">{{.Title}}</div>
{{if and $.CanWriteProjects (not $.Repository.IsArchived) $.PageIsProjects (ne .ID 0)}}
<div class="ui dropdown jump item poping up right" data-variation="tiny inverted">
<span class="ui text">
<span class="fitted not-mobile" tabindex="-1">{{svg "octicon-kebab-horizontal" 24}}</span>
</span>
<div class="ui dropdown jump item poping up" data-variation="tiny inverted">
<div class="not-mobile px-3" tabindex="-1">
{{svg "octicon-kebab-horizontal"}}
</div>
<div class="menu user-menu" tabindex="-1">
<a class="item show-modal button" data-modal="#edit-project-board-modal-{{.ID}}">
{{svg "octicon-pencil"}}
Expand Down Expand Up @@ -156,9 +156,9 @@

<!-- start issue card -->
<div class="card board-card" data-issue="{{.ID}}">
<div class="content">
<div class="content p-0">
<div class="header">
<span>
<span class="dif ac vm {{if .IsClosed}}red{{else}}green{{end}}">
{{if .IsPull}}
{{if .PullRequest.HasMerged}}
{{svg "octicon-git-merge" 16 "text purple"}}
Expand All @@ -177,29 +177,31 @@
{{end}}
{{end}}
</span>
<a class="project-board-title" href="{{$.RepoLink}}/issues/{{.Index}}">#{{.Index}} {{.Title}}</a>
<a class="project-board-title vm" href="{{$.RepoLink}}/issues/{{.Index}}">#{{.Index}} {{.Title}}</a>
</div>
{{- if .MilestoneID }}
<div class="meta">
<div class="meta py-2">
<a class="milestone" href="{{$.RepoLink}}/milestone/{{ .MilestoneID}}">
{{svg "octicon-milestone"}} {{ .Milestone.Name }}
{{svg "octicon-milestone" 16 "mr-2"}}{{ .Milestone.Name }}
</a>
</div>
{{- end }}
{{- range index $.LinkedPRs .ID }}
<div class="meta">
<div class="meta py-2">
<a href="{{$.RepoLink}}/pulls/{{ .Index }}">
<span class="{{if .PullRequest.HasMerged}}purple{{else if .IsClosed}}red{{else}}green{{end}}">{{svg "octicon-git-merge"}}</span>
{{ .Title}} (#{{ .Index }})
</a>
</div>
{{- end }}
</div>
<div class="extra content">
{{ range .Labels }}
<a class="ui label" href="{{$.RepoLink}}/issues?labels={{.ID}}" style="color: {{.ForegroundColor}}; background-color: {{.Color}}; margin-bottom: 3px;" title="{{.Description | RenderEmojiPlain}}">{{.Name | RenderEmoji}}</a>
{{ end }}
</div>
{{if .Labels}}
<div class="extra content labels-list p-0 pt-2">
{{ range .Labels }}
<a class="ui label" href="{{$.RepoLink}}/issues?labels={{.ID}}" style="color: {{.ForegroundColor}}; background-color: {{.Color}}" title="{{.Description | RenderEmojiPlain}}">{{.Name | RenderEmoji}}</a>
{{ end }}
</div>
{{end}}
</div>
<!-- stop issue card -->

Expand Down
2 changes: 2 additions & 0 deletions web_src/js/features/projects.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ export default async function initProject() {
group: 'board-column',
draggable: '.board-column',
animation: 150,
ghostClass: 'card-ghost',
onSort: () => {
const board = document.getElementsByClassName('board')[0];
const boardColumns = board.getElementsByClassName('board-column');
Expand Down Expand Up @@ -42,6 +43,7 @@ export default async function initProject() {
{
group: 'shared',
animation: 150,
ghostClass: 'card-ghost',
onAdd: (e) => {
$.ajax(`${e.to.dataset.url}/${e.item.dataset.issue}`, {
headers: {
Expand Down
22 changes: 17 additions & 5 deletions web_src/less/_base.less
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,7 @@
--color-expand-button: #d8efff;
--color-placeholder-text: #aaa;
--color-editor-line-highlight: var(--color-primary-light-6);
--color-project-board-bg: var(--color-secondary-light-4);
/* backgrounds */
--checkbox-mask-checked: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="-1 -1 18 18" width="16" height="16"><path fill-rule="evenodd" d="M13.78 4.22a.75.75 0 010 1.06l-7.25 7.25a.75.75 0 01-1.06 0L2.22 9.28a.75.75 0 011.06-1.06L6 10.94l6.72-6.72a.75.75 0 011.06 0z"></path></svg>');
--checkbox-mask-indeterminate: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" width="16" height="16"><path fill-rule="evenodd" d="M2 7.75A.75.75 0 012.75 7h10a.75.75 0 010 1.5h-10A.75.75 0 012 7.75z"></path></svg>');
Expand Down Expand Up @@ -442,6 +443,16 @@ a.muted:hover,
color: var(--color-text);
}

.ui.cards > .card .meta > a:not(.ui),
.ui.card .meta > a:not(.ui) {
color: var(--color-text-light-2);
}

.ui.cards > .card .meta > a:not(.ui):hover,
.ui.card .meta > a:not(.ui):hover {
color: var(--color-text);
}

.ui.cards a.card:hover,
.ui.link.cards .card:not(.icon):hover,
a.ui.card:hover,
Expand All @@ -450,6 +461,12 @@ a.ui.card:hover,
background: var(--color-card);
}

.ui.cards > .card > .extra,
.ui.card > .extra {
color: var(--color-text);
border-top-color: var(--color-secondary-light-1) !important;
}

.ui.comments .comment .text,
.ui.comments .comment .author {
color: var(--color-text);
Expand Down Expand Up @@ -1733,11 +1750,6 @@ a.ui.basic.label:hover {
margin-bottom: .4em;
}

.ui.cards > .card > .extra,
.ui.card > .extra {
color: var(--color-text);
}

.color-icon {
display: inline-block;
border-radius: 100%;
Expand Down
76 changes: 0 additions & 76 deletions web_src/less/_repository.less
Original file line number Diff line number Diff line change
Expand Up @@ -2940,82 +2940,6 @@ tbody.commit-list {
padding-top: 0 !important;
}

.board {
display: flex;
flex-direction: row;
flex-wrap: nowrap;
overflow-x: auto;
margin: 0 .5em;
}

.board-column {
background-color: rgba(0, 0, 0, .05) !important;
border: 1px solid var(--color-secondary) !important;
margin: 0 .5rem !important;
padding: .5rem !important;
width: 320px;
height: 60vh;
overflow-y: scroll;
flex: 0 0 auto;
overflow: visible;
display: flex;
flex-direction: column;
}

.board-column-header {
display: flex;
justify-content: space-between;
}

.board-label {
background: none !important;
line-height: 1.25 !important;
}

.board-column > .cards {
flex: 1;
display: flex;
flex-direction: column;
margin: 0 !important;
padding: 0 !important;

.card .meta > a.milestone {
color: #999999;
}
}

.board-column > .divider {
margin: 5px 0;
}

.board-column:first-child {
margin-left: auto !important;
}

.board-column:last-child {
margin-right: auto !important;
}

.board-card {
margin: 3px !important;
width: auto !important;
background-color: #fff;
border-radius: 5px;
cursor: pointer;
}

.board-card .header {
font-size: 1.1em !important;
}

.board-card .content {
padding: 8px 8px 5px !important;
}

.board-card .extra.content {
padding: 5px 8px !important;
}

td.blob-excerpt {
background-color: #fafafa;
}
Expand Down
77 changes: 77 additions & 0 deletions web_src/less/features/projects.less
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
.board {
display: flex;
flex-direction: row;
flex-wrap: nowrap;
overflow-x: auto;
margin: 0 .5em;
}

.board-column {
background-color: var(--color-project-board-bg) !important;
border: 1px solid var(--color-secondary) !important;
margin: 0 .5rem !important;
padding: .5rem !important;
width: 320px;
height: 60vh;
overflow-y: scroll;
flex: 0 0 auto;
overflow: visible;
display: flex;
flex-direction: column;
}

.board-column-header {
display: flex;
justify-content: space-between;
}

.board-label {
background: none !important;
line-height: 1.25 !important;
}

.board-column > .cards {
flex: 1;
display: flex;
margin: 0 !important;
padding: 0 !important;
flex-wrap: nowrap !important;
flex-direction: column;
silverwind marked this conversation as resolved.
Show resolved Hide resolved
}

.project-board-title {
word-break: break-word;
}

.board-column > .divider {
margin: 5px 0;
}

.board-column:first-child {
margin-left: auto !important;
}

.board-column:last-child {
margin-right: auto !important;
}

.board-card {
margin: 3px !important;
border-radius: 5px !important;
cursor: move;
width: calc(100% - 6px) !important;
padding: .5rem !important;
}

.board-card .header {
font-size: 16px !important;
}

.card-ghost {
border-style: dashed !important;
background: none !important;
}

.card-ghost * {
opacity: 0;
}
1 change: 1 addition & 0 deletions web_src/less/index.less
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
@import "./features/heatmap.less";
@import "./features/imagediff.less";
@import "./features/codeeditor.less";
@import "./features/projects.less";
@import "./markdown/mermaid.less";

@import "./chroma/base.less";
Expand Down
5 changes: 1 addition & 4 deletions web_src/less/themes/theme-arc-green.less
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,7 @@
--color-expand-button: #3c404d;
--color-placeholder-text: #6a737d;
--color-editor-line-highlight: var(--color-primary-light-5);
--color-project-board-bg: var(--color-secondary-light-2);
}

.ui.horizontal.segments > .segment {
Expand Down Expand Up @@ -690,10 +691,6 @@ footer .container .links > * {
border-color: #383c4a;
}

.board-column {
background-color: rgba(0, 0, 0, .2) !important;
}

.tribute-container {
box-shadow: 0 .25rem .5rem rgba(0, 0, 0, .6);
}
Expand Down