1
1
mirror of https://github.com/go-gitea/gitea synced 2024-12-22 16:44:26 +00:00

Tweak repo buttons on mobile and labeled button border-radius (#30503)

Fixes: https://github.com/go-gitea/gitea/issues/30514
Fixes:
https://github.com/go-gitea/gitea/pull/30288#issuecomment-2057466623

- Fix border-radius regression from
https://github.com/go-gitea/gitea/pull/30475
- Fix and simplify hover state
- Move the modal HTML so it does not interfere with the CSS
- Make the star and unwatch text show on mobile. There is still plenty
of space, below is iPhone 12 viewport size

<img width="696" alt="Screenshot 2024-04-15 at 20 34 03"
src="https://github.com/go-gitea/gitea/assets/115237/af90bb00-4671-4973-a255-8eb44ee6ba8d">
<img width="230" alt="Screenshot 2024-04-15 at 20 31 42"
src="https://github.com/go-gitea/gitea/assets/115237/986ef533-7a01-4bb0-8dcd-fd19e4259e84">
<img width="233" alt="Screenshot 2024-04-15 at 20 31 47"
src="https://github.com/go-gitea/gitea/assets/115237/5b825dd8-0ccc-4d56-9d8f-774abb935b68">

---------

Co-authored-by: Giteabot <teabot@gitea.io>
This commit is contained in:
silverwind 2024-04-16 17:46:12 +02:00 committed by GitHub
parent a658e2f277
commit 3746a625f5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 40 additions and 26 deletions

View File

@ -91,6 +91,10 @@
> >
{{svg "octicon-repo-forked"}}<span class="text not-mobile">{{ctx.Locale.Tr "repo.fork"}}</span> {{svg "octicon-repo-forked"}}<span class="text not-mobile">{{ctx.Locale.Tr "repo.fork"}}</span>
</a> </a>
<a class="ui basic label" href="{{.Link}}/forks">
{{CountFmt .NumForks}}
</a>
</div>
<div class="ui small modal" id="fork-repo-modal"> <div class="ui small modal" id="fork-repo-modal">
<div class="header"> <div class="header">
{{ctx.Locale.Tr "repo.already_forked" .Name}} {{ctx.Locale.Tr "repo.already_forked" .Name}}
@ -109,10 +113,6 @@
{{end}} {{end}}
</div> </div>
</div> </div>
<a class="ui basic label" href="{{.Link}}/forks">
{{CountFmt .NumForks}}
</a>
</div>
{{end}} {{end}}
</div> </div>
{{end}} {{end}}

View File

@ -4,7 +4,7 @@
{{if $.IsStaringRepo}}{{$buttonText = ctx.Locale.Tr "repo.unstar"}}{{end}} {{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}}"> <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}} {{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> </button>
<a hx-boost="false" class="ui basic label" href="{{$.RepoLink}}/stars"> <a hx-boost="false" class="ui basic label" href="{{$.RepoLink}}/stars">
{{CountFmt .Repository.NumStars}} {{CountFmt .Repository.NumStars}}

View File

@ -4,7 +4,7 @@
{{if $.IsWatchingRepo}}{{$buttonText = ctx.Locale.Tr "repo.unwatch"}}{{end}} {{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}}"> <button type="submit" class="ui compact small basic button"{{if not $.IsSigned}} disabled{{end}} aria-label="{{$buttonText}}">
{{svg "octicon-eye"}} {{svg "octicon-eye"}}
<span class="not-mobile" aria-hidden="true">{{$buttonText}}</span> <span aria-hidden="true">{{$buttonText}}</span>
</button> </button>
<a hx-boost="false" class="ui basic label" href="{{.RepoLink}}/watchers"> <a hx-boost="false" class="ui basic label" href="{{.RepoLink}}/watchers">
{{CountFmt .Repository.NumWatches}} {{CountFmt .Repository.NumWatches}}

View File

@ -63,6 +63,8 @@
} }
.ui.labeled.button > .button { .ui.labeled.button > .button {
margin: 0; margin: 0;
border-top-right-radius: 0;
border-bottom-right-radius: 0;
} }
.ui.labeled.button > .label { .ui.labeled.button > .label {
display: flex; display: flex;
@ -70,6 +72,14 @@
margin: 0 0 0 -1px !important; margin: 0 0 0 -1px !important;
font-size: 1em; font-size: 1em;
border-color: var(--color-light-border); 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);
}
.ui.labeled.button > .button:hover + .label {
border-left-color: var(--color-secondary-dark-2);
} }
.ui.button > .icon:not(.button) { .ui.button > .icon:not(.button) {

View File

@ -107,7 +107,7 @@ a.ui.label:hover {
a.ui.basic.label:hover { a.ui.basic.label:hover {
text-decoration: none; text-decoration: none;
color: var(--color-text); color: var(--color-text);
border-color: var(--color-light-border); border-color: var(--color-secondary-dark-2);
background: var(--color-hover); background: var(--color-hover);
} }

View File

@ -36,11 +36,6 @@
gap: 0.25em; 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 { .repo-buttons button[disabled] ~ .label {
opacity: var(--opacity-disabled); opacity: var(--opacity-disabled);
color: var(--color-text-dark); color: var(--color-text-dark);
@ -67,3 +62,12 @@
.repo-buttons .ui.labeled.button.disabled > .button { .repo-buttons .ui.labeled.button.disabled > .button {
pointer-events: none !important; 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;
}
}