Skip to content

Update CSS #18

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

Merged
LizabethPetersen merged 2 commits into from
Dec 20, 2017
Merged

Update CSS #18

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
7645871
adds background image and overlay box for content
LizabethPetersen Dec 20, 2017
7c82c75
Merge branch 'css' of https://github.com/code301-nitrogen/client into…
LizabethPetersen Dec 20, 2017
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
Binary file added ...ubble-peers-into-the-most-crowded-place-in-the-milky-way_18051161100_o_orig.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.
12 changes: 6 additions & 6 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,18 +27,18 @@
<body>
<div class="nav">
<ul>
<li class="home"><a href = "/client">HOME</a></li>
<li class="discover"><a href = "/client/discover">DISCOVER</a></li>
<li class="faves"><a href = "/client/faves">FAVORITES</a></li>
<li class="learn"><a href = "/client/learn">LEARN</a></li>
<li class="about"><a href = "/client/about">ABOUT</a></li>
<li class="home"><a href="/client">HOME</a></li>
<li class="discover"><a href="/client/discover">DISCOVER</a></li>
<li class="faves"><a href="/client/faves">FAVORITES</a></li>
<li class="learn"><a href="/client/learn">LEARN</a></li>
<li class="about"><a href="/client/about">ABOUT</a></li>
</ul>

</nav>

<main>
<section id="home">
<iframe src="https://giphy.com/embed/EA4tMPoqsE6pq" width="480" height="270" frameBorder="0" class="giphy-embed" allowFullScreen></iframe><p><a href="https://giphy.com/gifs/mars-EA4tMPoqsE6pq" alt="gif of Mars, via GIPHY"></a></p>
<iframe src="https://giphy.com/embed/EA4tMPoqsE6pq" width="600" height="300" frameBorder="0" class="giphy-embed" allowFullScreen></iframe><p><a href="https://giphy.com/gifs/mars-EA4tMPoqsE6pq" alt="gif of Mars, via GIPHY"></a></p>

</section>

Expand Down
36 changes: 27 additions & 9 deletions styles/base.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,38 @@
html, body {
body {
margin: 0;
padding: 0;
background-color: rgb(74, 98, 163);
background-color: #000000;
background-image: url('https://www.nasa.gov/sites/default/files/thumbnails/image/hubble_friday_05292015.jpg');
background-position: center top;
background-repeat: no-repeat;
}

h1 {
font-family: 'Luckiest Guy', cursive;
font-size: 2.5em;
font-size: 2.3em;
color: rgb(228, 53, 9);
margin: 0;
padding-top: 50px;
padding-left: 100px;
position: fixed;
z-index: 1;
}

h2 {
font-family: 'Luckiest Guy', cursive;
font-size: 1.7em;
}

h3 {
font-family: 'Luckiest Guy', cursive;
font-size: 1.3em;
}

p {
font-family: 'Roboto', sans-serif;
font-size: 1em;
}

a {
text-decoration: none;
color: rgb(251, 153, 76);
Expand All @@ -23,9 +47,3 @@ a.active {
color: rgb(251, 153, 76);
cursor: default;
}



img {

}
13 changes: 5 additions & 8 deletions styles/layout.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,9 @@
#header, #footer, #section {
width: 100%;
margin: 0 auto;
}

#home {
background-color: #000000;
}

#discover {

}
footer{
width: 100%;
margin: 0 auto;
}

27 changes: 21 additions & 6 deletions styles/module.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
padding: 0;
margin: 0px auto;
background-color: #000000;
}
}

.nav li {
display: inline-block;
Expand All @@ -15,25 +15,25 @@
line-height: 40px;
height: 40px;
padding: 5px 10px;
}
}

.nav a {
text-decoration: none;
color: rgb(251, 153, 76);
display: block;
}
}

.nav a:hover {
color: rgb(228, 53, 9);
}
}

.nav a.active {
color: rgb(251, 153, 76);
cursor: default;
}
}


/* Container module */
/* Container module for Gallery */

.flex-container {
display: inline-flex;
Expand Down Expand Up @@ -79,3 +79,18 @@
flex: 0 1 auto;
align-self: auto;
}

/* LEARN page module */

div.faq_container {
background-color: #ffffff;
background-size: cover;
opacity: 0.8;
width: 80%;
position: relative;
margin-left: auto;
margin-right: auto;
height: 1000px;
padding-top: 100px;
padding-left: 150px;
}
17 changes: 10 additions & 7 deletions styles/theme.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,15 @@
/* Learn page styling */
#learn p#question {
font-family: 'Roboto', sans-serif;
font-style: bold;
font-size: 14px;
}
/* Learn Page/FAQ styling */

div.faq p#question {
font-family: 'Roboto', sans-serif;
font-weight: bold;
font-size: 14px;
color: #35aa06;
}

/* Learn page styling */
#learn p#answer {
div.faq p#answer {
font-family: 'Roboto', sans-serif;
font-size: 14px;
color: rgb(37,57,79);
}