Skip to content

Michael Shull -- Deliverable 8 #4

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.

Sign up for GitHub

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

Open
shullmb wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Michael Shull -- Deliverable 8 #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
874df9c
Tableau II complete
shullmb Jun 1, 2018
79d2f81
Tableau I complete
shullmb Jun 1, 2018
dbaea80
Composition C completed"
shullmb Jun 1, 2018
ebb7361
Composition II complete
shullmb Jun 1, 2018
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
22 changes: 21 additions & 1 deletion layout1/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,26 @@
<link rel="stylesheet" href="style.css" />
</head>
<body>
<h1>I love art!</h1>
<div id="container">
<div id="left-panel">
<div id="top-double-container">
<div class="top-double gray"></div>
<div class="top-double yellow"></div>
</div>
<div id="left-stack-container">
<div id="left-left-top" class="gray"></div>
<div id="left-left-mid" class="blue"></div>
<div id="left-right" class="gray"></div>
<div id="left-bottom" class="gray"></div>
</div>
</div>
<div id="right-panel">
<div id="right-stack-container">
<div id="right-top" class="dark-gray"></div>
<div id="right-mid" class="gray"></div>
<div id="right-bottom" class="red"></div>
</div>
</div>
</div>
</body>
</html>
125 changes: 123 additions & 2 deletions layout1/style.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,124 @@
h1 {
color: rebeccapurple;
/* tableau II palette */
.yellow {
background-color: #E4E89B
}
.red {
background-color: #DF481C;
}
.blue {
background-color: #2F4D99;
}

.gray {
background-color: #D9DDDB;
}

.dark-gray {
background-color: #2C2C2C;
}

/* CONTAINER */

#container {
width: 70%;
margin: 10em auto;
min-height: 100vh;
display: grid;
grid-template-rows: 1fr;
grid-template-columns: 0.7fr .3fr;
grid-template-areas: "left-panel right-panel";

}

/* GRID PANELS */

#left-panel {
grid-area: left-panel;

}

#right-panel {
grid-area: right-panel;
border-left: 1em solid black;
}

/* LEFT SIDE STACK */

#top-double-container {
background-color: #000;
height: 15%;
display: flex;
justify-content: space-around;
align-items: space-around;
flex-direction: row;
}
/* top */
.top-double {
width: 50%;
height: 90%;
border-bottom: 1em solid black;
}

.top-double:first-child {
border-right: 1em solid black;
}
/* middle and bottom */
#left-stack-container {
height: 85%;
display: grid;
grid-template-columns: 0.1fr 0.9fr;
grid-template-rows: 0.4fr 0.35fr 0.25fr;
grid-template-areas: "left-left-top left-right"
"left-left-mid left-right"
"left-bottom left-bottom";
}

#left-left-top {
grid-area: left-left-top;
}

#left-left-mid {
grid-area: left-left-mid;
border-top: 1em solid black;
}

#left-right {
grid-area: left-right;
border-left: 1em solid black;
}

#left-bottom {
grid-area: left-bottom;
border-top: 1em solid black;
}

/* RIGHT SIDE STACK */

#right-stack-container {
height: 100%;
width: 100%;
background: #D9DDDB;
display: flex;
flex-direction: column;
align-items: space-between;
justify-content: center;

}

#right-top {
/* background-color: #2C2C2C; */
height: 30%;
width: 100%;
border-bottom: 1em solid black;
}

#right-mid {
/* background-color: #D9DDDB; */
height: 60%;
}

#right-bottom {
/* background-color: #DF481C; */
height:10%;
border-top: 1em solid black;
}
21 changes: 20 additions & 1 deletion layout2/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,25 @@
<link rel="stylesheet" href="style.css" />
</head>
<body>
<h1>I love art!</h1>
<div id="container">
<div id="left-top" class="other-gray">
<div id="top-black-chunk">a</div>
</div>
<div id="left-bottom" class="gray">
<div id="lb-container">
<div id="lb-black-chunk"></div>
<div id="lb-left" class="yellow"></div>
<div id="lb-right"></div>
</div>
</div>
<div id="right-top" class="red"></div>
<div id="right-mid-top" class="gray"></div>
<div id="right-mid-bottom" class="gray"></div>
<div id="right-mid-right" class="other-gray"></div>
<div id="right-bottom" class="other-gray">
<div id="blue-chunk" class="blue"></div>
</div>

</div>
</body>
</html>
103 changes: 101 additions & 2 deletions layout2/style.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,102 @@
h1 {
color: rebeccapurple;
/* tableau I palette */
.yellow {
background-color: #F9F673;
}
.red {
background-color: #DE0C19;
}
.blue {
background-color: #080E54;
}

.gray {
background-color: #CED3D9;
}
.other-gray {
background-color: #F1F3F0;
}

#container {
background-color: #000;
width: 40%;
margin: 10em auto;
min-height: 100vh;
display: grid;
grid-gap: 1em;
grid-template-rows: 0.4fr 0.2fr 0.25fr 0.15fr;
grid-template-columns: 0.25fr .7fr 0.05fr;
grid-template-areas: "left-top right-top right-top"
"left-top right-mid-top right-mid-right"
"left-bottom right-mid-bottom right-mid-right"
"left-bottom right-bottom right-bottom";
}

#left-top {
grid-area: left-top;
display: flex;
flex-direction: column;
/* align-items: flex-start; */
}

#top-black-chunk {
background-color: black;
width: 100%;
height: 5em;
}

#left-bottom {
grid-area: left-bottom;
}

#lb-container {
width:100%;
height: 100%;
display: grid;
grid-template-columns: 0.25fr 0.75fr;
grid-template-rows: 0.1fr 0.9fr;
grid-template-areas: "lb-black-chunk lb-right"
"lb-left lb-right";
}

#lb-black-chunk {
grid-area: lb-black-chunk;
background-color: #0C070B;
}

#lb-left {
grid-area: lb-left;
}

#lb-right {
grid-area: lb-right;
border-left: 1em solid black;
}

#right-top {
grid-area: right-top;
}

#right-mid-top {
grid-area: right-mid-top;
}

#right-mid-bottom {
grid-area: right-mid-bottom;
}

#right-mid-right {
grid-area: right-mid-right;
}

#right-bottom {
border-bottom: 1em solid black;
grid-area: right-bottom;
display: flex;
flex-direction: row;
justify-content: flex-end;
}

#blue-chunk {
width: 8em;
border-left: 1em solid black;
}
15 changes: 14 additions & 1 deletion layout3/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,19 @@
<link rel="stylesheet" href="style.css" />
</head>
<body>
<h1>I love art!</h1>
<div id="container">
<div id="left-top" class="red"></div>
<div id="left-mid" class="other-gray"></div>
<div id="left-bottom" class="other-gray">
<div id="yellow-block" class="yellow"></div>
</div>
<div id="right-top" class="other-gray"></div>
<div id="right-mid" class="other-gray"></div>
<div id="right-bottom" class="other-gray">
<div id="blue-block" class="blue"></div>
<div id="under-blue"></div>
<div id="leftover-gray"></div>
</div>
</div>
</body>
</html>
83 changes: 81 additions & 2 deletions layout3/style.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,82 @@
h1 {
color: rebeccapurple;
/* composition c palette */
.yellow {
background-color: #F9F673;
}
.red {
background-color: #DE0C19;
}
.blue {
background-color: #080E54;
}

.gray {
background-color: #CED3D9;
}
.other-gray {
background-color: #F1F3F0;
}

#container {
background-color: #000;
width: 70%;
margin: 10em auto;
min-height: 100vh;
display: grid;
grid-gap: 1em;
grid-template-columns: 0.45fr 0.55fr;
grid-template-rows: 0.4fr 0.35fr 0.25fr;
grid-template-areas: "left-top right-top"
"left-mid right-mid"
"left-bottom right-bottom";
}

#left-top {
grid-area: left-top;
}

#left-mid {
grid-area: left-mid;
}

#left-bottom {
grid-area: left-bottom;
display: flex;
}

#yellow-block {
width: 4em;
border-right: 1em solid black;
}

#right-top {
grid-area: right-top;
}

#right-mid {
grid-area: right-mid;
}

#right-bottom {
grid-area: right-bottom;
display: grid;
grid-template-columns: 0.55fr 0.45fr;
grid-template-rows: 0.9fr 0.1fr;
grid-template-areas: "blue-block leftover-gray"
"under-blue leftover-gray";
}

#blue-block {
grid-area: blue-block;
border-bottom: 1em solid black;
}

#under-blue {
grid-area: under-blue;
}

#leftover-gray {
grid-area: leftover-gray;
border-left: 1em solid black;
}


Loading