diff --git a/Gemfile b/Gemfile index 5eda53e..97552f6 100644 --- a/Gemfile +++ b/Gemfile @@ -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 diff --git a/Gemfile.lock b/Gemfile.lock index 0ac0eac..0fc3c04 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -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) @@ -70,11 +73,10 @@ 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) @@ -82,6 +84,9 @@ GEM 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) @@ -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) diff --git a/config.rb b/config.rb index 8ea1058..b36838d 100644 --- a/config.rb +++ b/config.rb @@ -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 diff --git a/data/authors.yml b/data/authors.yml index 39a5a2c..4e95622 100644 --- a/data/authors.yml +++ b/data/authors.yml @@ -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 diff --git a/surf-and-paddle.png b/images/surf-and-paddle.png similarity index 100% rename from surf-and-paddle.png rename to images/surf-and-paddle.png diff --git a/source/images/background.jpg b/source/images/background.jpg new file mode 100644 index 0000000..a05979f Binary files /dev/null and b/source/images/background.jpg differ diff --git a/source/images/background.png b/source/images/background.png deleted file mode 100644 index 8681d44..0000000 Binary files a/source/images/background.png and /dev/null differ diff --git a/source/images/groot-cheechingy-01.jpg b/source/images/groot-cheechingy-01.jpg new file mode 100644 index 0000000..b2a04d4 Binary files /dev/null and b/source/images/groot-cheechingy-01.jpg differ diff --git a/source/images/groot-cheechingy-closeup1.jpg b/source/images/groot-cheechingy-closeup1.jpg new file mode 100644 index 0000000..4836cf3 Binary files /dev/null and b/source/images/groot-cheechingy-closeup1.jpg differ diff --git a/source/images/groot_edit.jpg b/source/images/groot_edit.jpg new file mode 100644 index 0000000..5ce585d Binary files /dev/null and b/source/images/groot_edit.jpg differ diff --git a/source/images/jose_profile.jpg b/source/images/jose_profile.jpg new file mode 100755 index 0000000..102211c Binary files /dev/null and b/source/images/jose_profile.jpg differ diff --git a/source/images/loved-dancing-baby-groot-check-this-out-you-are-welcome-d1bcd2c7-bf62-429f-bede-80ac84cf61ec.gif b/source/images/loved-dancing-baby-groot-check-this-out-you-are-welcome-d1bcd2c7-bf62-429f-bede-80ac84cf61ec.gif new file mode 100644 index 0000000..68d77a5 Binary files /dev/null and b/source/images/loved-dancing-baby-groot-check-this-out-you-are-welcome-d1bcd2c7-bf62-429f-bede-80ac84cf61ec.gif differ diff --git a/source/images/loved-dancing-baby-groot-check-this-out-you-are-welcome-d1bcd2c7-bf62-429f-bede-80ac84cf61ec.jpg b/source/images/loved-dancing-baby-groot-check-this-out-you-are-welcome-d1bcd2c7-bf62-429f-bede-80ac84cf61ec.jpg new file mode 100644 index 0000000..68d77a5 Binary files /dev/null and b/source/images/loved-dancing-baby-groot-check-this-out-you-are-welcome-d1bcd2c7-bf62-429f-bede-80ac84cf61ec.jpg differ diff --git a/source/images/overly_attach_girlfriend.png b/source/images/overly_attach_girlfriend.png new file mode 100644 index 0000000..659cf7d Binary files /dev/null and b/source/images/overly_attach_girlfriend.png differ diff --git a/source/images/server_says.jpg b/source/images/server_says.jpg new file mode 100644 index 0000000..6512ca9 Binary files /dev/null and b/source/images/server_says.jpg differ diff --git a/source/images/surf-and-paddle.png b/source/images/surf-and-paddle.png new file mode 100644 index 0000000..1eb3384 Binary files /dev/null and b/source/images/surf-and-paddle.png differ diff --git a/source/index.html.erb b/source/index.html.erb index 3f8b9d5..4480c6a 100644 --- a/source/index.html.erb +++ b/source/index.html.erb @@ -1,5 +1,98 @@ ---- -title: Surf & Paddle ---- + + - + + + Surf & Paddle + + + + + +
+
+
+ SURF & PADDLE CO. BLOG
+
+ +
+ + +
+

SURF & PADDLE CO.

+

An Ironyard Academy Project Est. Summer 2014

+
+
+
+ + +
+
+

A FANTASTIC ENGANGING HEADLINE GOES HERE

+
Groot on Monday, June 30th 9:22pm
+

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.

+ +
+

"THIS IS A PULL QUOTE FROM THE ARTICLE."

+
+ +
+

Authors

+ +
+

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.

+ +

Read Comments

+

Read Later

+

Share This Post

+
+
+ +
+
+
+

Baby Groot

+
+ +
+ Twitter + Facebook + Instagram +
+ +
+
+ + +
+
+

About 'Baby Groot'

+
+

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.

+
+
+ + +
+ + + diff --git a/source/stylesheets/all.css b/source/stylesheets/all.css deleted file mode 100644 index 5006d64..0000000 --- a/source/stylesheets/all.css +++ /dev/null @@ -1,3 +0,0 @@ -@charset "utf-8"; - -/* Put content here. */ diff --git a/source/stylesheets/all.css.scss b/source/stylesheets/all.css.scss new file mode 100644 index 0000000..98b93da --- /dev/null +++ b/source/stylesheets/all.css.scss @@ -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; +}