merge dev into main #22
Merged
+341
−15
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Base structure of the document, not pretty, but gets the job done. Co-authored-by: n/a Issue: #16
Fixed colors for dark and lightmode. also improved contrast on header. Co-authored-by: n/a Issue: #16
pokemon are displayed in a grid on the front page Authored: Siversm "
Moved from using minmax which scaled elements, to using fixed sized cells. Co-authored-by: siversm siversm@stud.ntnu.no Issue: #19
mainpage Grid Layout
Mock images for first delivery Authored: Siversm "
Authored: Siversm"
"Images now load on front page
Added types for pokemons, abilities and type. Added rendering per the mocked pockemans. Co-authored-by: andrhatl andrhatl@stud.ntnu.no Issue: #17
We have done some comits with the wrong emails, so we need to ad a mailmap to fix it. Co-authored-by: pederoha pederoha@stud.ntnu.no Issue: n/a
Sign in
to join this conversation on GitHub.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Merge for deliverable 2