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

assignment done #57

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions .idea/.gitignore

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 12 additions & 0 deletions .idea/css_layout_exercises_starter_files.iml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions .idea/modules.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/vcs.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 8 additions & 1 deletion display-exercise.html
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,13 @@
</head>
<body>
<!-- your HTML here to implement the colored box design -->
<p>Placeholder!</p>
<main class="parent-box">
<div class = "inner1 green"></div>
<div class ="inner1 blue"></div>
<div class="inner2 grey"></div>
<div class=" inner2 black"></div>
<div class="inner2 yellow"></div>

</main>
</body>
</html>
2 changes: 1 addition & 1 deletion float-exercise.html
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<h1>Nebulas</h1>
<h3>Are they really that nebulous?</h3>

<p>Lorem ipsum Id et non est non in occaecat nostrud fugiat in proident consequat aliquip veniam pariatur pariatur <img src="images/nebula1.png"> labore laboris aliqua eu et in dolore dolore dolor eu voluptate ea irure dolore nisi in sint adipisicing aliqua ad magna consequat adipisicing mollit in ad ad qui voluptate dolore et Duis proident aliquip Duis Excepteur quis eu officia proident sit aute nisi sed cillum officia velit dolore eiusmod in aute quis enim ad minim id labore aliquip elit ea elit in tempor dolor amet exercitation in laborum sint irure commodo laborum deserunt commodo ad minim officia deserunt Excepteur aute laboris qui elit laboris id in et esse laboris culpa ut nostrud Duis nulla et laborum ullamco quis deserunt elit dolor sed proident velit sed ad in in in laborum ut incididunt dolor reprehenderit sed ullamco fugiat minim Duis consequat magna cupidatat. Lorem ipsum Id et non est non in occaecat nostrud fugiat in proident consequat aliquip veniam pariatur pariatur labore laboris aliqua eu et in dolore dolore dolor eu voluptate ea irure dolore nisi in sint adipisicing aliqua ad magna consequat adipisicing mollit in ad ad <img src="images/nebula2.png"> qui voluptate dolore et Duis proident aliquip Duis Excepteur quis eu officia proident sit aute.</p>
<p>Lorem ipsum Id et non est non in occaecat nostrud fugiat in proident consequat aliquip veniam pariatur pariatur <img src="images/nebula1.png" class="left"> labore laboris aliqua eu et in dolore dolore dolor eu voluptate ea irure dolore nisi in sint adipisicing aliqua ad magna consequat adipisicing mollit in ad ad qui voluptate dolore et Duis proident aliquip Duis Excepteur quis eu officia proident sit aute nisi sed cillum officia velit dolore eiusmod in aute quis enim ad minim id labore aliquip elit ea elit in tempor dolor amet exercitation in laborum sint irure commodo laborum deserunt commodo ad minim officia deserunt Excepteur aute laboris qui elit laboris id in et esse laboris culpa ut nostrud Duis nulla et laborum ullamco quis deserunt elit dolor sed proident velit sed ad in in in laborum ut incididunt dolor reprehenderit sed ullamco fugiat minim Duis consequat magna cupidatat. Lorem ipsum Id et non est non in occaecat nostrud fugiat in proident consequat aliquip veniam pariatur pariatur labore laboris aliqua eu et in dolore dolore dolor eu voluptate ea irure dolore nisi in sint adipisicing aliqua ad magna consequat adipisicing mollit in ad ad <img src="images/nebula2.png" class="right"> qui voluptate dolore et Duis proident aliquip Duis Excepteur quis eu officia proident sit aute.</p>
<p>Nisi sed cillum officia velit dolore eiusmod in aute quis enim ad minim id labore aliquip elit ea elit in tempor dolor amet exercitation in laborum sint irure commodo laborum deserunt commodo ad minim officia deserunt Excepteur aute laboris qui elit laboris id in et esse laboris culpa ut nostrud Duis nulla et laborum ullamco quis deserunt elit dolor sed proident velit sed ad in in in laborum ut incididunt dolor reprehenderit sed ullamco fugiat minim Duis consequat magna cupidatat. Lorem ipsum Id et non est non in occaecat nostrud fugiat in proident consequat aliquip veniam pariatur pariatur labore laboris aliqua eu et in dolore dolore dolor eu voluptate ea irure dolore nisi in sint adipisicing aliqua ad magna consequat adipisicing mollit in ad ad qui voluptate dolore et Duis proident aliquip Duis Excepteur quis eu officia proident sit aute nisi sed cillum officia velit dolore eiusmod in aute quis enim ad minim id labore aliquip elit ea elit in tempor dolor amet exercitation in laborum sint irure commodo laborum deserunt commodo ad minim officia deserunt Excepteur aute laboris qui elit laboris id in et esse laboris culpa ut nostrud Duis nulla et laborum ullamco quis deserunt elit dolor sed proident velit sed ad in in in laborum ut incididunt dolor reprehenderit sed ullamco fugiat minim Duis consequat magna cupidatat.</p>
</main>

Expand Down
9 changes: 7 additions & 2 deletions position-exercise.html
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
</head>
<body>
<!-- To finish the design, the HTML for the nav requires no additional elements, just the right CSS -->
<nav>
<img src="images/icon.png">
<nav class="container">
<img src="images/icon.png" class="logo">
<ul>
<li><a href="index.html">Home</a></li>
<li><a href="display-exercise.html">display</a></li>
Expand All @@ -29,6 +29,11 @@

<main>
<!-- Put the HTML you need to accomplish the design -->

<div class="parent-box">
<img src="images/spacecat.png" class="cat">
<img src="images/spacedog.png" class="dog">
</div>
</main>
</body>
</html>
38 changes: 38 additions & 0 deletions styles/display-page.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@

.parent-box{
width: 800px;
height: 500px;
margin-left: auto;
margin-right: auto;
font-size: 0;
}
.inner1{
font-size: 0;
width: 50%;
height: 40%;
display: inline-block;
border: 1px solid black;
}
.green{
background-color: green;

}
.blue{
background-color: blue;
}
.inner2{
font-size: 0;
width: 33.3%;
height: 300px;
display: inline-block;
border: 1px solid black;
}
.black{
background-color: black;
}
.grey{
background-color: grey;
}
.yellow{
background-color: yellow;
}
12 changes: 12 additions & 0 deletions styles/float-page.css
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,15 @@ main {
margin-left: auto;
margin-right: auto;
}
.right{
height: 300px;
width: 300px;
float: right;
margin-left: 10px;
}
.left{
height: 300px;
width: 300px;
float: left;
margin-right: 10px;
}
57 changes: 57 additions & 0 deletions styles/position-page.css
Original file line number Diff line number Diff line change
@@ -1 +1,58 @@
.container{
padding-left: 60px;
padding-right: 60px;
}
nav{
height: 60px;
border: 1px solid black;
position: relative;
background-color: grey;
}

.logo{
height: 50px;
position: absolute;
vertical-align: middle;
left: 10px;
border-radius: 50%;
margin-top: 5px;
margin-bottom: 5px;
}
ul{
position: absolute;
display: inline-block;

}
li {
display: inline-block;
}
.parent-box{
position: relative;
width: 600px;
height: 300px;
border-style: dotted;
border-color: green;
border-width: 10px;
margin-right: auto;
margin-left: auto;
margin-top: 150px;
}
.cat{
width: 200px;
height: 200px;
position: absolute;
left: -90px;
top: -90px;
}
.dog{
width: 200px;
height: 200px;
position: absolute;
right: -90px;
bottom: -90px;
}
body {
background: url(../images/outerspace_landscape.jpeg) no-repeat;
background-size: cover;
}