Code

Hrw/master#46

Code

Open

yourFriendWes wants to merge 29 commits intoAda-C4:hrw/masterAda-C4/SinatraSite:hrw/masterfrom yourFriendWes:hrw/masteryourFriendWes/SinatraSite:hrw/masterCopy head branch name to clipboard

+261-174

Commits

Commits on Oct 27, 2015

• add pry gem

  hougland

  committed
  4b35a0a

• add sinatra gem

  hougland

  committed
  7b3131d

• add html files from project from yesterday

  hougland

  committed
  3bfece9

• testing filepaths to link to other parts of site

  hougland

  committed
  75ec71d

• testing another filepath

  hougland

  committed
  98ab96f

• added photos from personal computer instead of internet

  hougland

  committed
  3214a29

Commits on Oct 28, 2015

• Merge pull request Ada-C4#20 from hougland/rlh/master

  Show description for 464eeb7
  Hamled

  committed
  464eeb7

• add root route in my-site.rb and indentation fixes

  yourFriendWes

  committed
  9a974d8

• Add wave 2 requirements

  kariabancroft

  committed
  66fc2c0

• Revert "Rlh/master"

  kariabancroft

  committed
  9747a9a

• Merge pull request Ada-C4#23 from Ada-C4/revert-20-rlh/master

  Show description for f3fdebe
  kariabancroft

  committed
  f3fdebe

• fix indentation in html

  yourFriendWes

  committed
  efe630b

• create empty css files for each page

  yourFriendWes

  committed
  bbb693a

• add links to stylesheets

  yourFriendWes

  committed
  69cffa4

• Merge remote-tracking branch 'upstream/master' into hrw/master

  yourFriendWes

  committed
  da8caa7

• add links in headers to stylesheets

  yourFriendWes

  committed
  d72f800

• fix more html indentations

  yourFriendWes

  committed
  8b02109

Commits on Oct 29, 2015

• add Raleway font to all files

  yourFriendWes

  committed
  55e432e

• add icons to footer

  yourFriendWes

  committed
  1ea2972

• add lorem ipsum content to blog

  yourFriendWes

  committed
  bbefc4c

• add social icons to all footers

  yourFriendWes

  committed
  1a0a8c8

Commits on Oct 30, 2015

• add id and class names to html elements

  yourFriendWes

  committed
  21a593a

• add layout.erb file, add copyright

  yourFriendWes

  committed
  aef95aa

• add repeating html into layout.erb file and delete from other files

  yourFriendWes

  committed
  2b51347

• fix link on project page

  yourFriendWes

  committed
  f85d485

• add formatting to about page and more images

  yourFriendWes

  committed
  4253465

• add instance variable for titles of pages

  yourFriendWes

  committed
  194d273

Commits on Nov 6, 2015

• Procfile for Heroku

  yourFriendWes

  committed
  2b7b834

• add stylesheet to make fontawesome work for heroku

  yourFriendWes

  committed
  409a3f1