{{/* overflow: auto is the clearfix - this avoids the image going beyond
the container where it is supposed to stay inside. */}}
-
@@ -8,8 +8,8 @@
{{end}}
{{.Org.DisplayName}}
- {{if .Org.Visibility.IsLimited}}
diff --git a/templates/repo/header.tmpl b/templates/repo/header.tmpl
index 77f2362f8e..51f49b5994 100644
--- a/templates/repo/header.tmpl
+++ b/templates/repo/header.tmpl
@@ -28,7 +28,9 @@
{{end}}
{{end}}
{{end}}
- {{if .IsArchived}}{{$.i18n.Tr "repo.desc.archived"}}{{end}}
+ {{if .IsArchived}}
+ {{$.i18n.Tr "repo.desc.archived"}}
+ {{end}}
{{if .IsMirror}}{{.i18n.Tr "org.settings.visibility.limited_shortname"}}
{{end}}
- {{if .Org.Visibility.IsPrivate}}{{.i18n.Tr "org.settings.visibility.private_shortname"}}
{{end}}
+ {{if .Org.Visibility.IsLimited}}{{.i18n.Tr "org.settings.visibility.limited_shortname"}}
{{end}}
+ {{if .Org.Visibility.IsPrivate}}{{.i18n.Tr "org.settings.visibility.private_shortname"}}
{{end}}
{{if .IsOrganizationOwner}}{{svg "octicon-gear"}}{{end}}
{{$.i18n.Tr "repo.mirror_from"}} {{if .SanitizedOriginalURL}}{{.SanitizedOriginalURL}}{{else}}{{MirrorAddress $.Mirror}}{{end}}
{{end}}
{{if .IsFork}}{{$.i18n.Tr "repo.forked_from"}} {{SubStr .BaseRepo.RelLink 1 -1}}
{{end}}
{{if .IsGenerated}}{{$.i18n.Tr "repo.generated_from"}} {{SubStr .TemplateRepo.RelLink 1 -1}}
{{end}}
diff --git a/templates/repo/home.tmpl b/templates/repo/home.tmpl
index 73508bdd2f..98c5aa5738 100644
--- a/templates/repo/home.tmpl
+++ b/templates/repo/home.tmpl
@@ -23,12 +23,12 @@
- {{range .Topics}}{{.Name}}{{end}}
- {{if and .Permission.IsAdmin (not .Repository.IsArchived)}}{{.i18n.Tr "repo.topic.manage_topics"}}{{end}}
+
+ {{range .Topics}}{{.Name}}{{end}}
+ {{if and .Permission.IsAdmin (not .Repository.IsArchived)}}{{.i18n.Tr "repo.topic.manage_topics"}}{{end}}
{{if and .Permission.IsAdmin (not .Repository.IsArchived)}}
-
+
@@ -133,61 +140,66 @@
{{.GetDisplayName}}
@@ -218,7 +230,7 @@
{{.i18n.Tr "repo.issues.new.no_assignees"}}
{{range .Assignees}}
-
+
{{.GetDisplayName}}
{{end}}
diff --git a/templates/repo/issue/view_content/sidebar.tmpl b/templates/repo/issue/view_content/sidebar.tmpl
index 18bd11ce6a..de1fd58232 100644
--- a/templates/repo/issue/view_content/sidebar.tmpl
+++ b/templates/repo/issue/view_content/sidebar.tmpl
@@ -55,8 +55,8 @@
{{range .PullReviewers}}
@@ -264,9 +278,9 @@
{{.i18n.Tr "repo.issues.new.no_assignees"}}
diff --git a/templates/repo/issue/milestone_issues.tmpl b/templates/repo/issue/milestone_issues.tmpl
index 9958efc07d..5794ac422f 100644
--- a/templates/repo/issue/milestone_issues.tmpl
+++ b/templates/repo/issue/milestone_issues.tmpl
@@ -14,9 +14,9 @@
{{if not .Repository.IsArchived}}
diff --git a/templates/repo/issue/new_form.tmpl b/templates/repo/issue/new_form.tmpl
index 73a3851e17..4814ba590b 100644
--- a/templates/repo/issue/new_form.tmpl
+++ b/templates/repo/issue/new_form.tmpl
@@ -99,21 +99,25 @@
{{if .OpenMilestones}}
{{if or .CanWriteIssues .CanWritePulls}}
- {{.i18n.Tr "repo.milestones.edit"}}
+ {{.i18n.Tr "repo.milestones.edit"}}
{{end}}
- {{.i18n.Tr "repo.issues.new"}}
+ {{.i18n.Tr "repo.issues.new"}}
{{end}}
- {{svg "octicon-milestone"}}
{{.i18n.Tr "repo.issues.new.open_milestone"}}
{{range .OpenMilestones}}
- {{.Name}}
+
+ {{svg "octicon-milestone" 16 "mr-2"}}
+ {{.Name}}
+
{{end}}
{{end}}
{{if .ClosedMilestones}}
- {{svg "octicon-milestone"}}
{{.i18n.Tr "repo.issues.new.closed_milestone"}}
{{range .ClosedMilestones}}
- {{.Name}}
+
+ {{svg "octicon-milestone" 16 "mr-2"}}
+ {{.Name}}
+
{{end}}
{{end}}
{{end}}
@@ -123,7 +127,10 @@
{{.i18n.Tr "repo.issues.new.no_milestone"}}
{{if .Milestone}}
- {{.Milestone.Name}}
+
+ {{svg "octicon-milestone" 18 "mr-3"}}
+ {{.Milestone.Name}}
+
{{end}}
-
- {{.i18n.Tr "repo.issues.new.projects"}}
- {{if .HasIssuesOrPullsWritePermission}}
- {{svg "octicon-gear"}}
- {{end}}
-
-
-
+
+ {{.i18n.Tr "repo.issues.new.projects"}}
+ {{if .HasIssuesOrPullsWritePermission}}
+ {{svg "octicon-gear"}}
+ {{end}}
+
+ {{.i18n.Tr "repo.issues.new.add_project_title"}}
- {{if or .OpenProjects .ClosedProjects}}
-
- {{svg "octicon-search" 16}}
-
-
- {{end}}
- {{.i18n.Tr "repo.issues.new.clear_projects"}}
- {{if and (not .OpenProjects) (not .ClosedProjects)}}
-
- {{.i18n.Tr "repo.issues.new.no_items"}}
-
- {{else}}
- {{if .OpenProjects}}
-
-
- {{svg "octicon-project"}}
- {{.i18n.Tr "repo.issues.new.open_projects"}}
-
- {{range .OpenProjects}}
- {{.Title}}
- {{end}}
- {{end}}
- {{if .ClosedProjects}}
-
-
- {{svg "octicon-project"}}
- {{.i18n.Tr "repo.issues.new.closed_projects"}}
-
- {{range .ClosedProjects}}
- {{.Title}}
- {{end}}
- {{end}}
- {{end}}
-
+
{{.i18n.Tr "repo.issues.new.add_project_title"}}
+ {{if or .OpenProjects .ClosedProjects}}
+
+ {{svg "octicon-search" 16}}
+
+
+ {{end}}
+ {{.i18n.Tr "repo.issues.new.clear_projects"}}
+ {{if and (not .OpenProjects) (not .ClosedProjects)}}
+
+ {{.i18n.Tr "repo.issues.new.no_items"}}
+
+ {{else}}
+ {{if .OpenProjects}}
+
+
+ {{.i18n.Tr "repo.issues.new.open_projects"}}
+
+ {{range .OpenProjects}}
+
+ {{svg "octicon-project" 18 "mr-3"}}
+ {{.Title}}
+
+ {{end}}
+ {{end}}
+ {{if .ClosedProjects}}
+
+
+ {{.i18n.Tr "repo.issues.new.closed_projects"}}
+
+ {{range .ClosedProjects}}
+
+ {{svg "octicon-project" 18 "mr-3"}}
+ {{.Title}}
+
+ {{end}}
+ {{end}}
+ {{end}}
+
- {{.i18n.Tr "repo.issues.new.no_projects"}}
-
{{end}}
-
-
- {{if .Project}}
- {{.Project.Title}}
- {{end}}
-
+ {{.i18n.Tr "repo.issues.new.no_projects"}}
+
+ {{if .Project}}
+
+ {{svg "octicon-project" 18 "mr-3"}}
+ {{.Project.Title}}
+
+ {{end}}
+
@@ -204,7 +216,7 @@
{{.i18n.Tr "repo.issues.new.clear_assignees"}}
{{range .Assignees}}
-
+
{{svg "octicon-check"}}
{{if .User}}
-
- 
+
+
{{.User.GetDisplayName}}
{{else if .Team}}
@@ -153,21 +153,25 @@
{{if .OpenMilestones}}
{{if .IsProjectsEnabled}}
-
+
- {{svg "octicon-milestone"}}
{{.i18n.Tr "repo.issues.new.open_milestone"}}
{{range .OpenMilestones}}
- {{.Name}}
+
+ {{svg "octicon-milestone" 16 "mr-2"}}
+ {{.Name}}
+
{{end}}
{{end}}
{{if .ClosedMilestones}}
- {{svg "octicon-milestone"}}
{{.i18n.Tr "repo.issues.new.closed_milestone"}}
{{range .ClosedMilestones}}
- {{.Name}}
+
+ {{svg "octicon-milestone" 16 "mr-2"}}
+ {{.Name}}
+
{{end}}
{{end}}
{{end}}
@@ -177,14 +181,17 @@
{{.i18n.Tr "repo.issues.new.no_milestone"}}
{{if .Issue.Milestone}}
- {{.Issue.Milestone.Name}}
+
+ {{svg "octicon-milestone" 18 "mr-3"}}
+ {{.Issue.Milestone.Name}}
+
{{end}}
{{.i18n.Tr "repo.issues.new.projects"}}
@@ -195,21 +202,25 @@
{{if .OpenProjects}}
@@ -218,7 +229,10 @@
{{.i18n.Tr "repo.issues.new.no_projects"}}
- {{svg "octicon-project"}}
{{.i18n.Tr "repo.issues.new.open_projects"}}
{{range .OpenProjects}}
- {{svg "octicon-project"}} {{.Title}}
+
+ {{svg "octicon-project" 18 "mr-3"}}
+ {{.Title}}
+
{{end}}
{{end}}
{{if .ClosedProjects}}
- {{svg "octicon-project"}}
{{.i18n.Tr "repo.issues.new.closed_projects"}}
{{range .ClosedProjects}}
- {{svg "octicon-project"}} {{.Title}}
+
+ {{svg "octicon-project" 18 "mr-3"}}
+ {{.Title}}
+
{{end}}
{{end}}
{{if .Issue.ProjectID}}
- {{svg "octicon-project"}} {{.Issue.Project.Title}}
+
+ {{svg "octicon-project" 18 "mr-3"}}
+ {{.Issue.Project.Title}}
+
{{end}}
{{range .Issue.Assignees}}
-
-
-
+
diff --git a/templates/repo/issue/view_title.tmpl b/templates/repo/issue/view_title.tmpl
index db55142170..e2a14502f4 100644
--- a/templates/repo/issue/view_title.tmpl
+++ b/templates/repo/issue/view_title.tmpl
@@ -1,21 +1,22 @@
diff --git a/templates/repo/sub_menu.tmpl b/templates/repo/sub_menu.tmpl
index 239707f23f..6c455a4d5d 100644
--- a/templates/repo/sub_menu.tmpl
+++ b/templates/repo/sub_menu.tmpl
@@ -1,4 +1,4 @@
-
{{if and (or .HasIssuesOrPullsWritePermission .IsIssuePoster) (not .Repository.IsArchived)}}
-
- #{{.Issue.Index}} {{RenderEmoji .Issue.Title}}
+ {{RenderEmoji .Issue.Title}}
+ #{{.Issue.Index}}
{{if and (or .HasIssuesOrPullsWritePermission .IsIssuePoster) (not .Repository.IsArchived)}}
-
{{if .HasMerged}}
@@ -45,37 +46,37 @@
{{.Issue.Poster.GetDisplayName}}
{{$.i18n.Tr "repo.pulls.title_desc" .NumCommits (.HeadTarget|Escape) (.BaseTarget|Escape) | Str2html}}
-
+
{{end}}
-
-
+ {{.i18n.Tr "repo.issues.edit"}}
-
+
{{end}}
{{.i18n.Tr "repo.issues.edit"}}
+
- #{{.Issue.Index}} {{RenderEmoji .Issue.Title}}
+ {{RenderEmoji .Issue.Title}}
+ #{{.Issue.Index}}
{{if and (or .HasIssuesOrPullsWritePermission .IsIssuePoster) (not .Repository.IsArchived)}}
-
+
+
{{end}}
{{.i18n.Tr "repo.issues.cancel"}}
{{.i18n.Tr "repo.issues.save"}}
-
-
- {{svg "octicon-arrow-right"}}
-
- {{.i18n.Tr "repo.pulls.compare_compare"}}: {{$.HeadTarget}}
-
-
-
-
+
- {{.i18n.Tr "repo.pulls.compare_base"}}: {{$.BaseName}}:{{$.BaseBranch}}
- {{svg "octicon-triangle-down" 14 "dropdown icon"}}
-
-
-
-
- {{svg "octicon-filter" 16}}
-
-
-
- {{range .Branches}}
- {{ $sameBase := ne $.BaseName $.HeadUserName }}
- {{ $differentBranch := ne . $.HeadBranch }}
- {{ if or $sameBase $differentBranch }}
-
- {{$.BaseName}}{{if $.HeadRepo}}/{{$.HeadRepo}}{{end}}:{{.}}
- {{ end }}
- {{end}}
-
+
+ {{svg "octicon-arrow-right"}}
+
+ {{.i18n.Tr "repo.pulls.compare_compare"}}: {{$.HeadTarget}}
+
+
+
+
{{end}}
{{else}}
{{ $createdStr:= TimeSinceUnix .Issue.CreatedUnix $.Lang }}
diff --git a/templates/repo/release/new.tmpl b/templates/repo/release/new.tmpl
index 883d103998..7c38f54019 100644
--- a/templates/repo/release/new.tmpl
+++ b/templates/repo/release/new.tmpl
@@ -67,27 +67,27 @@
{{.i18n.Tr "repo.release.prerelease_helper"}}
+ {{.i18n.Tr "repo.pulls.compare_base"}}: {{$.BaseName}}:{{$.BaseBranch}}
+ {{svg "octicon-triangle-down" 14 "dropdown icon"}}
+
+
+
+
+ {{svg "octicon-filter" 16}}
+
+
+
+ {{range .Branches}}
+ {{ $sameBase := ne $.BaseName $.HeadUserName }}
+ {{ $differentBranch := ne . $.HeadBranch }}
+ {{ if or $sameBase $differentBranch }}
+
+ {{$.BaseName}}{{if $.HeadRepo}}/{{$.HeadRepo}}{{end}}:{{.}}
+ {{ end }}
+ {{end}}
+
{{if .PageIsEditRelease}}
-
+
{{.i18n.Tr "repo.release.cancel"}}
- {{if .IsDraft}}
-
-
- {{else}}
-
- {{end}}
{{$.i18n.Tr "repo.release.delete_release"}}
+ {{if .IsDraft}}
+
+
+ {{else}}
+
+ {{end}}
{{else}}
-
+
{{if and (.Permission.CanRead $.UnitTypeCode) (not .IsEmptyRepo)}}
diff --git a/web_src/js/index.js b/web_src/js/index.js
index 85e1fb082c..cd353b15f2 100644
--- a/web_src/js/index.js
+++ b/web_src/js/index.js
@@ -517,20 +517,23 @@ function initCommentForm() {
$(this).data('id'),
).then(reload);
}
- switch (input_id) {
- case '#milestone_id':
- $list.find('.selected').html(`${
- htmlEscape($(this).text())}`);
- break;
- case '#project_id':
- $list.find('.selected').html(`${
- htmlEscape($(this).text())}`);
- break;
- case '#assignee_id':
- $list.find('.selected').html(`` +
- `.data('avatar')})
${
- htmlEscape($(this).text())}`);
+
+ let icon = '';
+ if (input_id === '#milestone_id') {
+ icon = svg('octicon-milestone', 18, 'mr-3');
+ } else if (input_id === '#project_id') {
+ icon = svg('octicon-project', 18, 'mr-3');
+ } else if (input_id === '#assignee_id') {
+ icon = ``;
}
+
+ $list.find('.selected').html(`
+
+ ${icon}
+ ${htmlEscape($(this).text())}
+
+ `);
+
$(`.ui${select_id}.list .no-select`).addClass('hide');
$(input_id).val($(this).data('id'));
});
@@ -3324,7 +3327,7 @@ function initTopicbar() {
const last = viewDiv.children('a').last();
for (let i = 0; i < topicArray.length; i++) {
- const link = $('');
+ const link = $('');
link.attr('href', `${AppSubUrl}/explore/repos?q=${encodeURIComponent(topicArray[i])}&topic=1`);
link.text(topicArray[i]);
link.insertBefore(last);
diff --git a/web_src/js/svg.js b/web_src/js/svg.js
index ee0b576c31..b7d8c75350 100644
--- a/web_src/js/svg.js
+++ b/web_src/js/svg.js
@@ -6,7 +6,9 @@ import octiconIssueClosed from '../../public/img/svg/octicon-issue-closed.svg';
import octiconIssueOpened from '../../public/img/svg/octicon-issue-opened.svg';
import octiconLink from '../../public/img/svg/octicon-link.svg';
import octiconLock from '../../public/img/svg/octicon-lock.svg';
+import octiconMilestone from '../../public/img/svg/octicon-milestone.svg';
import octiconMirror from '../../public/img/svg/octicon-mirror.svg';
+import octiconProject from '../../public/img/svg/octicon-project.svg';
import octiconRepo from '../../public/img/svg/octicon-repo.svg';
import octiconRepoForked from '../../public/img/svg/octicon-repo-forked.svg';
import octiconRepoTemplate from '../../public/img/svg/octicon-repo-template.svg';
@@ -20,7 +22,9 @@ export const svgs = {
'octicon-issue-opened': octiconIssueOpened,
'octicon-link': octiconLink,
'octicon-lock': octiconLock,
+ 'octicon-milestone': octiconMilestone,
'octicon-mirror': octiconMirror,
+ 'octicon-project': octiconProject,
'octicon-repo': octiconRepo,
'octicon-repo-forked': octiconRepoForked,
'octicon-repo-template': octiconRepoTemplate,
@@ -29,16 +33,15 @@ export const svgs = {
const parser = new DOMParser();
const serializer = new XMLSerializer();
-// retrieve a HTML string for given SVG icon name and size in pixels
-export function svg(name, size = 16) {
- if (name in svgs) {
- if (size === 16) return svgs[name];
+// retrieve a HTML string for given SVG icon name, size and additional classes
+export function svg(name, size = 16, className = '') {
+ if (!(name in svgs)) return '';
+ if (size === 16 && !className) return svgs[name];
- const document = parser.parseFromString(svgs[name], 'image/svg+xml');
- const svgNode = document.firstChild;
- svgNode.setAttribute('width', String(size));
- svgNode.setAttribute('height', String(size));
- return serializer.serializeToString(svgNode);
- }
- return '';
+ const document = parser.parseFromString(svgs[name], 'image/svg+xml');
+ const svgNode = document.firstChild;
+ if (size !== 16) svgNode.setAttribute('width', String(size));
+ if (size !== 16) svgNode.setAttribute('height', String(size));
+ if (className) svgNode.classList.add(...className.split(/\s+/));
+ return serializer.serializeToString(svgNode);
}
diff --git a/web_src/less/_base.less b/web_src/less/_base.less
index a9303146ea..c6f7d043af 100644
--- a/web_src/less/_base.less
+++ b/web_src/less/_base.less
@@ -77,14 +77,23 @@
--color-body: #ffffff;
--color-text: #212121;
--color-text-light: #444444;
+ --color-text-light-2: #888888;
--color-box-header: #f7f7f7;
--color-box-body: #ffffff;
+ --color-footer: #ffffff;
--color-timeline: #ececec;
--color-input-text: #212121;
--color-input-background: #ffffff;
--color-input-border: #dedede;
--color-input-border-hover: #cecece;
--color-navbar: #f8f8f8;
+ --color-label: #00000010;
+ --color-label-hover: #00000015;
+ --color-label-basic: #00000008;
+ --color-label-border: #00000018;
+ --color-hover: #0000000d;
+ --color-active: #00000014;
+ --color-menu: #ffffff;
}
:root:lang(ja) {
@@ -212,7 +221,12 @@ a,
cursor: pointer;
}
+a.muted {
+ color: inherit;
+}
+
a:hover,
+a.muted:hover,
.ui.breadcrumb a:hover {
color: var(--color-primary-dark-2);
}
@@ -226,6 +240,104 @@ a:hover,
border-right-color: var(--color-primary);
}
+.ui.menu {
+ background: var(--color-menu);
+ border-color: var(--color-secondary);
+}
+
+.ui.menu .item {
+ color: var(--color-text);
+}
+
+.ui.link.menu .item:hover,
+.ui.menu .dropdown.item:hover,
+.ui.menu .link.item:hover,
+.ui.menu a.item:hover {
+ color: var(--color-text);
+ background: var(--color-hover);
+}
+
+.ui.menu .active.item,
+.ui.menu .active.item:hover,
+.ui.vertical.menu .active.item:hover {
+ color: var(--color-text);
+ background: var(--color-active);
+}
+
+.ui.link.menu .item:active,
+.ui.menu .link.item:active,
+.ui.menu a.item:active {
+ color: var(--color-text);
+ background: none;
+}
+
+.ui.dropdown .menu {
+ background: var(--color-menu);
+ border-color: var(--color-secondary);
+}
+
+.ui.dropdown .menu > .header:not(.ui) {
+ color: var(--color-text);
+}
+
+.ui.dropdown .menu > .item {
+ color: var(--color-text);
+}
+
+.ui.dropdown .menu > .item:hover {
+ color: var(--color-text);
+ background: var(--color-hover);
+}
+
+.ui.dropdown .menu .active.item {
+ font-weight: normal;
+}
+
+.ui.selection.dropdown .menu > .item {
+ border-color: var(--color-secondary);
+}
+
+.ui.selection.visible.dropdown > .text:not(.default) {
+ color: var(--color-text);
+}
+
+.ui.dropdown.selected,
+.ui.dropdown .menu .selected.item {
+ color: var(--color-text);
+ background: var(--color-hover);
+}
+
+.ui.secondary.menu .dropdown.item:hover,
+.ui.secondary.menu .link.item:hover,
+.ui.secondary.menu a.item:hover {
+ color: var(--color-text);
+ background: var(--color-hover);
+}
+
+.ui.secondary.menu .active.item,
+.ui.secondary.menu .active.item:hover {
+ color: var(--color-text);
+ background: var(--color-active);
+}
+
+.ui.menu .dropdown.item .menu {
+ background: var(--color-menu);
+}
+
+.ui.menu .ui.dropdown .menu > .item {
+ color: var(--color-text) !important;
+}
+
+.ui.menu .ui.dropdown .menu > .item:hover {
+ color: var(--color-text) !important;
+ background: var(--color-hover) !important;
+}
+
+.ui.menu .ui.dropdown .menu > .active.item {
+ color: var(--color-text) !important;
+ background: var(--color-active) !important;
+}
+
.ui.selection.active.dropdown,
.ui.selection.active.dropdown:hover,
.ui.selection.active.dropdown .menu,
@@ -749,13 +861,13 @@ a:hover,
}
.migrate {
- color: #888888 !important;
+ color: var(--color-text-light-2) !important;
opacity: .5;
a {
- color: #444444 !important;
+ color: var(--color-text-light) !important;
&:hover {
- color: #000000 !important;
+ color: var(--color-text) !important;
}
}
}
@@ -865,11 +977,11 @@ a:hover,
}
footer {
- background-color: white;
- border-top: 1px solid #d6d6d6;
+ background-color: var(--color-footer);
+ border-top: 1px solid var(--color-secondary);
width: 100%;
flex-basis: 40px;
- color: #888888;
+ color: var(--color-text-light);
.container {
width: 100vw !important;
@@ -883,7 +995,7 @@ footer {
}
.links > * {
- border-left: 1px solid #d6d6d6;
+ border-left: 1px solid var(--color-secondary);
padding-left: 8px;
margin-left: 5px;
@@ -1110,6 +1222,21 @@ i.icon.centerlock {
.ui.label {
padding: .3em .5em;
+ background: var(--color-label);
+ color: var(--color-text-light);
+}
+
+.ui.labels a.label:hover,
+a.ui.label:hover {
+ background: var(--color-label-hover);
+ color: var(--color-text);
+}
+
+.ui.basic.labels .label,
+.ui.basic.label {
+ background: var(--color-label-basic);
+ border-color: var(--color-label-border);
+ color: var(--color-text);
}
.ui.label > .detail .icons {
@@ -1331,9 +1458,9 @@ i.icon.centerlock {
.ui.ui.ui.basic.blue.label,
.ui.basic.labels .primary.label,
.ui.ui.ui.basic.primary.label {
- background: transparent;
- border-color: var(--color-primary);
- color: var(--color-primary);
+ background: transparent !important;
+ border-color: var(--color-primary) !important;
+ color: var(--color-primary) !important;
}
.ui.label > img {
@@ -1503,6 +1630,48 @@ table th[data-sortt-desc] {
vertical-align: -.15em;
}
+.labelspage {
+ list-style: none;
+ padding-top: 0;
+
+ .item {
+ margin-top: 0;
+ margin-right: -14px;
+ margin-left: -14px;
+ padding: 10px;
+ border-bottom: 1px solid var(--color-secondary);
+ border-top: none;
+
+ a {
+ font-size: 15px;
+ padding-top: 5px;
+ padding-right: 10px;
+ color: var(--color-text-light);
+
+ &:hover {
+ color: var(--color-primary-light-2);
+ }
+
+ &.open-issues {
+ margin-right: 30px;
+ }
+ }
+
+ .ui.label {
+ font-size: 1em;
+ }
+ }
+
+ .item:last-child {
+ border-bottom: none;
+ padding-bottom: 0;
+ }
+
+ .orglabel {
+ opacity: .7;
+ }
+}
+
/* https://github.com/go-gitea/gitea/pull/11486 */
.ui.sub.header {
text-transform: none;
diff --git a/web_src/less/_organization.less b/web_src/less/_organization.less
index 77076e761e..089c649f61 100644
--- a/web_src/less/_organization.less
+++ b/web_src/less/_organization.less
@@ -173,45 +173,4 @@
height: 60px;
}
}
-
- &.settings {
- .labelspage {
- list-style: none;
- padding-top: 0;
-
- .item {
- margin-top: 0;
- margin-right: -14px;
- margin-left: -14px !important;
- padding: 10px;
- border-bottom: 1px solid var(--color-secondary);
- border-top: none;
-
- a {
- font-size: 15px;
- padding-top: 5px;
- padding-right: 10px;
- color: #666666;
-
- &:hover {
- color: #000000;
- }
-
- &.open-issues {
- margin-right: 30px;
- }
- }
-
- .ui.label {
- font-size: 1em;
- }
- }
-
- .item:last-child {
- border-bottom: none;
- padding-bottom: 0;
- }
-
- }
- }
}
diff --git a/web_src/less/_repository.less b/web_src/less/_repository.less
index e77e9719c3..4c2aff31c9 100644
--- a/web_src/less/_repository.less
+++ b/web_src/less/_repository.less
@@ -165,14 +165,14 @@
.label-filter .menu .info {
display: inline-block;
padding: .5rem .25rem;
- border-bottom: 1px solid #cccccc;
+ border-bottom: 1px solid var(--color-secondary);
font-size: 12px;
width: 100%;
white-space: nowrap;
text-align: center;
code {
- border: 1px solid #cccccc;
+ border: 1px solid var(--color-secondary);
border-radius: 3px;
padding: 1px 2px;
font-size: 11px;
@@ -388,7 +388,7 @@
}
.jumpable-path {
- color: #888888;
+ color: var(--color-text-light-2);
}
}
@@ -684,9 +684,7 @@
}
.index {
- font-weight: 300;
- color: #aaaaaa;
- letter-spacing: -1px;
+ color: var(--color-text-light-2);
}
.label {
@@ -828,7 +826,9 @@
.avatar.image img {
width: 20px;
height: 20px;
- margin-right: .15em;
+ margin-right: .5rem;
+ position: relative;
+ top: -2px;
}
&:first-child:not(.commit) {
@@ -853,7 +853,7 @@
float: left;
margin-left: -33px;
margin-right: 8px;
- color: #666;
+ color: var(--color-text-light-2);
align-items: center;
justify-content: center;
@@ -1069,11 +1069,11 @@
span.ui.image {
font-size: 128px;
- color: #000000;
+ color: var(--color-text);
}
span.ui.image:hover {
- color: #000000;
+ color: var(--color-text);
}
}
}
@@ -1218,49 +1218,6 @@
}
}
- .labelspage {
- list-style: none;
- padding-top: 0;
-
- .item {
- margin-top: 0;
- margin-right: -14px;
- margin-left: -14px;
- padding: 10px;
- border-bottom: 1px solid var(--color-secondary);
- border-top: none;
-
- a {
- font-size: 15px;
- padding-top: 5px;
- padding-right: 10px;
- color: #666666;
-
- &:hover {
- color: #000000;
- }
-
- &.open-issues {
- margin-right: 30px;
- }
- }
-
- .ui.label {
- font-size: 1em;
- }
- }
-
- .item:last-child {
- border-bottom: none;
- padding-bottom: 0;
- }
-
- .orglabel {
- opacity: .7;
- }
-
- }
-
.milestone.list {
list-style: none;
padding-top: 15px;
@@ -1268,12 +1225,12 @@
> .item {
padding-top: 10px;
padding-bottom: 10px;
- border-bottom: 1px dashed #aaaaaa;
+ border-bottom: 1px dashed var(--color-secondary);
> a {
padding-top: 5px;
padding-right: 10px;
- color: #000000;
+ color: var(--color-text);
&:hover {
color: var(--color-primary);
@@ -1292,7 +1249,7 @@
}
.meta {
- color: #999999;
+ color: var(--color-text-light-2);
padding-top: 5px;
.issue-stats .svg {
@@ -1311,10 +1268,10 @@
font-size: 15px;
padding-top: 5px;
padding-right: 10px;
- color: #666666;
+ color: var(--color-text-light-2);
&:hover {
- color: #000000;
+ color: var(--color-text);
}
}
}
@@ -1651,7 +1608,7 @@
.file {
flex: 1;
- color: #888888;
+ color: var(--color-text-light-2);
word-break: break-all;
}
@@ -2243,7 +2200,7 @@
color: #6cc644;
.pull-right {
- color: #000;
+ color: var(--color-text);
}
.ui.text {
@@ -2327,19 +2284,19 @@
}
a {
- color: black;
+ color: var(--color-text);
&:hover {
- color: #666666;
+ color: var(--color-primary-light-2);
}
}
span.ui {
- color: black;
+ color: var(--color-text);
}
&.active {
- background: rgba(0, 0, 0, .05);
+ background: var(--color-secondary);
}
}
}
@@ -2649,7 +2606,7 @@
&.key {
.meta {
padding-top: 5px;
- color: #666666;
+ color: var(--color-text-light-2);
}
}
@@ -2979,10 +2936,15 @@ tbody.commit-list {
#repo-topics {
margin-top: 5px;
+ display: flex;
+ align-items: center;
+ flex-wrap: wrap;
}
.repo-topic {
+ font-weight: normal !important;
cursor: pointer;
+ margin: 2px !important;
}
#new-dependency-drop-list {
@@ -3189,6 +3151,11 @@ td.blob-excerpt {
margin-top: 1em;
}
+.sidebar-item-link {
+ display: inline-flex;
+ align-items: center;
+}
+
.diff-file-box[data-folded="true"] .diff-file-body {
display: none;
}
@@ -3226,16 +3193,6 @@ td.blob-excerpt {
}
}
-.select-project .item {
- color: inherit;
- display: inline-flex;
- align-items: center;
-}
-
-.select-project .item .svg {
- margin-right: .5rem;
-}
-
.migrate .cards .card {
text-align: center;
}
diff --git a/web_src/less/helpers.less b/web_src/less/helpers.less
index f5c5d710f2..eac28df21e 100644
--- a/web_src/less/helpers.less
+++ b/web_src/less/helpers.less
@@ -1,4 +1,5 @@
.df { display: flex !important; }
+.dif { display: inline-flex !important; }
.ac { align-items: center !important; }
.jc { justify-content: center !important; }
.js { justify-content: flex-start !important; }
diff --git a/web_src/less/themes/theme-arc-green.less b/web_src/less/themes/theme-arc-green.less
index eebbb5bdb3..02f274f9b0 100644
--- a/web_src/less/themes/theme-arc-green.less
+++ b/web_src/less/themes/theme-arc-green.less
@@ -74,12 +74,21 @@
--color-box-body: #353945;
--color-text: #bbc0ca;
--color-text-light: #969aa5;
+ --color-text-light-2: #666a75;
+ --color-footer: #2e323e;
--color-timeline: #4a505c;
--color-input-text: #d5dbe6;
--color-input-background: #2e323e;
--color-input-border: #454a57;
--color-input-border-hover: #505667;
--color-navbar: #2a2e3a;
+ --color-label: #ffffff10;
+ --color-label-hover: #ffffff20;
+ --color-label-basic: #00000016;
+ --color-label-border: #ffffff28;
+ --color-hover: #ffffff0d;
+ --color-active: #ffffff14;
+ --color-menu: #2e323e;
}
/* Background */
@@ -460,22 +469,6 @@
color: #bbbbbb;
}
-.repository .ui.segment.sub-menu .list .item {
- color: #dbdbdb;
- a,
- span.ui {
- color: #dbdbdb;
- }
-}
-
-.repository .ui.segment.sub-menu .list .item a:hover {
- color: #fff;
-}
-
-.repository .ui.segment.sub-menu .list .item.active {
- background: var(--color-secondary);
-}
-
.repository.branches .commit-divergence .bar {
background: #6a737d;
}
@@ -508,55 +501,6 @@ body {
box-shadow: 1px 1px 0 0 #1b1c1d !important; /* .ui.inverted.popup */
}
-.ui.card > .extra a:not(.ui):hover,
-.ui.cards > .card > .extra a:not(.ui):hover {
- color: #a0cc75;
-}
-
-.ui.breadcrumb a:hover {
- color: #a0cc75;
-}
-
-.ui.breadcrumb a {
- color: #87ab63;
-}
-
-.repository .metas .ui.list a .text {
- color: #87ab63;
-}
-
-.repository .metas .ui.list a .text:hover {
- color: #a0cc75;
-}
-
-.repository .label.list .item a {
- color: #87ab63;
-}
-
-.repository .label.list .item a:hover {
- color: #a0cc75;
-}
-
-.repository .milestone.list > .item {
- border-bottom-color: var(--color-secondary);
-}
-
-.repository .milestone.list > .item > a {
- color: #87ab63;
-}
-
-.repository .milestone.list > .item > a:hover {
- color: #a0cc75;
-}
-
-.repository .milestone.list > .item .operate > a {
- color: #87ab63;
-}
-
-.repository .milestone.list > .item .operate > a:hover {
- color: #a0cc75;
-}
-
.ui.green.progress .bar {
background-color: #668844;
}
@@ -570,14 +514,6 @@ body {
border-color: var(--color-secondary-alpha-40);
}
-.ui.secondary.menu .active.item {
- color: #dbdbdb;
-}
-
-.ui.secondary.menu .item {
- color: var(--color-secondary-dark-6);
-}
-
.following.bar .top.menu a.item:hover {
color: #fff;
}
@@ -586,68 +522,12 @@ body {
background: #353945;
}
-.ui.secondary.menu .active.item,
-.ui.secondary.menu .dropdown.item:hover,
-.ui.secondary.menu .link.item:hover,
-.ui.secondary.menu .active.item:hover,
-.ui.secondary.menu a.item:hover,
-.ui.dropdown .menu .active.item,
-.ui.link.menu .item:hover,
-.ui.menu .dropdown.item:hover,
-.ui.menu .link.item:hover,
-.ui.menu a.item:hover,
-.ui.menu .active.item {
- color: #dbdbdb;
- background: #454b5a;
-}
-
.ui.link.list .item,
.ui.link.list a.item,
.ui.link.list .item a:not(.ui) {
color: #dbdbdb;
}
-.ui.menu .ui.dropdown .menu > .item {
- color: var(--color-secondary-dark-6) !important;
-}
-
-.ui.menu .ui.dropdown .menu > .item:hover,
-.ui.menu .ui.dropdown .menu > .selected.item {
- color: #dbdbdb !important;
- background: #454b5a !important;
-}
-
-.ui.secondary.menu .dropdown.item > .menu,
-.ui.text.menu .dropdown.item > .menu {
- border: 1px solid #434444;
-}
-
-footer {
- background: #2e323e;
- border-top: 1px solid #313131;
- color: #bababa;
-}
-
-.ui.menu .dropdown.item .menu {
- background: #2c303a;
-}
-
-.ui.dropdown .menu > .header,
-.ui.dropdown .menu > .header:not(.ui) {
- color: #dbdbdb;
-}
-
-.ui.labels a.label:hover,
-a.ui.label:hover {
- background: #454b5a;
- color: #dbdbdb;
-}
-
-.ui.basic.labels a.label:hover,
-a.ui.basic.label:hover {
- background: var(--color-body);
-}
-
.ui.red.label,
.ui.red.labels .label {
background-color: #7d3434 !important;
@@ -660,28 +540,10 @@ a.ui.basic.label:hover {
background-color: #936e00 !important;
}
-.ui.menu {
- background: var(--color-secondary);
- border: 1px solid #353945;
-}
-
-.ui.menu .active.item:hover,
-.ui.vertical.menu .active.item:hover {
- color: #dbdbdb;
- background: #4b5162;
-}
-
.ui.accordion .title:not(.ui) {
color: #dbdbdb;
}
-.ui.label,
-.ui.label.basic {
- color: #dbdbdb;
- border-color: #6a737d;
- background-color: #383c4a;
-}
-
.ui.green.label,
.ui.green.labels .label,
.ui.basic.green.label {
@@ -704,24 +566,6 @@ a.ui.basic.green.label:hover {
color: #b75252 !important;
}
-.ui.menu .item {
- background: var(--color-secondary);
- color: var(--color-secondary-dark-6);
-}
-
-.ui.menu .item.disabled,
-.ui.menu .item.disabled:hover,
-.ui.ui.menu .item.disabled,
-.ui.ui.menu .item.disabled:hover {
- color: #626773;
- opacity: 1;
-}
-
-.ui.pagination.menu .active.item {
- color: #fff;
- background-color: #87ab63;
-}
-
.ui.header,
.ui.breadcrumb .divider {
color: var(--color-secondary-dark-6);
@@ -732,10 +576,6 @@ a.ui.basic.green.label:hover {
border-top-color: transparent;
}
-.ui.menu .item > .label {
- background: #505667;
-}
-
.form .help {
color: #7f8699;
}
@@ -827,12 +667,6 @@ a.ui.basic.green.label:hover {
box-shadow: none;
}
-.ui.blue.label,
-.ui.blue.labels .label {
- background-color: var(--color-primary-light-2) !important;
- border-color: var(--color-primary) !important;
-}
-
.ui.labeled.button:not([class*="left labeled"]) > .label,
.ui[class*="left labeled"].button > .button {
background: var(--color-secondary);
@@ -917,14 +751,6 @@ a.ui.basic.green.label:hover {
}
}
-.ui.dropdown .menu {
- background: #2c303a;
-}
-
-.ui.dropdown .menu > .message:not(.ui) {
- color: #636363;
-}
-
.overflow.menu .items .item {
color: #9d9d9d;
}
@@ -950,20 +776,6 @@ a.ui.basic.green.label:hover {
color: #dbdbdb;
}
-.ui.dropdown .menu .selected.item,
-.ui.dropdown.selected {
- color: #dbdbdb;
-}
-
-.ui.dropdown .menu > .item:hover {
- color: #dbdbdb;
- background: #353945;
-}
-
-.ui.dropdown .menu > .item {
- color: var(--color-secondary-dark-6);
-}
-
.repository.view.issue .comment-list .event > .svg.issue-symbol {
background: #3b4954;
}
@@ -1081,22 +893,6 @@ td.blob-hunk {
border: 1px solid #333640;
}
-.ui.selection.active.dropdown,
-.ui.selection.active.dropdown:hover,
-.ui.selection.active.dropdown .menu,
-.ui.selection.active.dropdown:hover .menu {
- box-shadow: 0 2px 3px 0 rgba(0, 0, 0, .1);
-}
-
-.ui.menu .ui.dropdown .menu > .active.item {
- color: #dbdbdb !important;
-}
-
-.repository .filter.menu.labels .label-filter .menu .info,
-.repository .filter.menu.labels .label-filter .menu .info code {
- border-color: #4e5361;
-}
-
.ui.card,
.ui.cards > .card {
background: #353945;
@@ -1186,14 +982,6 @@ td.blob-hunk {
background-color: #984646;
}
-.ui.selection.dropdown .menu > .item {
- border-top: 1px solid #313c47;
-}
-
-.ui.selection.visible.dropdown > .text:not(.default) {
- color: var(--color-secondary-dark-6);
-}
-
.ui.positive.message {
background-color: #0d491b;
color: #87ab63;
@@ -1320,7 +1108,6 @@ a.blob-excerpt:hover {
.ui.text {
color: var(--color-secondary-dark-6);
}
- .pull-right,
a {
color: #c2c193;
}
@@ -1335,7 +1122,6 @@ a.blob-excerpt:hover {
.ui.text {
color: var(--color-secondary-dark-6);
}
- .pull-right,
a {
color: #c2a893;
}
@@ -1349,9 +1135,6 @@ a.blob-excerpt:hover {
.ui.text {
color: #d07d7d;
}
- .pull-right {
- color: var(--color-secondary-dark-6);
- }
}
}
@@ -1385,16 +1168,6 @@ a.blob-excerpt:hover {
border-color: #634343 !important;
}
-.repository .labelspage .item a,
-.organization.settings .labelspage .item a {
- color: #6a737d;
-}
-
-.repository .labelspage .item a:hover,
-.organization.settings .labelspage .item a:hover {
- color: var(--color-secondary-dark-6);
-}
-
.ui.header .sub.header {
color: var(--color-secondary-dark-6);
}