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

Bmk/master #31

Open
wants to merge 5 commits into
base: bmk/master
Choose a base branch
from
Open

Bmk/master #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e79c3bc
Unfortunately have forgotten to commit for quite a while, so changes …
brittanykohler Oct 29, 2015
6483369
Changing styling for images
brittanykohler Oct 30, 2015
c9de10b
Updating nav to dynamically underline current page
brittanykohler Nov 1, 2015
391bb8d
Fixing nav to top of page
brittanykohler Nov 1, 2015
4da6381
Adding procfile
brittanykohler Nov 6, 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: 2 additions & 0 deletions Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
# A sample Gemfile
source "https://rubygems.org"

ruby "2.2.3"

gem "sinatra"

group :development do
Expand Down
1 change: 1 addition & 0 deletions Procfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
web: bundle exec rackup -p $PORT
13 changes: 13 additions & 0 deletions my-site.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,31 @@
class MySite < Sinatra::Base

get "/" do
@title = "Home"
@ring_girl_photos = [
"https://scontent-sea1-1.xx.fbcdn.net/hphotos-xtf1/v/t1.0-9/s720x720/10426732_10203399766226408_66723748750214167_n.jpg?oh=7a0b446174092d45f9feb2c3e62aaaaa&oe=56BF5F89",
"https://fbcdn-photos-g-a.akamaihd.net/hphotos-ak-frc3/v/t1.0-0/p180x540/10530909_10102401201968960_1847194443550958898_n.jpg?oh=b5a0d1de884a5d03f8eb42f568e8e1a4&oe=56B7BED2&__gda__=1454840086_fe098d0dedcf3fb20778ba121d46ecfc",
"https://scontent-sea1-1.xx.fbcdn.net/hphotos-xfa1/v/t1.0-9/10403652_10103485649402487_3095232646608578830_n.jpg?oh=8b63734e08065aed7a965c2b2b57ad4a&oe=56B0C4A5",
"https://scontent-sea1-1.xx.fbcdn.net/hphotos-xfa1/v/t1.0-0/p180x540/10426809_10204363815789825_8587817388045689201_n.jpg?oh=0eb4d02537fc9cdf7103fa02876dbc14&oe=56C9D109",
"https://scontent-sea1-1.xx.fbcdn.net/hphotos-xpt1/v/t1.0-9/10645079_950388254976881_8127042661441026381_n.jpg?oh=16b2225be9725ec7a50ff8b3c8842144&oe=56C9A9C6",
"https://scontent-sea1-1.xx.fbcdn.net/hphotos-xpf1/v/t1.0-9/s720x720/10606057_10203842690619241_3911388809414113541_n.jpg?oh=328db0a2c0f2eb88df994a1ff57efe0e&oe=56B7F160",
"https://scontent-sea1-1.xx.fbcdn.net/hphotos-xpf1/v/t1.0-9/10299577_10202023545083634_1605245898384836200_n.jpg?oh=68e266dbbe582d3a55a5d0cea9835ff0&oe=56B5D88F",
]
erb :index
end

get "/about" do
@title = "About"
erb :about
end

get "/blog" do
@title = "Blog"
erb :blog
end

get "/projects" do
@title = "Projects"
erb :projects
end
end
158 changes: 158 additions & 0 deletions public/css/main.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,158 @@
header {
margin-top: 50px;
}

nav {
text-align: center;
margin-bottom: 25px;
margin-top: 50px;
background-color: #ffffff;
width: 960px;
}

nav a {
color: #2D9FA9;
text-decoration: none;
font-family: 'Quicksand', sans-serif;
}

nav a:hover {
color: #747070;
}

body {
margin: auto;
width: 960px;
}

.nav__link {
padding: 5px 25px;
display:inline-block;
text-align: center;
position: relative;
}

h1 {
/*font-family: 'Merriweather', serif;*/
font-family: Didot;
font-size: 40px;
text-align: center;
}

h2 {
font-family: "Microsoft Yi Baiti";
font-size: 24px;
text-align: center;
margin: 50px;
}

hr {
display: block;
height: 1px;
border: 0;
border-top: 1px solid;
border-color: #747070;
text-align: center;
padding: 0;
}

table {
margin-left: auto;
margin-right: auto;
margin-top: 25px;
}

section {
margin-top: 50px;
text-align: center;
}

p {
font-family: Verdana;
font-size: 14px;
margin: 25px;
}

.social-media {
text-align: center;
height: 25px;
margin: 0;
}

section a, ul a {
color: #747070;
text-decoration: none;
font-family: Verdana;
font-size: 14px;
}

ul a:hover {
color: #2D9FA9;
}

.social-media__icon {
display: inline-block;
position: relative;
line-height: 25px;
padding: 10px;
}

ul {
margin-top: 50px;
margin-left: auto;
margin-right: auto;
width: 300px;
text-align: left;
}

.projects__image--ada {
margin: 25px;
}

footer {
margin-top: 75px;
}

.footer__copyright {
font-size: 10px;
}

.table__image, .about__image--brittany, .blog__image, .social-media__icon {
-webkit-filter: grayscale(100%);
}

.blog__image, .blog__text {
width: 500px;
margin-bottom: 10px;
margin: auto;
}

.blog__text {
padding-bottom: 15px;
}

.table__image {
height: 250px;
}

.table__image:hover, .about__image--brittany:hover, .blog__image:hover, .social-media__icon:hover {
-webkit-filter: grayscale(0%);
}

.container {
overflow: hidden;
}

.selected {
text-decoration: underline;
}

.stay-at-top {
position: fixed;
z-index: 1;
background-color: white;
}

.spacer {
height: 200px;
}
Binary file added public/favicon.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.
Binary file added public/favicon.pptx
View file
Open in desktop
Binary file not shown.
21 changes: 0 additions & 21 deletions public/main.css
View file
Open in desktop

This file was deleted.

42 changes: 17 additions & 25 deletions views/about.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,27 +1,19 @@
<html>
<head>
<title>About</title>
</head>

<body>
<nav>
<a href="/">Home</a>
<a href="/about">About</a>
<a href="/blog">Blog</a>
<a href="/projects">Projects</a>
</nav>
<h1>About</h1>
<section>
<img src="https://scontent-sea1-1.xx.fbcdn.net/hphotos-xaf1/v/t1.0-9/390127_10201502808951741_2057878602_n.jpg?oh=4c2c62d802a0333a8be4b77861ab9c6b&oe=56B78EA4"
width = "300" height="400"/>
<p>
Hi! I'm Brittany. I'm a student at Ada Developers Academy, and I'm slightly terrified of dogs.
</p>
<img class="about__image--brittany" src="https://scontent-sea1-1.xx.fbcdn.net/hphotos-xaf1/v/t1.0-9/390127_10201502808951741_2057878602_n.jpg?oh=4c2c62d802a0333a8be4b77861ab9c6b&oe=56B78EA4"
height="325"/>
<p>
Hi! I'm Brittany. I'm a student at Ada Developers Academy, and I'm slightly terrified of dogs.
</p>
</section>

<section class="social-media">
<div class="social-media__icon">
<a href="https://www.linkedin.com/in/brittanykohler"><img alt="find me on linkedin" src="https://cdn3.iconfinder.com/data/icons/free-social-icons/67/linkedin_circle_color-48.png" border=0></a>
</div>
<div class="social-media__icon">
<a href="https://twitter.com/b_rittk"><img alt="follow me on twitter" src="https://cdn4.iconfinder.com/data/icons/social-media-icons-the-circle-set/48/twitter_circle-48.png" border=0></a>
</div>
<div class="social-media__icon">
<a href="https://instagram.com/brittanykohler/"><img alt="follow me on instagram" src="https://cdn3.iconfinder.com/data/icons/free-social-icons/67/instagram_circle_color-48.png" border=0></a>
</div>
</section>
<footer>
<a href="https://www.linkedin.com/in/brittanykohler">LinkedIn</a>
<a href="https://twitter.com/b_rittk">Twitter</a>
<a href="https://github.com/brittanykohler">GitHub</a>
</footer>
</body>
</html>
26 changes: 9 additions & 17 deletions views/blog.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,15 @@
<html>
<head>
<title>Blog</title>
</head>
<section class="blog__post">
<h2>October 29, 2015</h2>
<p class="blog__text">
Today exactly 8 Adies visited the Taco Time food truck.
</p>
<img class="blog__image" src="https://pbs.twimg.com/media/CSgvKsLVAAAK8Lx.jpg:large">
</section>

<body>
<nav>
<a href="/">Home</a>
<a href="/about">About</a>
<a href="/blog">Blog</a>
<a href="/projects">Projects</a>
</nav>
<h1>Blog</h1>
<section>
<section class="blog__post">
<h2>October 26, 2015</h2>
<p>
Just writing today to say that I love Taco Time.
</p>
<img src="http://www.mywallingford.com/images/restaurants/taco_time.jpg">
<img class="blog__image" src="http://www.mywallingford.com/images/restaurants/taco_time.jpg">
</section>
</body>

</html>
51 changes: 16 additions & 35 deletions views/index.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,38 +1,19 @@
<html>
<head>
<title>Brittany Kohler</title>
</head>

<body>
<nav>
<a href="/">Home</a>
<a href="/about">About</a>
<a href="/blog">Blog</a>
<a href="/projects">Projects</a>
</nav>
<h1>Brittany Kohler</h1>
<table>
<tr>
<td>
<img src="home_pic1.jpg"
height="300"/>
</td>
<td>
<img src="home_pic2.jpg"
height="300"/>
</td>
<td>
<img src="home_pic3.jpg"
height="300" />
</td>
<td>
<img src="home_pic4.jpg" height="300"/>
</td>
</tr>
</table>
<div class="container">
<table>
<tr>
<td>
<img class="table__image" src="home_pic4.jpg" alt="Brittany ziplining"/>
</td>
<td>
<img class="table__image" src="<%= @ring_girl_photos[rand(@ring_girl_photos.length)]%>" alt="Brittany making a cute face"/>
</td>
<td>
<img class="table__image" src="home_pic2.jpg" alt="Brittany microlight flying"/>
</td>
</tr>
</table>
</div>

<h2>
Thoughts, projects, and information.
Thoughts, Projects, and Information
</h2>
</body>
</html>
Loading