diff --git a/Gemfile b/Gemfile index 8bfa72c..ce9a8e5 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,8 @@ # A sample Gemfile source "https://rubygems.org" +ruby "2.2.3" + gem "sinatra" group :development do diff --git a/Procfile b/Procfile new file mode 100644 index 0000000..c3936b2 --- /dev/null +++ b/Procfile @@ -0,0 +1 @@ +web: bundle exec rackup -p $PORT diff --git a/my-site.rb b/my-site.rb index 15e8349..b6a38c9 100644 --- a/my-site.rb +++ b/my-site.rb @@ -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 diff --git a/public/css/main.css b/public/css/main.css new file mode 100644 index 0000000..67c7607 --- /dev/null +++ b/public/css/main.css @@ -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; +} diff --git a/public/favicon.png b/public/favicon.png new file mode 100644 index 0000000..e04b2dc Binary files /dev/null and b/public/favicon.png differ diff --git a/public/favicon.pptx b/public/favicon.pptx new file mode 100644 index 0000000..82b3b66 Binary files /dev/null and b/public/favicon.pptx differ diff --git a/public/main.css b/public/main.css deleted file mode 100644 index 0b72bfb..0000000 --- a/public/main.css +++ /dev/null @@ -1,21 +0,0 @@ -/* - * This is a CSS file. - * Inside of CSS files comments are started with /* and ended with: - */ - -/* - * Starting with Wave 2 of this project we will be using CSS to style our - * web pages. You should place all of your styles in this file and then - * reference it from each of your HTML files. - */ - -/* - * This file is located at "public/main.css" in your project directory. - * Because it is in the "public" directory, Sinatra knows to make the file - * accessible to your HTML files when you use the src="path/to/file" - * attribute on the appropriate tags. - * - * For example, to include an image into your site, place the file in the - * public directory and use in your HTML - * file. The "public" part of the path should *not* be included. - */ diff --git a/views/about.erb b/views/about.erb index 86f8614..6e854c9 100644 --- a/views/about.erb +++ b/views/about.erb @@ -1,27 +1,19 @@ - - - About - - - - -

About

- -

- Hi! I'm Brittany. I'm a student at Ada Developers Academy, and I'm slightly terrified of dogs. -

+ +

+ Hi! I'm Brittany. I'm a student at Ada Developers Academy, and I'm slightly terrified of dogs. +

+
+ +
+
+ find me on linkedin +
+
+ follow me on twitter +
+
+ follow me on instagram +
- - - diff --git a/views/blog.erb b/views/blog.erb index 5a3f782..85499ef 100644 --- a/views/blog.erb +++ b/views/blog.erb @@ -1,23 +1,15 @@ - - - Blog - +
+

October 29, 2015

+

+ Today exactly 8 Adies visited the Taco Time food truck. +

+ +
- - -

Blog

-
+

October 26, 2015

Just writing today to say that I love Taco Time.

- +
- - - diff --git a/views/index.erb b/views/index.erb index 8be5916..136d1cf 100644 --- a/views/index.erb +++ b/views/index.erb @@ -1,38 +1,19 @@ - - - Brittany Kohler - - - - -

Brittany Kohler

- - - - - - - -
- - - - - - - -
+
+ + + + + + +
+ Brittany ziplining + + Brittany making a cute face + + Brittany microlight flying +
+

- Thoughts, projects, and information. + Thoughts, Projects, and Information

- - diff --git a/views/layout.erb b/views/layout.erb new file mode 100644 index 0000000..0234d43 --- /dev/null +++ b/views/layout.erb @@ -0,0 +1,66 @@ + + + + + Brittany Kohler | <%= @title %> + + + + + + +
+
+

brittany kohler

+
+ + +
+ +
+
+ + <%= yield %> + + + + diff --git a/views/projects.erb b/views/projects.erb index dc94880..f0cb4e6 100644 --- a/views/projects.erb +++ b/views/projects.erb @@ -1,29 +1,15 @@ - - - Projects - - - - -

Projects

Here are some projects I've worked on at Ada:

- + +
- -