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.

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

Nalee Riddell -- Sprint-Challenge--UI-Responsive #353

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

Nalee Riddell -- Sprint-Challenge--UI-Responsive #353

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
61cd574
Completed desktop view
odax Mar 9, 2018
ad589d9
rem font-size, horizontal margins are percentages, completed perfect …
odax Mar 9, 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
169 changes: 163 additions & 6 deletions css/index.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,10 +54,11 @@ table {
html, body {
height: 100%;
font-family: 'Roboto', sans-serif;
font-size: 62.5%;
}

h1, h2, h3, h4, h5 {
font-size: 18px;
font-size: 1.8rem;
margin-bottom: 15px;
font-family: 'Rubik', sans-serif;
}
Expand All @@ -67,16 +68,59 @@ p {
}

.container {
width: 800px;
max-width: 800px;
margin: 0 auto;
}

.very-top-content {
width: 100%;
margin-top: 39px;
}

.very-top-content img {
margin-top: 36px;
}

header {
width: 100%;
text-decoration: none;
display:flex;
align-items: baseline;
}

.bar {
width: 100%;
}

nav {
display: flex;
justify-content: space-between;
width: 70%;
margin-left: 5.5%;
}

header a {
text-decoration: none;
color: black;
font-size: 1.5rem;
}

.top-content {
display: flex;
flex-wrap: wrap;
justify-content: space-evenly;
margin-bottom: 20px;
border-bottom: 1px dashed black;
margin-top: 23px;
padding-bottom: 4px;
}

.bottom-content p {
font-size: 1.6rem;
}

.top-content p {
font-size: 1.5rem;
}

.top-content .text-container {
Expand Down Expand Up @@ -132,15 +176,128 @@ footer {
}

footer nav {
width: 60%;
width: 59%;
display: flex;
justify-content: space-between;
align-items: center;
padding: 20px 2%;
font-size: 14px;
padding: 18px 0%;
font-size: 1.5rem;
justify-content: space-between;
}

footer nav a {
color: white;
text-decoration: none;
}

.box10 {
width: 12.5%;
height: 100px;
background: black;
margin: 20px 2.5%;
color: white;
display: flex;
align-items: center;
justify-content: center;
}

@media (max-width: 768px) {
header {
flex-direction: column;
align-items: center;
}

nav {
margin-left: 0;
width: 86%;
margin-top: 27px;
}

.top-content {
padding-bottom: 26px;
}
}

@media (max-width: 400px) {

.top-nav {
display: flex;
flex-direction: column;
align-items: center;
border-top: grey solid 1px;

}

header a {
text-decoration: none;
color: black;
font-size: 1.5rem;
border-bottom: grey solid 1px;
width: 100%;
text-align: center;
}

.top-nav {
display: flex;
flex-direction: column;
align-items: center;
border-top: grey solid 1px;
height: 254px;
justify-content: space-evenly;
width: 100%;
margin-bottom: -4px;
}

.very-top-content img {
margin-top: -25px;
margin-bottom: 28px;
}

nav {
margin-top:0;
}

header img {
margin-bottom: 28px;
margin-top: -22px;
}

.bar {
margin: -31px 0 -2px 0;
}

.top-content {
flex-direction: column;
align-items: center;
margin-top: -3px;
margin-bottom: 5px;
padding-bottom: 10px;
}

.bottom-content {
flex-direction:column;
align-items:center;
}

.top-content .text-container {
width: 84%;
}

.middle-content {
margin-top: 20px;
}

.bottom-content .text-container {
width: 84%;
}

.boxes {
}

.middle-content .boxes .box {
width: 25.5%;
}

.box10 {
display:none;
}
}
16 changes: 15 additions & 1 deletion index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,25 @@

<link href="https://fonts.googleapis.com/css?family=Roboto|Rubik" rel="stylesheet">
<link rel="stylesheet" href="css/index.css">
<meta name = "viewport" content="width=device-width, initial-scale=1.0"></content>

</head>

<body>
<div class="container">
<div class = "very-top-content">
<header>
<img src="lambda-black.png">
<nav class = "top-nav">
<a href = "#">Home</a>
<a href = "#">About</a>
<a href = "#">Products</a>
<a href = "#">Blog</a>
<a href = "#">Contact</a>
</nav>
</header>
<img class = "bar" src="jumbo.jpg">
</div>
<section class="top-content">
<div class="text-container">
<h2>The Future</h2>
Expand All @@ -38,7 +52,7 @@ <h2>Why Did It Have To Be Boxes...</h2>
<div class="box">Box 7</div>
<div class="box">Box 8</div>
<div class="box">Box 9</div>
<div class="box">Box 10</div>
<div class = "box10"><div class="box">Box 10</div></div>
</div>

</section>
Expand Down
Binary file added jumbo.jpg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added lambda-black.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.