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.

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

Surf And Paddle // Autors by Jose Chirivella #28

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 5 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,14 +1,17 @@
# If you have OpenSSL installed, we recommend updating
# the following line to use "https"
source 'http://rubygems.org'
source 'https://rubygems.org'

gem "middleman", "~>3.3.6"

# Live-reloading plugin
gem "middleman-livereload", "~> 3.1.0"
gem 'middleman-livereload', '~> 3.3.4'

# For faster file watcher updates on Windows:
gem "wdm", "~> 0.1.0", :platforms => [:mswin, :mingw]

# Windows does not come with time zone data
gem "tzinfo-data", platforms: [:mswin, :mingw]
gem 'json', '~> 1.8.1'
gem "bourbon", :require => false
gem "neat", :require => false
20 changes: 14 additions & 6 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@ GEM
minitest (~> 5.1)
thread_safe (~> 0.1)
tzinfo (~> 1.1)
bourbon (4.0.2)
sass (~> 3.3)
thor
celluloid (0.16.0)
timers (~> 4.0.0)
chunky_png (1.3.1)
Expand Down Expand Up @@ -70,18 +73,20 @@ GEM
rack-test (~> 0.6.2)
thor (>= 0.15.2, < 2.0)
tilt (~> 1.4.1, < 2.0)
middleman-livereload (3.1.1)
em-websocket (>= 0.2.0)
middleman-core (>= 3.0.2)
multi_json (~> 1.0)
rack-livereload
middleman-livereload (3.3.4)
em-websocket (~> 0.5.1)
middleman-core (~> 3.2)
rack-livereload (~> 0.3.15)
middleman-sprockets (3.3.10)
middleman-core (~> 3.3)
sprockets (~> 2.12.1)
sprockets-helpers (~> 1.1.0)
sprockets-sass (~> 1.2.0)
minitest (5.4.2)
multi_json (1.10.1)
neat (1.6.0)
bourbon (>= 3.1)
sass (>= 3.3)
padrino-helpers (0.12.3)
i18n (~> 0.6, >= 0.6.7)
padrino-support (= 0.12.3)
Expand Down Expand Up @@ -123,7 +128,10 @@ PLATFORMS
ruby

DEPENDENCIES
bourbon
json (~> 1.8.1)
middleman (~> 3.3.6)
middleman-livereload (~> 3.1.0)
middleman-livereload (~> 3.3.4)
neat
tzinfo-data
wdm (~> 0.1.0)
6 changes: 3 additions & 3 deletions config.rb
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,9 @@
# activate :automatic_image_sizes

# Reload the browser automatically whenever files change
# configure :development do
# activate :livereload
# end
configure :development do
activate :livereload, :apply_js_live => false
end

# Methods defined in the helpers block are available in templates
# helpers do
Expand Down
6 changes: 3 additions & 3 deletions data/authors.yml
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
easley:
Annie Easley:
name: Annie Easley
links:
- Wikipedia: https://en.wikipedia.org/wiki/Annie_Easley
- Homepage: http://www.jsc.nasa.gov/history/oral_histories/NASA_HQ/Herstory/EasleyAJ/EasleyAJ_8-21-01.htm
turing:
Alan Turing:
name: Alan Turing
links:
- Twitter: https://twitter.com/Alan_M_Turing
- Wikipedia: https://en.wikipedia.org/wiki/Alan_Turing
- Facebook: https://www.facebook.com/AlanTuringCodebreaker
lovelace:
Ada Lovelace:
name: Ada Lovelace
links:
- Wikipedia: https://en.wikipedia.org/wiki/Ada_Lovelace
Expand Down
File renamed without changes
Binary file added source/images/background.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed source/images/background.png
Binary file not shown.
Binary file added source/images/groot-cheechingy-01.jpg
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 source/images/groot-cheechingy-closeup1.jpg
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 source/images/groot_edit.jpg
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 source/images/jose_profile.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
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 source/images/overly_attach_girlfriend.png
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 source/images/server_says.jpg
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 source/images/surf-and-paddle.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
101 changes: 97 additions & 4 deletions source/index.html.erb
Original file line number Diff line number Diff line change
@@ -1,5 +1,98 @@
---
title: Surf & Paddle
---
<!DOCTYPE html>
<html lang="en">

<!-- insert content here -->
<head>
<meta charset="UTF-8">
<title>Surf &amp; Paddle</title>
<link href="stylesheet.css" type="test/css" rel="stylesheet" />
</head>

<body>
<!-- Begin Top bar -->
<div class="header">
<div class="backgroundheader">
<div class="button_header_left">
<a href="#">SURF &amp; PADDLE CO. BLOG</a></div>
<div class="buttons_header">
<nav>
<a href="#">About</a>
<a href="#">Search</a>

</nav>
</div>
<!-- End Top Bar -->
<!-- Begin Title -->
<div class="titleheader">
<h1>SURF &amp; PADDLE CO.</h1>
<h2 style="color:grey; font-size: 10pt">An Ironyard Academy Project Est. Summer 2014</h2>
</div>
</div>
</div>
<!-- End Title -->
<!-- Begin Left Footer -->
<div class="fontfooter">
<div class="leftfooter">
<h1>A FANTASTIC ENGANGING HEADLINE GOES HERE</h1>
<h6>Groot on Monday, June 30th 9:22pm</h6>
<p>Farmer full frame durty major diamondview southpoint oprah building city of medicine, duke chapel bay 7 renovation parrish street west village alt-country durty, scooter durham freeway french press fifteen five oh one mount moriah angier drive. Nc
central the west end mountain goats chicken bone park skate park blue devils luewwd d-town, bicycle lakewood wunc seventy duke chapel saint joseph's basketball, tiny farm lettuce city of medicine coworking old west bimbe bicycle. Partner bouncing
bulldogs startup stampede durham divas blues festival the kress, baldwin lofts nevermore baldwin lofts we want oprah sustain-a-bull, the double nickel dur'm eagles north durham. Bowtie black wall street the boulevard the state of things dapper scrap
exchange music on the lawn, american tobacco underground school of the arts bulltown strutters lady arm wrestlers, southpoint startup stampede beaver queen scrap exchange hayti.</p>
<!-- MID webpage -->
<div class="mid_title">
<h3>"THIS IS A PULL QUOTE FROM THE ARTICLE."</h3>
</div>
<!-- MID WEBPAGE -->
<div class="authors">
<h1>Authors</h1>
<ul>
<% data.authors.each do |author| %>
<li><a href="<%= author[0] %>.html"><%= author[0] %></a></li>
<% end %>
</ul>
</div>
<p>The double nickel full frame alt-country old five points baseball eno, seed funding the buehler incubator liberty doughman, medicine hipster marry durham bowtie. Chapel drive basketball food truck rodeo historic preservation alt-country durham bowtie,
old west fayetville street west village renovation coffee wunc baldwin lofts, farmer's market renaissance beer big green wall coworking. Historic preservation world beer festival major the bull southsquare hub tobacco the state of things trinity
park, adf people's pharmacy dance microbrew farmer 55, 15-501 renaissance durham rescue mission rigsbee food truck rodeo old west. Bull durham brightleaf festival for the eno driver street the boulevard renovation local brewery, food truck vest
durham bulls big green wall marry durham partner. Carpe durham american tobacco railroad startup stampede north east erwin terrace scooter fayetville street, 15-501 third fridays saint joseph's nevermore ballpark. Carpe durham beard hope valley
marry durham tw alexander ballpark old west beer duke forest, cleveland holloway dpac the park forest hills listserv angier drive elf diamondview, hipster scooter forest hills towerview drive miami boulevard juneteenth full frame. Sustainable railroad
bimbe dpac bowtie 70 the state of things walltown beaver queen incubator mount moriah, yoga hipster oprah building jazz arm wrestling angier drive old north the kress. We want oprah city of medicine 55 driver street smoffice north durham city center
the state of things, juneteenth coffee acc the west end history hub microbrew oprah building, beard seventy carolina theatre morehead hills corcoran community. History hub ninth street cleveland holloway baseball 147 corcoran smoffice blues, fixie
black wall street triangle localista hope valley brewery durham, butterfly house seeds hipster maker baldwin lofts hipster.</p>
<!-- Share buttons -->
<p>Read Comments</p>
<p>Read Later</p>
<p>Share This Post</p>
</div>
<div class="rightfooter">
<!-- RIGHT FOOTER -->
<div class="profile_picture">
</div>
<div class="user_name">
<p>Baby Groot</p>
</div>
<!-- Social Networks -->
<div class="socialnetworks">
<a href="#">Twitter</a>
<a href="#">Facebook</a>
<a href="#">Instagram</a>
</div>
<!-- STARTING ADD -->
<div class="add_photo">
</div>
<!-- END ADD -->
<!-- SIDEBAR SECTION HEADING -->
<div class="description">
<div class="About_user">
<h3>About 'Baby Groot'</h3>
</div>
<p>Gritty northgate park chapel hill street doughman amshack scrap exchange mountain goats scooter, southsquare food truck gritty sodu baldwin lofts basketball bouncing bulldogs, chicken bone park skate park major the bull blackwell the bulls listserv.
Bragtown blues festival triangle localista durham rescue mission fayetville street listserv, the state of things world beer festival innovation juneteenth.</p>
</div>
</div>
<!-- MOST POPULAR POST -->
<!-- BOTTOM BAR -->
</div>
</body>

</html>
3 changes: 0 additions & 3 deletions source/stylesheets/all.css

This file was deleted.

161 changes: 161 additions & 0 deletions source/stylesheets/all.css.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,161 @@
@charset "utf-8";
@import "bourbon";
@import "neat";

/* Put content here. */
* {
-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
box-sizing: border-box;
}
.header {
font-family: 'Oswald', sans-serif;
}
.fontfooter {
font-family: 'Open Sans', sans-serif;
}
.backgroundheader {
background-image: linear-gradient( rgba(20, 20, 60, .70), rgba(20, 20, 60, .70)),url("../images/background.jpg");
height: 500px;
width: 1200px;
margin-right: auto;
margin-left: auto;
background-size: 100%;
}
.button_header_left a {
color: black;
text-decoration: none;
float: left;
position: relative;
top: 10px;
bottom: 10px;
left: 50px;

}
p {
margin: 2px;
}
.titleheader {
height: 50px;
width: 60%;
margin: 0 auto;
padding: 20px;
resize: both;
overflow: auto;
text-align: center;
text-position: relative;
color: white;
font-size: 30px;
}
.titleheader h1 {
color: white;
height: 100px;
/* margin: -70px 0 0 -300px; */
position: absolute;
top: 120px;
left: 410px;
padding: 20px;
}
.titleheader h2 {
color: white;
height: 100px;
/* margin: -10px 0 0 -150px; */
position: absolute;
top: 210px;
left: 550px;
padding: 20px;
}
.buttons_header {
width: 260px;
float: left;
position: relative;
top: -12px;
left: 700px;
margin: 0 10px;
display: block;
}
nav {
width: 300px;
float: right;
margin: 24px 0 19px;
z-index: 70;
}
nav {
text-align: right;
text-transform: uppercase;
font-size: 75%;
}
nav a {
margin-left: 10px;
padding-bottom: 4px;
line-height: 15px;
text-decoration: none;
color: black;
font-size: 16px;
}
.leftfooter {
float: left;
position: absolute;
top: 500px;
left: 100px;
padding-left: 105px;
font-size: 12px;
padding-top: 8px;
vertical-align: top;
width: 965px;
margin: 24px;
padding: 0;
}
.leftfooter h1 {
font-size: 50px;
font-family: 'Oswald', sans-serif;
line-height: 50px;
color: #112c3d;
letter-spacing: -.5px;
}
.mid_title {
color: #3366ff;
}
.rightfooter {
width: 325px;
float: right;
margin: 55px 0 0;
padding-right: 120px;
}
.profile_picture {
align: center;
border-radius: 60px;
background: url("../images/groot_edit.jpg");
background-position: center;

height: 100px;
width: 100px;
margin: 0 0 0 50px;
}
.description {
font-size: 12px;
}
.user_name p{
text-align: center;
color: #3366ff;
}
.socialnetworks a{
text-decoration: none;
position: relative;
top: 0px;
left: 25px;
color: #666666;
font-size: 13px;
}
.add_photo {
align: center;
background: url("../images/overly_attach_girlfriend.png");
background-position: center;
background-size: 100%;
height: 182px;
width: 200px;
}
.About_user {
text-align: center;
color: #3366ff;
}