From fe7a8af6a6a82c293a65f198743ab175f040c9d5 Mon Sep 17 00:00:00 2001 From: silverwind Date: Mon, 15 Apr 2024 20:12:00 +0200 Subject: [PATCH 1/4] Tweak repo buttons on mobile and labeled button border-radius --- templates/repo/header.tmpl | 36 +++++++++++++++---------------- templates/repo/star_unstar.tmpl | 2 +- templates/repo/watch_unwatch.tmpl | 2 +- web_src/css/modules/button.css | 17 +++++++++++++++ web_src/css/modules/label.css | 2 +- web_src/css/repo/header.css | 14 +++++++----- 6 files changed, 47 insertions(+), 26 deletions(-) diff --git a/templates/repo/header.tmpl b/templates/repo/header.tmpl index 5e2774dfa1ad..bb344bf3d48f 100644 --- a/templates/repo/header.tmpl +++ b/templates/repo/header.tmpl @@ -91,28 +91,28 @@ > {{svg "octicon-repo-forked"}}{{ctx.Locale.Tr "repo.fork"}} - {{CountFmt .NumForks}} + {{end}} {{end}} diff --git a/templates/repo/star_unstar.tmpl b/templates/repo/star_unstar.tmpl index 1cdb98bf2721..0f09d8b4925a 100644 --- a/templates/repo/star_unstar.tmpl +++ b/templates/repo/star_unstar.tmpl @@ -4,7 +4,7 @@ {{if $.IsStaringRepo}}{{$buttonText = ctx.Locale.Tr "repo.unstar"}}{{end}} {{CountFmt .Repository.NumStars}} diff --git a/templates/repo/watch_unwatch.tmpl b/templates/repo/watch_unwatch.tmpl index 64be97141666..465cd91c2b37 100644 --- a/templates/repo/watch_unwatch.tmpl +++ b/templates/repo/watch_unwatch.tmpl @@ -4,7 +4,7 @@ {{if $.IsWatchingRepo}}{{$buttonText = ctx.Locale.Tr "repo.unwatch"}}{{end}} {{CountFmt .Repository.NumWatches}} diff --git a/web_src/css/modules/button.css b/web_src/css/modules/button.css index 87b9ddf292d0..1cead9b8efe8 100644 --- a/web_src/css/modules/button.css +++ b/web_src/css/modules/button.css @@ -71,6 +71,23 @@ font-size: 1em; border-color: var(--color-light-border); } +.ui.labeled.button > .label:hover { + background: var(--color-hover); +} + +.ui.labeled.button > .button:hover + .label { + border-left-color: var(--color-secondary-dark-2); +} + +.ui.labeled.button > .button { + border-top-right-radius: 0; + border-bottom-right-radius: 0; +} + +.ui.labeled.button > .label { + border-top-left-radius: 0; + border-bottom-left-radius: 0; +} .ui.button > .icon:not(.button) { height: auto; diff --git a/web_src/css/modules/label.css b/web_src/css/modules/label.css index 2032b2c84bbb..1e42668aa1a2 100644 --- a/web_src/css/modules/label.css +++ b/web_src/css/modules/label.css @@ -107,7 +107,7 @@ a.ui.label:hover { a.ui.basic.label:hover { text-decoration: none; color: var(--color-text); - border-color: var(--color-light-border); + border-color: var(--color-secondary-dark-2); background: var(--color-hover); } diff --git a/web_src/css/repo/header.css b/web_src/css/repo/header.css index 55e704ed10be..b70691435f59 100644 --- a/web_src/css/repo/header.css +++ b/web_src/css/repo/header.css @@ -36,11 +36,6 @@ gap: 0.25em; } -.repo-buttons .ui.labeled.button > .label:hover { - color: var(--color-primary-light-2); - background: var(--color-light); -} - .repo-buttons button[disabled] ~ .label { opacity: var(--opacity-disabled); color: var(--color-text-dark); @@ -67,3 +62,12 @@ .repo-buttons .ui.labeled.button.disabled > .button { pointer-events: none !important; } + +@media (max-width: 767.98px) { + .repo-buttons .ui.button, + .repo-buttons .ui.label { + padding-left: 8px; + padding-right: 8px; + margin: 0; + } +} From 9440957293092bcdf019981f803e1d00bedd6f3c Mon Sep 17 00:00:00 2001 From: silverwind Date: Mon, 15 Apr 2024 20:38:55 +0200 Subject: [PATCH 2/4] fix lint --- web_src/css/modules/button.css | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/web_src/css/modules/button.css b/web_src/css/modules/button.css index 1cead9b8efe8..16aedb7cb9e5 100644 --- a/web_src/css/modules/button.css +++ b/web_src/css/modules/button.css @@ -70,6 +70,8 @@ margin: 0 0 0 -1px !important; font-size: 1em; border-color: var(--color-light-border); + border-top-left-radius: 0; + border-bottom-left-radius: 0; } .ui.labeled.button > .label:hover { background: var(--color-hover); @@ -84,11 +86,6 @@ border-bottom-right-radius: 0; } -.ui.labeled.button > .label { - border-top-left-radius: 0; - border-bottom-left-radius: 0; -} - .ui.button > .icon:not(.button) { height: auto; opacity: 0.8; From 2fecd37802b7e2619ba74d5cba719e12f84374f7 Mon Sep 17 00:00:00 2001 From: silverwind Date: Mon, 15 Apr 2024 20:42:29 +0200 Subject: [PATCH 3/4] fix lint --- web_src/css/modules/button.css | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/web_src/css/modules/button.css b/web_src/css/modules/button.css index 16aedb7cb9e5..e27fa754504e 100644 --- a/web_src/css/modules/button.css +++ b/web_src/css/modules/button.css @@ -63,6 +63,8 @@ } .ui.labeled.button > .button { margin: 0; + border-top-right-radius: 0; + border-bottom-right-radius: 0; } .ui.labeled.button > .label { display: flex; @@ -81,11 +83,6 @@ border-left-color: var(--color-secondary-dark-2); } -.ui.labeled.button > .button { - border-top-right-radius: 0; - border-bottom-right-radius: 0; -} - .ui.button > .icon:not(.button) { height: auto; opacity: 0.8; From 4789137d14329ab33ccdebef005d5e7b2a3ffb40 Mon Sep 17 00:00:00 2001 From: silverwind Date: Mon, 15 Apr 2024 20:42:47 +0200 Subject: [PATCH 4/4] whitespace --- web_src/css/modules/button.css | 1 - 1 file changed, 1 deletion(-) diff --git a/web_src/css/modules/button.css b/web_src/css/modules/button.css index e27fa754504e..4e133852f1cc 100644 --- a/web_src/css/modules/button.css +++ b/web_src/css/modules/button.css @@ -78,7 +78,6 @@ .ui.labeled.button > .label:hover { background: var(--color-hover); } - .ui.labeled.button > .button:hover + .label { border-left-color: var(--color-secondary-dark-2); }