Commit 7dcea2e4 authored by Noran Baskaran's avatar Noran Baskaran
Browse files

Updated styling to match the current master branch

parent ec272a6e
html {
height: 100%;
margin: 0;
}
body {
margin: 0;
width: 100%;
height: 100%;
background: #59617e;
display: flex;
justify-content: center;
font-family: 'Lobster', cursive;
}
\ No newline at end of file
<<<<<<< Updated upstream
<<<<<<< HEAD
/* Dark Deep Neon Theme */
=======
>>>>>>> Stashed changes
html {
height: 100%;
width: 100%;
......@@ -89,6 +83,20 @@ button:hover {
justify-content: space-around;
align-items: flex-start;
}
#redbtn {
background-color: red;
}
#greenbtn {
background-color: green;
}
#bluebtn {
background-color: blue;
}
.navigation {
background-color: #b030b0;
}
#muteButton {
display: flex;
......@@ -124,87 +132,41 @@ canvas {
height: 500px;
margin-left: 10%;
margin-right: 10%;
=======
#wrapperdiv {
background: rgb(233, 128, 116);
background: linear-gradient(90deg, rgba(233, 128, 116, 1) 0%, rgba(216, 195, 165, 1) 40%, rgba(216, 195, 165, 1) 60%, rgba(233, 128, 116, 1) 100%);
display: flex;
justify-content: center;
flex-direction: column;
text-align: center;
margin: 0 auto 20px auto;
width: 80vw;
min-height: 80vh;
padding-bottom: 50px;
box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.6), 0 12px 30px 0 rgba(0, 0, 0, 0.6);
}
#wrapperdiv button {
width: 150px;
margin: 40px;
}
#wrapperdiv hr {
margin-top: 60px;
width: 600px;
overflow: visible;
/* For IE */
padding: 0;
border: none;
border-top: medium double #333;
color: #333;
text-align: center;
}
#wrapperdiv hr:after {
content: "§";
display: inline-block;
position: relative;
top: -0.7em;
font-size: 1.5em;
padding: 0 0.25em;
background: #c58326;
>>>>>>> master
}
.lds-ring {
display: inline-block;
position: center;
width: 80px;
height: 80px;
display: inline-block;
position: center;
width: 80px;
height: 80px;
}
.lds-ring div {
box-sizing: border-box;
display: block;
position: absolute;
width: 64px;
height: 64px;
margin: 8px;
border: 8px solid rgb(158, 45, 45);
border-radius: 50%;
animation: lds-ring 1.2s cubic-bezier(0.5, 0, 0.5, 1) infinite;
<<<<<<< Updated upstream
border-color: #59617e transparent transparent transparent;
=======
border-color: #b030b0 transparent transparent transparent;
>>>>>>> Stashed changes
box-sizing: border-box;
display: block;
position: absolute;
width: 64px;
height: 64px;
margin: 8px;
border: 8px solid rgb(158, 45, 45);
border-radius: 50%;
animation: lds-ring 1.2s cubic-bezier(0.5, 0, 0.5, 1) infinite;
border-color: #b030b0 transparent transparent transparent;
}
.lds-ring div:nth-child(1) {
animation-delay: -0.45s;
animation-delay: -0.45s;
}
.lds-ring div:nth-child(2) {
animation-delay: -0.3s;
animation-delay: -0.3s;
}
.lds-ring div:nth-child(3) {
animation-delay: -0.15s;
animation-delay: -0.15s;
}
@keyframes lds-ring {
<<<<<<< HEAD
0% {
transform: rotate(0deg);
}
......@@ -264,13 +226,15 @@ canvas {
#canvasAndLines {
display: flex;
flex-direction: row-reverse;
justify-content: space-evenly;
flex-direction: column;
justify-content: center;
flex-wrap: wrap;
align-items: center;
}
#lines {
margin-top: 5%;
}
}
......@@ -309,12 +273,12 @@ canvas {
#canvasAndLines {
display: flex;
flex-direction: row-reverse;
justify-content: space-evenly;
flex-wrap: wrap;
}
#lines {
margin-top: 5%;
width: unset;
}
canvas {
......@@ -331,7 +295,7 @@ canvas {
h2 {
line-height: 1.2;
font-weight: 400;
font-size: 2.0rem;
font-size: 2rem;
text-decoration: underline;
}
......@@ -340,18 +304,3 @@ canvas {
font-size: 1.3rem;
}
}
=======
0% {
transform: rotate(0deg);
}
100% {
transform: rotate(360deg);
}
}
#canvas {
border: 2px solid;
background: black;
box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.6), 0 12px 30px 0 rgba(0, 0, 0, 0.6);
}
>>>>>>> master
......@@ -176,7 +176,8 @@ const App: React.FC = () => {
<div>
{!loading && installation !== undefined && (
<div>
<button
<div className="buttons">
<button className="navigation"
onClick={() => {
changePoetry(false);
}}
......@@ -184,20 +185,22 @@ const App: React.FC = () => {
Previous poetry
</button>
<button
id="themebutton"
onClick={() => {
changePoetry(true);
changeTheme();
}}
>
Next poetry
{theme === 0 ? "Theme 2" : "Theme 1"}
</button>
<button
id="themebutton"
<button className="navigation"
onClick={() => {
changeTheme();
changePoetry(true);
}}
>
{theme === 0 ? "Theme 2" : "Theme 1"}
Next poetry
</button>
</div>
{
<Exhibition
title={installation.title}
......
......@@ -52,6 +52,7 @@ const Exhibition: React.FC<Installation> = ({
<h3>
By - <em>{author}</em>
</h3>
<div className="buttons2">
<button
id="favouritebutton"
onClick={() => {
......@@ -62,6 +63,7 @@ const Exhibition: React.FC<Installation> = ({
</button>
<button
className="canvascolorbutton"
id="redbtn"
onClick={() => {
canvasColor(Color.RED);
}}
......@@ -70,6 +72,7 @@ const Exhibition: React.FC<Installation> = ({
</button>
<button
className="canvascolorbutton"
id="greenbtn"
onClick={() => {
canvasColor(Color.GREEN);
}}
......@@ -78,40 +81,16 @@ const Exhibition: React.FC<Installation> = ({
</button>
<button
className="canvascolorbutton"
id="bluebtn"
onClick={() => {
canvasColor(Color.BLUE);
}}
>
Blue
</button>
<div id="canvasAndLines">
</div>
<div id="canvasAndLines">
<canvas id="canvas" width="400" height="500" />
<br />
<button
className="canvascolorbutton"
onClick={() => {
canvasColor(Color.RED);
}}
>
Red
</button>
<button
className="canvascolorbutton"
onClick={() => {
canvasColor(Color.GREEN);
}}
>
Green
</button>
<button
className="canvascolorbutton"
onClick={() => {
canvasColor(Color.BLUE);
}}
>
Blue
</button>
<hr />
<div id="lines">
{lines !== undefined
? lines.map((line: string) => <p key={Math.random()}>{line}</p>)
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment