From 9a12f678556ef05c3f1af8a222690ee0ade88296 Mon Sep 17 00:00:00 2001 From: Thedro Neely Date: Thu, 23 Jan 2020 17:11:57 -0500 Subject: templates/repo/header: Move topics editor to header --- public/css/override.css | 9 ++++++--- templates/repo/header.tmpl | 23 ++++++++++++++++++++--- templates/repo/home.tmpl | 2 +- 3 files changed, 27 insertions(+), 7 deletions(-) diff --git a/public/css/override.css b/public/css/override.css index adc1bdc..5ae765a 100644 --- a/public/css/override.css +++ b/public/css/override.css @@ -48,17 +48,20 @@ a, .ui.breadcrumb a { color: #0366d6; } .repo-name { font-weight: bold; } .repository .header-wrapper { background-color: #fafbfc; } -.repository .navbar .ui.label { padding: 0.25rem 0.75rem; border-radius: 1rem; background-color: #dedede; color: #444; } +.repository .navbar .ui.label { padding: 0.25rem 0.75rem; border-radius: 1rem; background-color: #dedede; color: #444; font-weight: bold; } .repository.file.list #repo-desc, .repo-description { font-size: 1rem !important; margin: 0.75rem 0; } .repository .item { border-top: 3px solid transparent; } .repository a.item { padding: 0.5rem 1.5rem !important; } +.ui.label { color: #145180; font-weight: 400; font-size: 0.9rem !important; } .ui.breadcrumb .divider { margin: 0 } .ui.tabular.menu .item { color: #444; } .ui.tabular.menu .active.item { border-top-width: 2px; font-weight: 400; } -.ui.repo-description { display: none !important; } -.ui.repo-description-custom { display: block !important; } + +.repo-topics, .ui.repo-description { display: none !important; } +.repo-topics-custom, .ui.repo-description-custom { display: block !important; } + .ui.segment.sub-menu { display: none; } .ui.secondary.pointing.menu { border-bottom: none; } diff --git a/templates/repo/header.tmpl b/templates/repo/header.tmpl index fb48ce3..f79a538 100644 --- a/templates/repo/header.tmpl +++ b/templates/repo/header.tmpl @@ -55,13 +55,30 @@ - -
+
{{range $.Topics}}{{.Name}}{{end}} {{if and $.Permission.IsAdmin (not .IsArchived)}}{{$.i18n.Tr "repo.topic.manage_topics"}}{{end}}
- + {{if and $.Permission.IsAdmin (not .IsArchived)}} + + {{end}}
{{end}} diff --git a/templates/repo/home.tmpl b/templates/repo/home.tmpl index b23e851..3cb9969 100644 --- a/templates/repo/home.tmpl +++ b/templates/repo/home.tmpl @@ -23,7 +23,7 @@ {{end}} -
+
{{range .Topics}}{{.Name}}{{end}} {{if and .Permission.IsAdmin (not .Repository.IsArchived)}}{{.i18n.Tr "repo.topic.manage_topics"}}{{end}}
-- cgit v1.2.3