Skip to content
Snippets Groups Projects
Commit 0fcbfb89 authored by Edvard Dønvold Sjøborg's avatar Edvard Dønvold Sjøborg
Browse files

Changed responsivenes on artpage

parent 6565eb46
No related branches found
No related tags found
No related merge requests found
...@@ -3725,6 +3725,11 @@ ...@@ -3725,6 +3725,11 @@
"resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.3.tgz", "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.3.tgz",
"integrity": "sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==" "integrity": "sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA=="
}, },
"@types/node": {
"version": "12.12.62",
"resolved": "https://registry.npmjs.org/@types/node/-/node-12.12.62.tgz",
"integrity": "sha512-qAfo81CsD7yQIM9mVyh6B/U47li5g7cfpVQEDMfQeF8pSZVwzbhwU3crc0qG4DmpsebpJPR49AKOExQyJ05Cpg=="
},
"@types/parse-json": { "@types/parse-json": {
"version": "4.0.0", "version": "4.0.0",
"resolved": "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.0.tgz", "resolved": "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.0.tgz",
...@@ -3740,6 +3745,23 @@ ...@@ -3740,6 +3745,23 @@
"resolved": "https://registry.npmjs.org/@types/q/-/q-1.5.4.tgz", "resolved": "https://registry.npmjs.org/@types/q/-/q-1.5.4.tgz",
"integrity": "sha512-1HcDas8SEj4z1Wc696tH56G8OlRaH/sqZOynNNB+HF0WOeXPaxTtbYzJY2oEfiUxjSKjhCKr+MvR7dCHcEelug==" "integrity": "sha512-1HcDas8SEj4z1Wc696tH56G8OlRaH/sqZOynNNB+HF0WOeXPaxTtbYzJY2oEfiUxjSKjhCKr+MvR7dCHcEelug=="
}, },
"@types/react": {
"version": "16.9.49",
"resolved": "https://registry.npmjs.org/@types/react/-/react-16.9.49.tgz",
"integrity": "sha512-DtLFjSj0OYAdVLBbyjhuV9CdGVHCkHn2R+xr3XkBvK2rS1Y1tkc14XSGjYgm5Fjjr90AxH9tiSzc1pCFMGO06g==",
"requires": {
"@types/prop-types": "*",
"csstype": "^3.0.2"
}
},
"@types/react-dom": {
"version": "16.9.8",
"resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-16.9.8.tgz",
"integrity": "sha512-ykkPQ+5nFknnlU6lDd947WbQ6TE3NNzbQAkInC2EKY1qeYdTKp7onFusmYZb+ityzx2YviqT6BXSu+LyWWJwcA==",
"requires": {
"@types/react": "*"
}
},
"@types/react-router": { "@types/react-router": {
"version": "5.1.8", "version": "5.1.8",
"resolved": "https://registry.npmjs.org/@types/react-router/-/react-router-5.1.8.tgz", "resolved": "https://registry.npmjs.org/@types/react-router/-/react-router-5.1.8.tgz",
......
...@@ -28,10 +28,10 @@ const FavoriteButton = (props: props) => { ...@@ -28,10 +28,10 @@ const FavoriteButton = (props: props) => {
<img <img
src={isFavorite ? active : inactive} src={isFavorite ? active : inactive}
alt={"favorite-active"} alt={"favorite-active"}
style={{width: '4rem', height: '4rem'}} style={{width: '10vh', height: '10vh'}}
onClick={toggleFavorite} onClick={toggleFavorite}
/> />
</div>) </div>)
}; };
export default FavoriteButton; export default FavoriteButton;
\ No newline at end of file
...@@ -20,7 +20,7 @@ const NavButton = (props: props) => { ...@@ -20,7 +20,7 @@ const NavButton = (props: props) => {
<img <img
src={props.direction === "right" ? rightarrow : leftarrow} src={props.direction === "right" ? rightarrow : leftarrow}
alt={props.direction} alt={props.direction}
style={{ width: '4rem', height: '4rem' }} style={{ width: '10vh', height: '10vh' }}
onClick={onClick} onClick={onClick}
/> />
) )
......
.artpage { .artpage {
display: grid; display: grid;
grid-template-columns: 1fr 2fr 1fr; grid-template-columns: 1fr 10fr 1fr;
grid-template-rows: 1fr 11fr; grid-template-rows: 1fr 20fr;
height: 100vh; height: 100vh;
grid-template-areas: grid-template-areas:
"favorite . dropdown" "favorite exhibition setings"
"left exhibition right"; "left exhibition right";
} }
@viewport {
width: 100vw;
}
.exhibition-piece { .exhibition-piece {
display: flex; display: flex;
grid-area: exhibition; grid-area: exhibition;
grid-row: 2 / 3;
grid-column: 2 / 3;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
flex-direction: column; flex-direction: column;
} }
.exhibition-piece-title { .exhibition-piece-title {
grid-area: exhibitiontitle;
text-align: center; text-align: center;
font-size: 4vh;
}
.author{
font-size: 2.5vh;
} }
svg { .poem {
margin-top: 5%; font-size: 2.7vh;
border: 1px solid black; }
svg{
border: 0.1vw solid black;
}
.svg-artwork {
margin-top: 5vh;
width: 20%;
} }
.dropdown { .dropdown {
grid-area: dropdown; grid-area: setings;
grid-row: 1 / 2;
grid-column: 3 / 4;
display: flex; display: flex;
flex-direction: row-reverse; flex-direction: row-reverse;
margin-right: 2rem; margin-right: 2vh;
margin-top: 1rem; margin-top: 2vw;
} }
/* .settings-icon {
margin-right: 2vh;
margin-top: 2vw;
} */
.favorite-button { .favorite-button {
grid-area: favorite; grid-area: favorite;
margin-left: 2rem; margin-left: 2vh;
margin-top: 1rem; margin-top: 2vw;
} }
.background-one { .background-one {
background-color: rgb(175, 213, 170); background-color: rgb(175, 213, 170);
background-size: 100% 100%;
} }
.background-two { .background-two {
background-color: rgb(108, 178, 209); background-color: rgb(108, 178, 209);
background-size: 100% 100%;
} }
.background-three { .background-three {
background-color: rgb(254, 200, 216); background-color: rgb(254, 200, 216);
background-size: 100% 100%;
} }
.background-four { .background-four {
background-color: rgb(255, 223, 211); background-color: rgb(255, 223, 211);
background-size: 100% 100%;
} }
.font-arial { .font-arial {
...@@ -71,3 +96,49 @@ svg { ...@@ -71,3 +96,49 @@ svg {
font-family: "Comic Sans MS", serif; font-family: "Comic Sans MS", serif;
} }
@media (orientation: portrait) {
.artpage{
display: grid;
grid-template-columns: 1fr 1fr 1fr 1fr;
grid-template-rows: 1fr 20fr 1fr;
grid-template-areas:
"favorite exhibitiontitle exhibitiontitle setings"
"exhibition exhibition exhibition exhibition"
"left . . right";
}
.exhibition-piece-title {
grid-area: exhibitiontitle;
text-align: center;
font-size: 2.2vh;
}
.exhibition-piece {
font-size: 2vh;
}
.svg-artwork {
margin-top: 2%;
width: 22vh;
}
.dropdown {
grid-area: setings;
/* place-self: center; */
/* margin-right: rem;
margin-top: 1rem; */
}
.favorite-button {
grid-area: favorite;
place-self: center;
height: 10vh;
width: 10vh;
}
.dropdown-toggle {
margin: 1vh ;
font-size: 2vh;
}
}
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
background-image: url("../Media/settings.png"); background-image: url("../Media/settings.png");
background-position: center; background-position: center;
background-size: contain; background-size: contain;
width: 3rem; width: 10vh;
height: 3rem; height: 10vh;
} }
.cross-icon { .cross-icon {
...@@ -12,8 +12,8 @@ ...@@ -12,8 +12,8 @@
background-position: center; background-position: center;
background-size: contain; background-size: contain;
background-repeat: no-repeat; background-repeat: no-repeat;
width: 3rem; width: 10vh;
height: 3rem; height: 10vh;
} }
.dropdown { .dropdown {
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
.dropdown-toggle { .dropdown-toggle {
margin: 1rem 1rem 1.5rem; margin: 1rem 1rem 1.5rem;
font-size: large; font-size: large;
} }
label { label {
display: flex; display: flex;
...@@ -42,4 +42,4 @@ label { ...@@ -42,4 +42,4 @@ label {
width: 5rem; width: 5rem;
margin-left: 1rem; margin-left: 1rem;
font-size: smaller; font-size: smaller;
} }
\ No newline at end of file
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
margin-left: 10rem; margin-left: 10rem;
} }
.navbutton button { .navbutton button{
font-size: large; font-size: large;
width: 5rem; width: 5rem;
height: 2rem; height: 2rem;
...@@ -37,4 +37,4 @@ ...@@ -37,4 +37,4 @@
position: fixed; position: fixed;
top: 50%; top: 50%;
right: 5%; right: 5%;
} }
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment