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
8 changes: 7 additions & 1 deletion PTG/src/About.css
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
flex-direction: column;
align-items: center;
margin: 0 15vw;
min-height: calc(89.5vh - 60px);
min-height: calc(93.5vh - 60px);
}

.footer-pin {
Expand All @@ -16,3 +16,9 @@ p {
text-align: justify;
margin-bottom: 1rem;
}

@media screen and (max-width: 600px) {
.container{
margin: 1rem;
}
}
13 changes: 12 additions & 1 deletion PTG/src/ChoosePokemon.css
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
field-sizing: content;
width: fit-content;
max-width: 100%;
margin-left: 1%;
margin-left: 1rem;

min-height: 1.5rem;
border-radius: 0;
height: 20px;
Expand All @@ -14,5 +15,15 @@
max-width: 100%;
min-width: 50px;
margin-left: 1rem;
margin-bottom: 5px;
height: 20px;
}

@media screen and (max-width: 600px){
.chooseName{
margin: 5px;
}
.chooseType{
margin: 5px;
}
}
8 changes: 6 additions & 2 deletions PTG/src/Header.css
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,12 @@ header {
width: 50%;
}

@media screen and (max-width: 400px) {
.websiteName > h1 {
margin: 5px;
}

@media screen and (max-width: 600px) {
.websiteName {
font-size: small;
font-size: x-small;
}
}
9 changes: 8 additions & 1 deletion PTG/src/Team.css
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
background-color: rgb(252, 197, 59);
border: solid 1px grey;
border-radius: 5px;
margin: 0px 1%;
margin-left: 1rem;
margin-top: 5px;
}

.generateTeamButton:hover {
Expand Down Expand Up @@ -95,3 +96,9 @@
.teamCardEmpty {
color: #999;
}

@media screen and (max-width: 615px) {
.generateTeamButton{
margin-left: 5px;
}
}
2 changes: 1 addition & 1 deletion PTG/src/pokemonTypes.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Type data pulled live from PokeAPI, so new types (and the generation
// that introduces them) show up automatically.
const TYPE_LIST_URL = "https://pokeapi.co/api/v2/type?limit=100";
const TYPE_LIST_URL = "https://pokeapi.co/api/v2/type?limit=18";
const TYPE_URL = (name: string) => `https://pokeapi.co/api/v2/type/${name}`;

// "unknown" (???) and "shadow" are not real battle types you can filter by.
Expand Down