diff options
| -rw-r--r-- | templates/repo/header.tmpl | 36 | ||||
| -rw-r--r-- | templates/repo/star_unstar.tmpl | 2 | ||||
| -rw-r--r-- | templates/repo/watch_unwatch.tmpl | 2 | ||||
| -rw-r--r-- | web_src/css/modules/button.css | 7 | ||||
| -rw-r--r-- | web_src/css/modules/label.css | 2 | ||||
| -rw-r--r-- | web_src/css/repo/header.css | 14 |
6 files changed, 37 insertions, 26 deletions
diff --git a/templates/repo/header.tmpl b/templates/repo/header.tmpl index 5e2774dfa1..bb344bf3d4 100644 --- a/templates/repo/header.tmpl +++ b/templates/repo/header.tmpl @@ -91,28 +91,28 @@ > {{svg "octicon-repo-forked"}}<span class="text not-mobile">{{ctx.Locale.Tr "repo.fork"}}</span> </a> - <div class="ui small modal" id="fork-repo-modal"> - <div class="header"> - {{ctx.Locale.Tr "repo.already_forked" .Name}} - </div> - <div class="content tw-text-left"> - <div class="ui list"> - {{range $.UserAndOrgForks}} - <div class="ui item tw-py-2"> - <a href="{{.Link}}">{{svg "octicon-repo-forked" 16 "tw-mr-2"}}{{.FullName}}</a> - </div> - {{end}} - </div> - {{if $.CanSignedUserFork}} - <div class="divider"></div> - <a href="{{$.RepoLink}}/fork">{{ctx.Locale.Tr "repo.fork_to_different_account"}}</a> - {{end}} - </div> - </div> <a class="ui basic label" href="{{.Link}}/forks"> {{CountFmt .NumForks}} </a> </div> + <div class="ui small modal" id="fork-repo-modal"> + <div class="header"> + {{ctx.Locale.Tr "repo.already_forked" .Name}} + </div> + <div class="content tw-text-left"> + <div class="ui list"> + {{range $.UserAndOrgForks}} + <div class="ui item tw-py-2"> + <a href="{{.Link}}">{{svg "octicon-repo-forked" 16 "tw-mr-2"}}{{.FullName}}</a> + </div> + {{end}} + </div> + {{if $.CanSignedUserFork}} + <div class="divider"></div> + <a href="{{$.RepoLink}}/fork">{{ctx.Locale.Tr "repo.fork_to_different_account"}}</a> + {{end}} + </div> + </div> {{end}} </div> {{end}} diff --git a/templates/repo/star_unstar.tmpl b/templates/repo/star_unstar.tmpl index 1cdb98bf27..0f09d8b492 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}} <button type="submit" class="ui compact small basic button"{{if not $.IsSigned}} disabled{{end}} aria-label="{{$buttonText}}"> {{if $.IsStaringRepo}}{{svg "octicon-star-fill"}}{{else}}{{svg "octicon-star"}}{{end}} - <span class="not-mobile" aria-hidden="true">{{$buttonText}}</span> + <span aria-hidden="true">{{$buttonText}}</span> </button> <a hx-boost="false" class="ui basic label" href="{{$.RepoLink}}/stars"> {{CountFmt .Repository.NumStars}} diff --git a/templates/repo/watch_unwatch.tmpl b/templates/repo/watch_unwatch.tmpl index 64be971416..465cd91c2b 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}} <button type="submit" class="ui compact small basic button"{{if not $.IsSigned}} disabled{{end}} aria-label="{{$buttonText}}"> {{svg "octicon-eye"}} - <span class="not-mobile" aria-hidden="true">{{$buttonText}}</span> + <span aria-hidden="true">{{$buttonText}}</span> </button> <a hx-boost="false" class="ui basic label" href="{{.RepoLink}}/watchers"> {{CountFmt .Repository.NumWatches}} diff --git a/web_src/css/modules/button.css b/web_src/css/modules/button.css index faeed8c9a1..63e00a02b4 100644 --- a/web_src/css/modules/button.css +++ b/web_src/css/modules/button.css @@ -138,6 +138,13 @@ It needs some tricks to tweak the left/right borders with active state */ background: var(--color-hover); } +.ui.labeled.button > .label:hover { + background: var(--color-hover); +} +.ui.labeled.button > .button:hover + .label { + border-left-color: var(--color-secondary-dark-2); +} + /* primary */ .ui.primary.labels .label, diff --git a/web_src/css/modules/label.css b/web_src/css/modules/label.css index 0512c5fddb..9af0a149ed 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 55e704ed10..b70691435f 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; + } +} |