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

Jump to bottom

Greg's List gh-pages #20

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

Greg's List gh-pages #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
295f01e
third
ryrankin Oct 11, 2016
2d66dbe
Greg's list second try commit
ryrankin Oct 13, 2016
40e385d
nav commit
ryrankin Oct 13, 2016
28501f2
Greg's list v1
ryrankin Oct 14, 2016
f65332d
Friday commit
ryrankin Oct 14, 2016
062c5c5
added page search
ryrankin Oct 14, 2016
304f874
changes to page-search
ryrankin Oct 14, 2016
5b977c4
added pages
ryrankin Oct 17, 2016
8e09a56
corrected search bar
ryrankin Oct 17, 2016
59a04f4
page-search clean up v1
ryrankin Oct 17, 2016
0d93398
final commit
ryrankin Oct 17, 2016
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
15 changes: 13 additions & 2 deletions display-exercise.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,18 @@
<link rel="stylesheet" type="text/css" href="styles/display-page.css">
</head>
<body>
<!-- your HTML here to implement the colored box design -->
<p>Placeholder!</p>
<main>
<div class="parent">
<div class="child">
<div class="green"></div>
<div class="blue"></div>
</div>
<div class="child">
<div class="grey"></div>
<div class="black"></div>
<div class="orange"></div>
</div>
</div>
</main>
</body>
</html>
48 changes: 48 additions & 0 deletions greg-project.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
<html>
<head>
<title>Greg's List</title>
<meta charset="utf-8" name="description" content="Greg's List">

<link rel="stylesheet" type="text/css" href="/Users/ryrankin/Desktop/projects/css_layout_exercises_starter_files/styles/greg-page.css">

<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u" crossorigin="anonymous">

<link href="https://fonts.googleapis.com/css?family=Titillium+Web" rel="stylesheet">
</head>
<body>
<main>
<header class="container">
<p class="home">
<h1>Greg's List</h1>
</p>
<nav class="nav-bar">
<a href class="nav-link rel">Post</a>
<a href class="nav-link rel">Account</a>
</nav>
</header>
<section class="search-section">

<form class="search-bar">
<label for="search">Search </label>
<input type="text" id="search" placeholder="search software jobs">
<button type="submit" class="search-button">
<img src="images/magnifying-glass.png" class="magnifying-glass">
</button>
</form>
</section>
<section class="page-section">
<nav class="page">
<a href class="page-button">< prev</a>
<span class="search-field">1 to 100 of 179</span>
<a href class="page-button">next ></a>
</nav>
</section>





</main>
</body>


Binary file added images/magnifying-glass.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.
46 changes: 46 additions & 0 deletions styles/display-page.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
main {
font-size: 0;
}

.box-parent {
margin-top: 100px;
margin-left: auto;
margin-right: auto;
width: 800px;
}

.box {
border: 1px solid black;
display: inline-block;
}

.box-half {
width: 50%;
height: 200px;
}

.box_third {
width: 33.33%;
height:300px;

}
.green {
background-color: green;
}

.blue {
background-color: blue;
}

.grey {
background-color: grey;
}

.black {
background-color: black;
}

.orange {
background-color: orange;
}

105 changes: 105 additions & 0 deletions styles/greg-page.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,105 @@
body {
font-family: "Roboto", sans-serif;
margin: 0;
padding: 40px;
width: 1000px;
display: block;
}

.container {
width: 100%;
display: inline-block;
margin-right: auto;
background-color: grey;
padding: 10px;
padding-right: 200px;
margin-bottom: 20px


}

.nav-bar {
position: absolute;
top: 60;
right: 15;
}

header {
margin-top: -10px;
background-color: grey;
position: relative;
}

nav-bar {
margin-top: 100px;
margin-right: 140px;
}

input {
width: 400px;
height: 20px;
font-size: 17px;
}


.search-button {
margin-bottom: 50px;
position: absolute;
}

.magnifying-glass {
height: 11%;
font-size: 16px;
position: relative;
}

.page-section {
border: 1px black solid;
border-radius: 3px solid black;
padding: 10px;
display: inline-block;
position: relative;
left: 50px;

}

.page-button {
font-size: 16px;
padding: 8px 10px;
border-radius: 5px;

}

div {
margin-top: 0px;
}


label {
margin-top: 10px;
margin-bottom: 10px;
display: block;
}


.search-section input {
font-size: 17px;
font-weight: 500;
line-height: 40px;
height: 40px;
border: 1px solid #DDDDDD;
border-radius: 3px;
padding: 0 5px 0 8px;
width: 400px;
}
.search-field {
border-left: 1px solid;
border-right: 1px solid;
padding: 5px;
text-transform: bold;
}