Skip to content

Removed spinner from correspondence challenges #14381

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jan 5, 2024
Merged

Removed spinner from correspondence challenges #14381

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
514fe72
Removed spinner from correspondence challenges
Carbrex Jan 4, 2024
70fd74a
Merge branch 'master' into patch-3
ornicar Jan 5, 2024
525c08f
simplify challenge sent page view and css
ornicar Jan 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion app/views/challenge/mine.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,10 @@ object mine:
c.destUserId.map { destId =>
div(cls := "waiting")(
userIdLink(destId.some, cssClass = "target".some),
spinner,
if !c.hasClock then
div(cls := "correspondence-waiting text", dataIcon := licon.Checkmark):
"Challenge sent"
else spinner,
p(trans.waitingForOpponent())
)
} getOrElse {
Expand Down
14 changes: 14 additions & 0 deletions ui/challenge/css/_page.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,17 +27,20 @@
@include breakpoint($mq-x-small) {
grid-area: 1 / 2 / 3 / 2;
}

&__recent {
@extend %flex-center;
margin-top: 1em;
gap: 0.5em;

.button {
background: none;
border: $border;
text-align: $start-direction;
text-transform: none;
}
}

.error {
color: $c-bad;
margin-top: 1em;
Expand All @@ -57,6 +60,14 @@
height: 13em;
margin: 2em auto;
}

.correspondence-waiting {
font-size: 1.5em;
margin: 2em auto;
&::before {
color: $c-good;
}
}
}

.cancel {
Expand All @@ -74,9 +85,11 @@
padding: $block-gap 4vw;
margin-bottom: 4rem;
font-size: 1.5em;

@include breakpoint($mq-xx-small) {
font-size: 2em;
}

background: var(--c-bg);
border: 1px solid var(--c-font);

Expand All @@ -88,6 +101,7 @@
color: var(--c-font);
font-size: 6rem;
margin-#{$end-direction}: 0.2em;

@include breakpoint($mq-not-xx-small) {
display: none;
}
Expand Down