diff --git a/my-site.rb b/my-site.rb
index f4325a3..b0f689b 100644
--- a/my-site.rb
+++ b/my-site.rb
@@ -2,19 +2,32 @@
class MySite < Sinatra::Base
+ get "/" do
+ erb :index
+ end
+
get "/index.html" do
+ @h1 = "Welcome to Meighs' Page"
+ @h4 = "A website all about me, mine, and myself."
erb :index
end
get "/about.html" do
+ @h1 = "About Meighan"
+ @h4 = "Here's some stuff you should know about me..."
+ @days_at_ada = (Date.today - Date.parse("2015-09-22")).to_i
erb :about
end
get "/blog.html" do
+ @h1 = "Meighan's Blog"
+ @h4 = "A few things I have to say..."
erb :blog
end
get "/projects.html" do
+ @h1 = "Meighan's Projects"
+ @h4 = "A few things I've been tinkering around with..."
erb :projects
end
end
diff --git a/public/1446260371_mail.png b/public/1446260371_mail.png
new file mode 100644
index 0000000..9fd1a76
Binary files /dev/null and b/public/1446260371_mail.png differ
diff --git a/public/clover.ico b/public/clover.ico
new file mode 100644
index 0000000..929d762
Binary files /dev/null and b/public/clover.ico differ
diff --git a/public/css/style.css b/public/css/style.css
new file mode 100644
index 0000000..8add27c
--- /dev/null
+++ b/public/css/style.css
@@ -0,0 +1,110 @@
+body {
+ margin: 0 auto;
+ width: 960px;
+ font-family: 'Montserrat' sans-serif;
+}
+
+header {
+ text-align: center;
+ color: #333333;
+ background-color: #679CBE;
+ padding-bottom: 5px;
+}
+
+h1 {
+ margin: 0;
+}
+
+h4 {
+ font-style: italic;
+}
+
+#copyleft {
+ text-align: left;
+ font-size: 9px;
+}
+
+#pblog {
+ text-align: left;
+}
+
+div {
+ text-align: center;
+ margin: 45px auto;
+}
+
+#image1 {
+ height: 150px;
+ width: 200px;
+}
+
+#image2 {
+ height: 150px;
+ width: 100px;
+}
+
+.image3 {
+ height: 200px;
+ width: 150px;
+}
+
+table {
+ text-align: center;
+ margin: 45px auto;
+}
+
+nav {
+ text-align: center;
+ padding-top: 10px;
+}
+
+footer {
+ text-align: center;
+ color: #333333;
+ background-color: #679CBE;
+ padding-top: 5px;
+}
+
+ul {
+ list-style: none;
+ text-align: center;
+}
+#ada {
+ width: 200px;
+ height: 100px;
+}
+
+#fiona {
+ width: 150px;
+ height: 100px;
+}
+
+.dwsh {
+ width: 100px;
+ height: 100px;
+}
+
+img:hover {
+ -webkit-filter: grayscale(100%);
+ -webkit-transition: .5s ease-in-out;
+ transform: scale(1.1);
+}
+
+#mainheader {
+ padding-bottom: 10px;
+ font-size: 20px;
+}
+.bheader {
+ border-bottom: 1px solid black;
+ padding-bottom: 5px;
+}
+
+td {
+ padding-top: 10px;
+}
+
+#daycount {
+ font-size: 12px;
+ text-align: center;
+ margin: 0;
+}
diff --git a/public/shamrock-1.ico b/public/shamrock-1.ico
new file mode 100644
index 0000000..e5c047a
Binary files /dev/null and b/public/shamrock-1.ico differ
diff --git a/views/about.erb b/views/about.erb
index 3eb61b5..1dabf80 100644
--- a/views/about.erb
+++ b/views/about.erb
@@ -1,60 +1,36 @@
-
-
- "Meighs' Page"
-
+
+
- Main Page
- My Projects
- My Blog
- About Me
-
-
- Attend Ada Developers' Academy
- A companion of the Doctor
- Seattle Seahawks fan
- Have a puppy dog named Fiona
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Feel free to contact me!
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/views/blog.erb b/views/blog.erb
index 082886f..87c196c 100644
--- a/views/blog.erb
+++ b/views/blog.erb
@@ -1,38 +1,9 @@
-
- "Meighs' Page"
-
+
+
- Blogging to be blogging
- October 26th, 2015
- Rain, rain go away, come again another day. JK! I missed you... I can now officially get into the Fall spirit. Did you enjoy your vacation? Where did you wander off to this time? I heard you made a pit stop in South Carolina. Got relatives there? Anyway, hope you stick around for a bit.
-
-
-
- Feel free to contact me!
-
+
+ Rainy Day Blog
+ October 26th, 2015
+ Rain, rain go away, come again another day. JK! I missed you... I can now officially get into the Fall spirit. Did you enjoy your vacation? Where did you wander off to this time? I heard you made a pit stop in South Carolina. Got relatives there? Anyway, hope you stick around for a bit.
+
diff --git a/views/index.erb b/views/index.erb
index cf442f7..24ad7db 100644
--- a/views/index.erb
+++ b/views/index.erb
@@ -1,35 +1,3 @@
-
-
- "Meighs' Page"
-
- Feel free to contact me!
-
-
-
+
+
+
Meighs' Page
+
+
+ <%= @h1 %>
+ <%= @h4 %>
+
+
+ Home |
+ Projects |
+ Blog |
+ About
+
+ <%= yield %>
+
+
+
diff --git a/views/projects.erb b/views/projects.erb
index d67148c..3712e8c 100644
--- a/views/projects.erb
+++ b/views/projects.erb
@@ -1,88 +1,59 @@
-
- "Meighs' Page"
-
+
+
-
-
-
-
- Current Projects
-
-
-
-
- Title
-
-
- Description
-
-
- Date Started
-
-
-
-
-
- Code Carrots 2.0
-
-
- Report It App
-
-
- April 2015
-
-
+
+
+
-
- Declutter
-
-
- Remove unwanted household items
-
-
- Eons ago
-
+
+ Current Projects
+
-
- This website
-
-
- Class project
-
-
- Today
-
+
+
+
-
-
-
- Feel free to contact me!
-
+
+
+
+ Code Carrots 2.0
+
+
+ Report It App
+
+
+ April 2015
+
+
+
+
+ Declutter
+
+
+ Remove unwanted household items
+
+
+ Eons ago
+
+
+
+
+ This website
+
+
+ Class project
+
+
+ Today
+
+
+
+
- 
- 
- 
- 
- 
- 
- 
-