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

Lrg/master merge the 2/3! #26

Open
wants to merge 3 commits into
base: lrg/master
Choose a base branch
from
Open

Lrg/master merge the 2/3! #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
52da14f
sinatra wave three...coins in the fountain
Oct 30, 2015
48151bb
position all the divs
Oct 30, 2015
206a0e9
accessability improvements
Oct 30, 2015
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
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ The requirements for this wave are:
- Feel free to use some of the static HTML pages made for the previous exercise
- At least **one** of the static pages must include at least **two** images

## Wave 2: Use CSS to apply style and struture to our website
## Wave 2: Use CSS to apply style and structure to our website

The requirements for this wave are:
- Add `class` and/or `id` attributes to your html tags where appropriate
Expand Down
34 changes: 26 additions & 8 deletions my-site.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,22 +2,40 @@

class MySite < Sinatra::Base

get "/index" do
get "/" do
@title = "Home | Awesome Website of Awesomeness"
erb :index
end

get "/index" do
@title = "Home | Awesome Website of Awesomeness"
erb :"/index"
end

get "/about_me" do
@title = "About Me | Awesome Website of Awesomeness"
erb :"/about_me"
end

get "/projects" do
@title = "Projects | Awesome Website of Awesomeness"
erb :"/projects"
end

get "/blog" do
erb :blog
@title = "Blog | Awesome Website of Awesomeness"
erb :"/blog"
end

get "/blog/girls_cant_do_math" do
@title = "Girls Can't Do Math | Blog | Awesome Website of Awesomeness"
erb :"posts/girls_cant_do_math"
end

get "/blog/they_just_fall" do
@title = "They Just Fall | Blog | Awesome Website of Awesomeness"
erb :"posts/they_just_fall"
end
get "/about_me" do
erb :about_me
end
get "/projects" do
erb :projects
end


end
Binary file modified public/.DS_Store
View file
Open in desktop
Binary file not shown.
155 changes: 155 additions & 0 deletions public/css/my_site.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,155 @@
*{
font-family: Century Gothic, sans-serif;
color: #4B361A;
background-color:#BD9F74;}

h1 {
background-color:#C7D1D4;
text-align: center;
}

.header {
border:5px solid #7F5720;
color:#4B361A;
background-color:#C7D1D4;
padding:5px 20px 15px;
margin: 10px;
}

nav a {
color:#4B361A;
background-color:#C7D1D4;
text-decoration: none;
display: flex;
padding: 5;
}

img {
border:5px solid #7F5720;
margin: 20;

}

.site {
width: 960px;
}

.body{
background-color:#C7D1D4;
display: inline;
float: left;
width: 660;
margin: 10;
border:5px solid #7F5720;
padding: 10;
}

.sidebar {
background-color:#C7D1D4;
position:absolute;
left: 715;
width: 200;
margin: 10;
border:5px solid #7F5720;
padding: 10;
}

footer {
border:5px solid #7F5720;
color:#4B361A;
background-color:#C7D1D4;
bottom: 0;
right:30;
padding:10px 20px 15px;
margin: 10px;
display: inline-block;
height:15;
width:890;
text-align: right;
}

figure {
float: left;
width:250;
background-color:#C7D1D4;
text-align: center;
}
img, figcaption {
background-color:#C7D1D4;
}

a, p, th, table, i{
background-color:#C7D1D4;
}

td{
background-color:#C7D1D4;
padding: 10;
}

#follow i{
color:#4B361A;
background-color:#C7D1D4;
}

#follow{
color:#4B361A;
background-color:#C7D1D4;
padding: 10 0;
}

#follow a{
color:#4B361A;
background-color:#C7D1D4;
text-decoration: none;
display: flex;
padding:5
}

.blog_end {
background-color:#C7D1D4;
display: inline;
float: left;
width: 660;
margin: 10;
border:5px solid #7F5720;
padding: 10;
}

article, aside {
padding:25;
background-color:#C7D1D4;
}

h3 {
background-color:#C7D1D4;
display: inline;
}

time {
margin-left:450;
background-color:#C7D1D4;
}

.blog_img {
text-align: center;
background-color:#C7D1D4;
}

.check_back {
background-color:#C7D1D4;
text-align:center;
padding:30;
margin-bottom:210;
}

.visuallyhidden {
border: 0;
clip: rect(0 0 0 0);
height: 1px;
width: 1px;
margin: -1px;
padding: 0;
overflow: hidden;
position: absolute;
}
Binary file removed public/images/break_line.png
View file
Open in desktop
Binary file not shown.
95 changes: 24 additions & 71 deletions views/about_me.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,74 +1,27 @@
<html>
<head>
<title>Lauren Granger's Awesome Website of Awesomeness</title>
</head>
<div class="header">
<h1>Hello World! I'm Lauren!</h1>
</div>

<body>
<header>
<h1>Welcome to Lauren's Awesome Website of Awesomeness</h1>
<nav>
<ul>
<strong><li><a href="index">Home</a></li></strong>
<li><a href="about_me">All About Lauren</a></li>
<li><a href="blog">Blog</a></li>
<li><a href="projects">Projects</a></li>
</ul
</nav>
<img src="./images/break_line.png"/>
</header>
<div class="body">

<table style="text-align: center">
<thead>
<th colspan="3"><h1>
Hello World! I'm Lauren!
</h1></th>
</thead>
<tbody>
<tr>
<td colspan="3">
<img src="./images/lauren.png" width="200">
</td>
</tr>
<tr>
<td colspan="3">
me, taking my lego-logo project way to seriously, circa 1997
</td>
</tr>
<tr>
<td>
<img src="./images/food.png" width="300"/>
</td>
<td>
<a href="http://www.adadevelopersacademy.org"><img src="./images/ada.png"/></a>
</td>
<td>
<img src="./images/silly_penny.png" height="300"/>
</td>
</tr>
<tr>
<td>
I love to cook, a passion I picked up from a love of food, a decision to live a vegan lifestyle, and a few food allergies.
</td>
<td>
I am a student at Ada Developer's Academy</a>
</td>
<td>
Most of all I like hanging out with my dog Penny. We nap, hike, and generally goof-off. She's my #1 love!
</td>
</tr>
</tbody>
</table>
</body>
<figure>
<img src="./images/lauren.png" width="150" alt="ten or eleven year old white girl with long blonde hair. She is holding a lego project and standing infront of a ninties era computer. Her expression is very serious, no smiling.">
<figcaption>me, taking my lego-logo project way to seriously, circa 1997</figcaption>
</figure>

<footer>
<img src="./images/break_line.png" />
<p>
"Most good programmers do programming not because they expect to get paid or get adulation by the public, but because it is fun to program." - Linus Torvalds
</p>
<p><i>follow me:
<a href="http://twitter.com/bumbbles21">Twitter</a>
<a href="http://instagram.com/pennypeachesthepit">Penny's Instagram</a>
<a href="http://pinterest.com/bumbbles21">Pinterest</a></i>
</p>
</footer>
</html>
<figure>
<img src="./images/food.png" width="150" alt="Four differnt images of food: A casserole, a burrito, oatmeal with coffee, and a thanksgiving platter."/>
<figcaption>I love to cook, a passion I picked up from a love of food, a decision to live a vegan lifestyle, and a few food allergies.</figcaption>
</figure>

<figure>
<a href="http://www.adadevelopersacademy.org"><img src="./images/ada.png" alt= "Logo of Ada Developer's Academy"/></a>
<figcaption>I am a student at Ada Developer's Academy.</figcaption>
</figure>

<figure>
<img src="./images/silly_penny.png" height="150" alt = "Silly Penny: My dog Penny! She is a tan and white pitbul. She is laying on her side on a floral blanket with her mouth slighly open, being goofy."/>
<figcaption>Most of all I like hanging out with my dog Penny. We nap, hike, and generally goof-off. She's my #1 love!</figcaption>
</figure>

</div>
46 changes: 11 additions & 35 deletions views/blog.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,30 +1,15 @@
<html>
<head>
<title>Lauren Granger's Awesome Website of Awesomeness</title>
</head>

<header>
<h1>Welcome to Lauren's Awesome Website of Awesomeness</h1>
<nav>
<ul>
<strong><li><a href="index">Home</a></li></strong>
<li><a href="about_me">All About Lauren</a></li>
<li><a href="blog">Blog</a></li>
<li><a href="projects">Projects</a></li>
</ul
</nav>
<img src="./images/break_line.png"/>
</header>
<div class="header">
<h1>Blog of Awesomeness</h1>
</div>

<div class="body">
<table>
<thead>
<th colspan="2">
<th colspan="3">
<tr>
3 lbs of Thought
3 lbs of Thought:
<i> these are some posts from a blog I wrote back in 2013</i>
</tr>
<tr><i>
these are some posts from a blog I wrote back in 2013
</tr></i>
</th>
</thead>
<tbody>
Expand All @@ -46,16 +31,7 @@
</tr>
</tbody>
</table>

<footer>
<img src="./images/break_line.png" />
<p>
"One of my most productive days was throwing away 1000 lines of code." - Ken Thompson
</p>
<p><i>follow me:
<a href="http://twitter.com/bumbbles21">Twitter</a>
<a href="http://instagram.com/pennypeachesthepit">Penny's Instagram</a>
<a href="http://pinterest.com/bumbbles21">Pinterest</a></i>
</p>
</footer>
</html>
<div class="check_back">
Check back here for more Blog Awesomeness soon!
</div>
</div>
Loading