Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
52 changes: 42 additions & 10 deletions src/components/ScoreFilter/ScoreFilter.css
Original file line number Diff line number Diff line change
@@ -1,25 +1,37 @@
.score-filter {
display: flex;
flex-direction: row;
align-items: center;
align-content: center;
margin-top: 5vh;
margin-top: 0;
}

select {
width: 80%;
min-width: 15ch;
max-width: 30ch;
}

.dropList-filter {
display: flex;
flex-direction: row;
}

.score-range {
display: flex;
}

input {
input.min,
input.max {
text-align: center;
margin-left: 10px;
height: 5vh;
width: 40px;
font-size: 60%;
text-align: right;
}

button {
margin-top: 2vh;
#clearFilterBtn {
margin-top: 3vh;
}

#settings {
Expand All @@ -29,13 +41,33 @@ button {
#option {
text-align: center;
}

@media only screen and (min-device-width: 280px) and (max-device-width: 1200px) {
.score-filter {
flex-direction: column;
margin-top: 2vh;
@media (min-width: 320px) and (max-width: 960px) {
.filter {
margin: 0 2vh;
}
#settings {
margin: 10px auto;
}
input.min,
input.max {
flex-direction: row;
width: 40px;
font-size: 3vmin;
}
.range {
font-size: 4vmin;
}
#clearFilterBtn {
width: min-content;
font-size: 2vmin;
}
.dropList-filter {
flex-direction: column;
justify-content: space-around;
}
select {
min-width: 10ch;
max-width: 20ch;
height: 2.3rem;
}
}
7 changes: 6 additions & 1 deletion src/components/ScoreFilter/ScoreFilter.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,15 @@ export default function ScoreFilter() {
const scoreFilter = document.createElement('div');
scoreFilter.classList.add('score-filter');

const dropListFilter = document.createElement('div');
dropListFilter.classList.add('dropList-filter');
scoreFilter.appendChild(dropListFilter);

const button = ClearButton();

const dropdownAbout = Dropdown('about-dropdown', DEFAULT_ABOUT, 'CATS', 'DOGS');
const dropdownType = Dropdown('type-dropdown', DEFAULT_TYPE, 'MULTIPLE CHOICE', 'OPEN');
scoreFilter.append(dropdownAbout, dropdownType);
dropListFilter.append(dropdownAbout, dropdownType);

dropdownAbout.addEventListener('change', (e) => {
settings.about = e.target.value;
Expand Down Expand Up @@ -64,6 +68,7 @@ export default function ScoreFilter() {
// TODO: use Button component instead
function ClearButton() {
const button = document.createElement('button');
button.setAttribute('id', 'clearFilterBtn');
button.innerHTML = 'clear filters';
button.addEventListener('click', () => {
settings.about = DEFAULT_ABOUT;
Expand Down
44 changes: 28 additions & 16 deletions src/views/Leaderboard/Leaderboard.css
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,10 @@ div#scorePage > * {
}

#scorePageTitle {
font-size: 5rem;
font-size: 4rem;
font-weight: bold;
color: #2c3e50;
margin-bottom: 0;
}
/*podium*/

Expand Down Expand Up @@ -66,7 +67,7 @@ td.step div:first-of-type {

.list {
display: flex;
justify-content: space-around;
justify-content: space-evenly;
color: whitesmoke;
bottom: 20%;
}
Expand All @@ -93,12 +94,12 @@ button.resetButton {
right: 4%;
}

@media (max-width: 960px) {
@media (min-width: 320px) and (max-width: 960px) {
.podiumNickname {
font-size: 1rem;
}
.listItem {
font-size: 0.8rem;
font-size: 2vmin;
}

#scorePageTitle {
Expand All @@ -107,25 +108,36 @@ button.resetButton {

button.leaderboardMenuButton {
bottom: 0;
left: 0;
width: min-content;
left: 5%;
width: fit-content;
font-size: 2vmin;
}
td.step div:first-of-type {
width: 100px;
font-size: 3rem;
}

#gold {
height: 150px;
margin: 20px auto;
}
#silver {
height: 100px;
}
#bronze {
height: 80px;
}

button.resetButton {
bottom: 0;
right: 0;
width: min-content;
right: 5%;
width: fit-content;
font-size: 1.5vmin;
}
}
@media only screen and (min-device-width: 280px) and (max-device-width: 480px) {
td.step div:first-of-type {
margin: 20px 0px;
width: 75px;
}
#scorePageTitle {
font-size: 2rem;

.list {
justify-content: center;
margin-bottom: 10%;
font-size: 3vmin;
}
}
3 changes: 2 additions & 1 deletion src/views/QuizView/quizView.css
Original file line number Diff line number Diff line change
Expand Up @@ -139,9 +139,10 @@
color: white;
}

@media only screen and (min-device-width: 280px) and (max-device-width: 660px) {
@media (min-width: 320px) and (max-width: 960px) {
.quizViewMenuButton {
width: min-content;
padding-top: 12px;
font-size: 3vmin;
}
}
2 changes: 1 addition & 1 deletion src/views/ScorePage/ScorePage.css
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ input {
#finalScore {
height: 70px;
}
@media only screen and (min-device-width: 280px) and (max-device-width: 480px) {
@media (min-width: 320px) and (max-width: 960px) {
.scorePageMenuButton {
position: relative;
align-self: center;
Expand Down
2 changes: 1 addition & 1 deletion src/views/ScorePage/ScorePage.js
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ function renderNicknameForm() {
nicknameFormContainer.setAttribute('id', 'nicknameFormDiv');
const input = document.createElement('input');
input.setAttribute('id', 'nicknamename');
input.setAttribute('placeholder', 'Enter Nicknamename');
input.setAttribute('placeholder', 'Enter Nickname');
input.setAttribute('type', 'text');
input.setAttribute('style', 'text-transform: uppercase');
input.addEventListener('keyup', () => {
Expand Down