Update gems and other idle changes

sturmer · Jan 29, 2023 · 455255b · 455255b
1 parent b6931db
commit 455255b
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 20 deletions.
diff --git a/Gemfile b/Gemfile
@@ -6,5 +6,6 @@ group :nanoc do
   gem 'nanoc', '~> 4.12'
   gem 'nanoc-live'
   gem 'nokogiri', '~> 1.13.6'
+  gem 'pry'
   gem 'rouge'
 end
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -11,6 +11,7 @@ GEM
       eventmachine (~> 1.2)
       listen (~> 3.0)
       rack-livereload (~> 0.3)
+    coderay (1.1.3)
     colored (1.2)
     concurrent-ruby (1.2.0)
     cri (2.15.11)
@@ -32,6 +33,7 @@ GEM
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     memo_wise (1.7.0)
+    method_source (1.0.0)
     mini_portile2 (2.8.0)
     nanoc (4.12.14)
       addressable (~> 2.5)
@@ -79,6 +81,9 @@ GEM
     parallel (1.22.1)
     pastel (0.8.0)
       tty-color (~> 0.5)
+    pry (0.14.2)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
     psych (4.0.6)
       stringio
     public_suffix (5.0.1)
@@ -110,6 +115,7 @@ DEPENDENCIES
   nanoc (~> 4.12)
   nanoc-live
   nokogiri (~> 1.13.6)
+  pry
   rouge
 
 BUNDLED WITH

diff --git a/Rules b/Rules
@@ -35,33 +35,34 @@ compile '/reviews.md' do
   write item.identifier.without_ext + '/index.html'
 end
 
-compile '/reviews/*.md' do
+compile '/songs_to_the_stone.md' do
   filter :kramdown
-  layout '/review.html'
+  layout '/songs_to_the_stone.*'
+
   write item.identifier.without_ext + '/index.html'
 end
 
-compile '/songs_to_the_stone/*.md' do
+compile '/storie.md' do
   filter :kramdown
-  layout '/song_layout.*'
+  layout '/story_list.*'
 
   write item.identifier.without_ext + '/index.html'
 end
 
-compile '/songs_to_the_stone.md' do
+compile '/reviews/*.md' do
   filter :kramdown
-  layout '/songs_to_the_stone.*'
-
+  layout '/review.html'
   write item.identifier.without_ext + '/index.html'
 end
 
-compile '/storie.md' do
+compile '/songs_to_the_stone/*.md' do
   filter :kramdown
-  layout '/story_list.*'
+  layout '/song_layout.*'
 
   write item.identifier.without_ext + '/index.html'
 end
 
+
 compile '/**/*.md' do
   filter :kramdown
   layout '/default.*'

diff --git a/layouts/story_list.html b/layouts/story_list.html
@@ -1,20 +1,22 @@
 <%= render '/partials/head.*' %>
-  <body>
-    <div id="main">
-      <h1><%= @item[:title] %></h1>
 
-			<%= yield %>
+<body>
+<div id="main">
+    <h1><%= @item[:title] %></h1>
 
-      <ul class="catalog">
+    <%= yield %>
+
+    <ul class="catalog">
         <% sorted_articles.each do |story| %>
         <li>
-	        <%= link_to story[:title], story.path %> (<%= story[:created_at] %>)
+            <%= link_to story[:title], story.path %> (<%= story[:created_at] %>)
         </li>
         <% end %>
-      </ul>
-      <%= render '/partials/footer.*' %>
-    </div>
+    </ul>
+    <%= render '/partials/footer.*' %>
+</div>
+
+<%= render '/partials/sidebar.*' %>
+</body>
 
-    <%= render '/partials/sidebar.*' %>
-  </body>
 </html>