4 files changed, 92 insertions, 3 deletions

@@ -16,6 +16,8 @@
  */
 
 @import url('https://fonts.googleapis.com/css?family=Inconsolata');
+@import url('https://fonts.googleapis.com/css?family=Slabo+27px');
+@import url('https://fonts.googleapis.com/css?family=Roboto:400,700');
 
 body#main-body {
   background-color: #bfefff;
@@ -207,3 +209,17 @@ body#userdata-body {
 .sidebar-module a:visited {
   color: #352712;
 }
+
+.breadcrumb {
+  margin-left: 1em;
+
+  a, a:visited {
+    color: #555d66;
+    text-decoration: none;
+    font-size: .75em;
+  }
+
+  a:hover {
+    text-decoration: underline;
+  }
+}
@@ -1,3 +1,57 @@
 // Place all the styles related to the Entries controller here.
 // They will automatically be included in application.css.
 // You can use Sass (SCSS) here: http://sass-lang.com/
+
+#blog-post {
+  font-size: 16px;
+  line-height: 24px;
+  margin: 0 3em;
+
+  h2 {
+    font-size: 45px;
+    line-height: 48px;
+    margin-top: .5em;
+  }
+
+  h3 {
+    font-size: 37px;
+    line-height: 42px;
+  }
+
+  h2, h3 {
+    font-family: 'Slabo 27px', serif;
+    margin-bottom: 0;
+    font-weight: normal;
+  }
+
+  #blog-content {
+    hyphens: auto;
+    word-wrap: break-word;
+    font-family: 'Roboto', sans-serif;
+    text-align: justify;
+
+    a {
+      text-decoration: none;
+      font-weight: bold;
+
+      &, &:visited {
+        color: #ee2c2c;
+      }
+
+      &:hover {
+        text-decoration: underline;
+        color: #9ea1ad;
+      }
+    }
+
+    li {
+      & + li {
+        margin-top: 1em;
+      }
+    }
+
+    img {
+      max-width: 100%;
+    }
+  }
+}
@@ -1,7 +1,26 @@
 class EntriesController < ApplicationController
+  before_action :authenticate_user!, only: [:edit, :update]
 
   def show
-    @entry = Entry.where(directory: params[:directory], slug: params[:slug]).first
+    @entry = Entry.where(slug: params[:slug]).first
   end
 
+  def edit
+    @entry = Entry.where(slug: params[:slug]).first
+  end
+
+  def update
+    @entry = Entry.where(slug: params[:slug]).first
+
+    if @entry.update_attributes(entry_params)
+      flash.notice = ""
+    end
+  end
+
+  private
+
+    def entry_params
+      params.require(:blog).permit(:title, :body, :slug)
+    end
+
 end
@@ -1,2 +1,2 @@
-<h1>Entries#show</h1>
-<p>Find me in app/views/entries/show.html.erb</p>
+.breadcrumb= link_to "← Back to home page", root_path
+= render @entry