Skip to content

Commit de978c2

Browse files
authored
Merge pull request #280 from Paroxity/game-sync
2 parents a4d6172 + d31d9ba commit de978c2

File tree

18 files changed

+949
-108
lines changed

18 files changed

+949
-108
lines changed

src/App.scss

Lines changed: 238 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ button {
77
}
88

99
@media (max-height: 720px) {
10+
1011
html,
1112
input,
1213
button {
@@ -63,14 +64,17 @@ h6 {
6364
}
6465

6566
.masonry-grid {
66-
display: -webkit-box; /* Not needed if autoprefixing */
67-
display: -ms-flexbox; /* Not needed if autoprefixing */
67+
display: -webkit-box;
68+
/* Not needed if autoprefixing */
69+
display: -ms-flexbox;
70+
/* Not needed if autoprefixing */
6871
display: flex;
6972
width: auto;
7073
}
7174

7275
.masonry-grid_column {
73-
padding: 0 15px; /* gutter size */
76+
padding: 0 15px;
77+
/* gutter size */
7478
background-clip: padding-box;
7579
}
7680

@@ -113,18 +117,47 @@ button::before {
113117
bottom: 0;
114118
left: 0;
115119
width: 100%;
116-
background: linear-gradient(
117-
180deg,
118-
rgba(0, 0, 0, 0) 0%,
119-
rgba(245, 227, 173, 0.25) 100%
120-
);
120+
background: linear-gradient(180deg,
121+
rgba(0, 0, 0, 0) 0%,
122+
rgba(245, 227, 173, 0.25) 100%);
121123
transition: all 0.2s ease-out;
122124
}
123125

124126
button:hover::before {
125127
height: 100%;
126128
}
127129

130+
/* Styled select to match button */
131+
select {
132+
font-family: "Roboto", sans-serif;
133+
text-transform: uppercase;
134+
color: #bea966;
135+
font-weight: 700;
136+
font-size: 1.25em;
137+
display: inline-block;
138+
position: relative;
139+
background-color: rgba(245, 227, 173, 0.05);
140+
border: 1px solid rgba(245, 227, 173, 0);
141+
padding: 3px 10px;
142+
transition: all 0.2s ease-out;
143+
appearance: none;
144+
-webkit-appearance: none;
145+
-moz-appearance: none;
146+
background-image: none;
147+
}
148+
149+
select:focus {
150+
outline: none;
151+
}
152+
153+
select:hover {
154+
border: 1px solid rgba(245, 227, 173, 0.25);
155+
}
156+
157+
select:disabled {
158+
pointer-events: none;
159+
}
160+
128161
.button {
129162
position: relative;
130163
width: fit-content;
@@ -204,7 +237,8 @@ button:hover::before {
204237
margin-top: 1em;
205238
width: auto;
206239

207-
button {
240+
button,
241+
select {
208242
width: 100%;
209243
height: 100%;
210244
}
@@ -287,11 +321,9 @@ input::placeholder {
287321
bottom: 0;
288322
left: 0;
289323
width: 100%;
290-
background: linear-gradient(
291-
180deg,
292-
rgba(0, 0, 0, 0) 0%,
293-
rgba(245, 227, 173, 0.25) 90%
294-
);
324+
background: linear-gradient(180deg,
325+
rgba(0, 0, 0, 0) 0%,
326+
rgba(245, 227, 173, 0.25) 90%);
295327
transition: all 0.2s ease-out;
296328
}
297329

@@ -340,6 +372,91 @@ input:disabled {
340372
pointer-events: none;
341373
}
342374

375+
.custom-select {
376+
background-color: rgba(245, 227, 173, 0.05);
377+
border: 1px solid rgba(245, 227, 173, 0);
378+
padding: 5px 0.75em 0.1em;
379+
font-size: 1.25em;
380+
cursor: url("icons/cursor.png"), auto !important;
381+
color: #bea966;
382+
font-family: "Roboto", sans-serif;
383+
text-align: left;
384+
}
385+
386+
.select-container:focus-within::before {
387+
height: 0;
388+
}
389+
390+
.custom-select:focus-within::after {
391+
visibility: hidden;
392+
transform: scaleX(0);
393+
}
394+
395+
.custom-select .select-label {
396+
color: #bea966;
397+
display: block;
398+
text-align: left;
399+
}
400+
401+
.custom-select .select-arrow {
402+
position: absolute;
403+
right: 0.75em;
404+
top: 50%;
405+
transform: translateY(-50%);
406+
color: #bea966;
407+
pointer-events: none;
408+
}
409+
410+
.custom-select.disabled {
411+
opacity: 0.5;
412+
pointer-events: none;
413+
}
414+
415+
.select-dropdown {
416+
position: absolute;
417+
left: 0;
418+
right: 0;
419+
top: calc(100% + 6px);
420+
z-index: 10;
421+
}
422+
423+
.select-dropdown-box {
424+
background-color: rgba(8, 6, 21, 1);
425+
position: relative;
426+
padding: 0;
427+
color: white;
428+
}
429+
430+
.select-dropdown-box::before {
431+
content: "";
432+
position: absolute;
433+
width: calc(100% + 2px);
434+
height: calc(100% + 2px);
435+
right: -1px;
436+
top: -1px;
437+
background: linear-gradient(60deg, #f5e3ad, #bea966, #f5e3ad, #f5e3ad, #bea966);
438+
z-index: -1;
439+
animation: animatedgradient 3s ease alternate infinite;
440+
background-size: 300% 300%;
441+
}
442+
443+
.select-option {
444+
padding: 0.375em 0.5em;
445+
text-align: left;
446+
white-space: nowrap;
447+
cursor: url("icons/cursor.png"), auto !important;
448+
font-size: 1em;
449+
}
450+
451+
.select-option:hover {
452+
background-color: rgba(64, 57, 45, 0.4);
453+
}
454+
455+
.select-option.selected,
456+
.select-option.selected:hover {
457+
background-color: #40392d;
458+
}
459+
343460
/* Loading Screen */
344461
.loading {
345462
font-size: 35px;
@@ -354,6 +471,17 @@ input:disabled {
354471
animation: spin 0.4s ease-out infinite;
355472
}
356473

474+
.spinner-small {
475+
border: 2px solid transparent;
476+
border-top: 2px solid #c9ba8f;
477+
border-radius: 50%;
478+
width: 16px;
479+
height: 16px;
480+
animation: spin 0.4s ease-out infinite;
481+
display: inline-block;
482+
margin: 0;
483+
}
484+
357485
@keyframes spin {
358486
100% {
359487
transform: rotate(360deg);
@@ -462,6 +590,88 @@ input:disabled {
462590
.input {
463591
margin-top: 1em;
464592
}
593+
594+
/* Make form inputs and custom select full-width in popups */
595+
.form-bg {
596+
width: 100%;
597+
}
598+
599+
.input {
600+
width: 100%;
601+
}
602+
603+
.input input {
604+
width: 100%;
605+
box-sizing: border-box;
606+
}
607+
608+
.custom-select {
609+
width: 100%;
610+
box-sizing: border-box;
611+
}
612+
}
613+
614+
/* LinkPrompt popup adjustments */
615+
.link-popup {
616+
text-align: left;
617+
}
618+
619+
/* Reduce left-right padding for LinkPrompt */
620+
.popup-box.link-popup {
621+
padding: 3em 3em;
622+
/* was 3em 6em */
623+
}
624+
625+
/* Make LinkPrompt header gold and slightly smaller */
626+
.link-popup .mastery-rank {
627+
font-size: 1.25em;
628+
/* smaller than default */
629+
color: #bea966;
630+
/* gold */
631+
padding-bottom: 16px;
632+
/* adjust per request */
633+
}
634+
635+
/* Reduce space between header and first form control */
636+
.popup-box.link-popup .input:first-of-type {
637+
margin-top: 0.33em;
638+
/* was 1em */
639+
}
640+
641+
/* Inline error box for LinkPrompt */
642+
.link-popup .error-box {
643+
border: 1px solid #ff4d4f;
644+
background-color: rgba(255, 77, 79, 0.12);
645+
color: #ff8082;
646+
padding: 0.5em 0.75em;
647+
margin-top: 0.5em;
648+
margin-bottom: 0.5em;
649+
text-transform: none;
650+
}
651+
652+
.link-popup .button-row {
653+
display: flex;
654+
justify-content: space-between;
655+
gap: 1em;
656+
flex-wrap: nowrap;
657+
margin-top: 1em;
658+
}
659+
660+
.link-popup .button-row .button {
661+
flex: 1 1 0;
662+
/* equal width buttons in a row */
663+
margin: 0;
664+
/* override default center margins */
665+
width: 100%;
666+
}
667+
668+
.link-popup .button-row .button.center {
669+
margin: 0;
670+
/* ensure not centered in flex row */
671+
}
672+
673+
.link-popup .button-row .button button {
674+
width: 100%;
465675
}
466676

467677
.popup-box::before {
@@ -471,14 +681,12 @@ input:disabled {
471681
height: calc(100% + 2px);
472682
right: -1px;
473683
top: -1px;
474-
background: linear-gradient(
475-
60deg,
476-
#f5e3ad,
477-
#bea966,
478-
#f5e3ad,
479-
#f5e3ad,
480-
#bea966
481-
);
684+
background: linear-gradient(60deg,
685+
#f5e3ad,
686+
#bea966,
687+
#f5e3ad,
688+
#f5e3ad,
689+
#bea966);
482690
z-index: -1;
483691
animation: animatedgradient 3s ease alternate infinite;
484692
background-size: 300% 300%;
@@ -690,12 +898,10 @@ input:disabled {
690898
color: white;
691899
font-weight: 400;
692900
margin: 10px 10px 0;
693-
background: linear-gradient(
694-
90deg,
695-
rgba(0, 0, 0, 0) 0%,
696-
rgba(129, 107, 62, 1) 50%,
697-
rgba(0, 0, 0, 0) 100%
698-
);
901+
background: linear-gradient(90deg,
902+
rgba(0, 0, 0, 0) 0%,
903+
rgba(129, 107, 62, 1) 50%,
904+
rgba(0, 0, 0, 0) 100%);
699905
}
700906
}
701907

@@ -738,7 +944,7 @@ input:disabled {
738944
padding-top: 5px;
739945
}
740946

741-
.mastery-info > span {
947+
.mastery-info>span {
742948
display: block;
743949
}
744950

@@ -806,11 +1012,11 @@ input:disabled {
8061012
}
8071013

8081014
.item-tooltip {
809-
& > :not(:last-child) {
1015+
&> :not(:last-child) {
8101016
margin-bottom: 1em;
8111017
}
8121018

813-
& > span {
1019+
&>span {
8141020
display: block;
8151021
}
8161022
}
@@ -842,7 +1048,7 @@ input:disabled {
8421048
}
8431049

8441050
.relics {
845-
& > span {
1051+
&>span {
8461052
display: block;
8471053
padding-left: 1em;
8481054
}
@@ -890,4 +1096,3 @@ input:disabled {
8901096
width: 1em;
8911097
display: inline-block;
8921098
}
893-

0 commit comments

Comments
 (0)