Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Project Labyrinth #217

Open
wants to merge 21 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
dda5843
Half of code-along code
OscarSindemark Apr 25, 2023
df9a52a
saved more
OscarSindemark Apr 25, 2023
453f252
username form appears!
OscarSindemark Apr 25, 2023
1b2ed41
added loading-, labyrinth- and game-components, functions and comments
AnnikaSonnek Apr 25, 2023
82a1878
start screen fixed, shows description and loading spinner
OscarSindemark Apr 26, 2023
05ddc4e
changed structure of state, added currentPosition
AnnikaSonnek Apr 26, 2023
d5b9d33
got actions-buttons-mapping to work, displayed description from actions
AnnikaSonnek Apr 26, 2023
cba50b9
second fetch-request, loading-component on top, restart button+function
AnnikaSonnek Apr 26, 2023
f984e74
added some styling
OscarSindemark Apr 27, 2023
e9c1d28
started with styling for startscreen-component
AnnikaSonnek Apr 27, 2023
f7ac3a9
fixed starting-screen (with media quieries), loading and footer-compo…
AnnikaSonnek Apr 27, 2023
d7427f4
added images and barebones css
OscarSindemark Apr 28, 2023
2c2f498
Merge branch 'master' into labyrinth-branch
OscarSindemark Apr 28, 2023
6d81b57
installed lottie
OscarSindemark Apr 28, 2023
684960b
lottie dependency
AnnikaSonnek Apr 28, 2023
16044f3
fixed styling of animation, labyrinth
AnnikaSonnek Apr 28, 2023
d3f0a82
fixed styling, added new font
AnnikaSonnek Apr 28, 2023
aa2d76b
changed size of images
AnnikaSonnek Apr 28, 2023
34159d9
font of button
AnnikaSonnek Apr 28, 2023
711f605
media query font laptop
AnnikaSonnek Apr 28, 2023
72ee83a
Merge pull request #1 from AnnikaSonnek/master
AnnikaSonnek May 2, 2023
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
Prev Previous commit
Next Next commit
media query font laptop
AnnikaSonnek committed Apr 28, 2023
commit 711f60517a255e527160b8d089997dab30858332
9 changes: 2 additions & 7 deletions code/src/components/StartScreenStyles.js
Original file line number Diff line number Diff line change
@@ -34,11 +34,6 @@ color: white;
@media (min-width: 767px) {
font-size: 1.3rem;

}

@media (min-width: 1024px) {
font-size: 1.5rem;

}
`
export const TextContainer = styled.div`
@@ -69,7 +64,7 @@ font-size: 1rem;
}

@media (min-width: 1024px) {
font-size: 1.3rem;
font-size: 1.1rem;

}
`
@@ -96,7 +91,7 @@ padding: 8px 10px;
}

@media (min-width: 1024px) {
font-size: 1.5rem;
font-size: 1.2rem;
padding: 8px 10px;
}

7 changes: 3 additions & 4 deletions code/src/index.css
Original file line number Diff line number Diff line change
@@ -20,13 +20,12 @@ code {
width: 100px;
margin-top: 40px;



}

@media (min-width: 767px) {

.maze {
width: 200px;
height: 200px;}
width: 150px;
height: 150px;
margin-top: 60px;}
}