Skip to content

Commit

Permalink
Correction
Browse files Browse the repository at this point in the history
  • Loading branch information
AgataLudwiczynska committed Jan 5, 2021
1 parent 03daba6 commit c482e6f
Show file tree
Hide file tree
Showing 3 changed files with 30 additions and 22 deletions.
14 changes: 11 additions & 3 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/app/showStartingPage.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ export const showStartingPage = () => {
<input type='button' id='startGameButton' class="buttonWithText" value='PLAY'>
</div>
<ul class='bottomOfThePageOptions' class="firstColumn">
<ul class='bottomOfThePageOptions firstColumn'>
<li id='helpOption'>?</li>
<li id='leaderboard'><i class="fa fa-trophy"></i></li>
</ul>
Expand Down
36 changes: 18 additions & 18 deletions styles/App.css
Original file line number Diff line number Diff line change
Expand Up @@ -41,18 +41,18 @@ body {

/* div headerWithLogo */

div#headerWithLogo #pokemonLogo{
#pokemonLogo{
height: 18vh;
}
div#headerWithLogo #quizLogo{
#quizLogo{
padding-left: 15vh;
font-family: 'Secular One', sans-serif;
font-size: 8.5vh
}

/* ul selectModeMenu */

ul#selectModeMenu{
#selectModeMenu{
grid-row: span 2/4;
display: flex;
flex-direction: column;
Expand All @@ -61,7 +61,7 @@ ul#selectModeMenu{
padding-left: 6%;
list-style:none;
}
ul#selectModeMenu li{
#selectModeMenu li{
margin-bottom: 4px;
padding: 1vh 2.5vw;
width: 60%;
Expand All @@ -70,38 +70,38 @@ ul#selectModeMenu li{

/* div EnterName */

div#enterNameAndPlayMenu{
#enterNameAndPlayMenu{
grid-row: 2;
justify-self: center;
}

div#enterNameAndPlayMenu #enterYourName{
#enterYourName{
padding-bottom: 5%;
font-family: 'Ranchers', cursive;
font-size: 5.5vh;
}

div#enterNameAndPlayMenu #enterYourNameArea{
#enterYourNameArea{
display:flex;
justify-content: center;
}

div#enterNameAndPlayMenu #playerIcon{
#playerIcon{
height: 4vh;
}

div#enterNameAndPlayMenu #enterYourNameInput{
#enterYourNameInput{
border:none;
border-bottom: black solid 1px;
padding: 2% 5%;
}

/* div buttonPlay */

div#startGame{
#startGame{
grid-row-start: 3;
}
div#startGame #startGameButton{
#startGameButton{
margin-left:30%;
padding: 0.5% 2%;
width: 40%;
Expand Down Expand Up @@ -130,14 +130,14 @@ ul.bottomOfThePageOptions li{

/* pikachu */

img#pikachuImg{
#pikachuImg{
grid-row-end: -1;
justify-self: end;
height: 100%;
}

@media(max-width:850px){
img#pikachuImg{
#pikachuImg{
justify-self: center;
}
}
Expand All @@ -149,22 +149,22 @@ img#pikachuImg{
.spanInPortrait{
grid-column: span 2/-1;
}
div#enterNameAndPlayMenu{
#enterNameAndPlayMenu{
padding-top: 4%;
}
ul#selectModeMenu{
#selectModeMenu{
grid-row: 3;
padding-left: 0;
}
ul#selectModeMenu li{
#selectModeMenu li{
margin-left:10%;
width: 80%;
text-align: center;
}
div#startGame{
#startGame{
grid-row:4;
}
img#pikachuImg{
#pikachuImg{
justify-self: end;
}
}

0 comments on commit c482e6f

Please sign in to comment.