Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
source 'https://rubygems.org'
source "https://rubygems.org"

gem 'middleman', '~> 4.5'
gem 'middleman-autoprefixer', '~> 3.0'
gem 'terser', '~> 1.1'
gem 'tzinfo-data', platforms: [:mswin, :mingw, :jruby, :x64_mingw]
gem 'wdm', '~> 0.1', platforms: [:mswin, :mingw, :x64_mingw]
gem "middleman", "~> 4.5"
gem "middleman-autoprefixer", "~> 3.0"
gem "terser", "~> 1.1"
gem "tzinfo-data", platforms: [:mswin, :mingw, :jruby, :x64_mingw]
gem "wdm", "~> 0.1", platforms: [:mswin, :mingw, :x64_mingw]

group :development, :test do
gem "rubydex", require: false
Expand Down
6 changes: 3 additions & 3 deletions config.rb
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
# https://middlemanapp.com/basics/layouts/

# Per-page layout changes
page '/*.xml', layout: false
page '/*.json', layout: false
page '/*.txt', layout: false
page "/*.xml", layout: false
page "/*.json", layout: false
page "/*.txt", layout: false

# With alternative layout
# page '/path/to/file.html', layout: 'other_layout'
Expand Down
4 changes: 4 additions & 0 deletions source/blog/index.html.erb
Original file line number Diff line number Diff line change
@@ -1 +1,5 @@
---
title: "Blog"
---

<h1>Blog</h1>
Binary file added source/fonts/bootstrap-icons.woff
Binary file not shown.
Binary file added source/fonts/bootstrap-icons.woff2
Binary file not shown.
22 changes: 2 additions & 20 deletions source/index.html.erb
Original file line number Diff line number Diff line change
@@ -1,23 +1,5 @@
---
title: Welcome to Middleman
title: Welcome!
---

<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 400 340" class="middleman-logo" aria-labelledby="middleman-logo__title" role="img">
<title id="middleman-logo__title">Middleman</title>
<path class="middleman-logo__top-left-bar" fill-opacity=".45" d="M0 40L200 0v30L0 60z"/>
<path class="middleman-logo__top-right-bar" fill="#fff" d="M200 0l200 40v20L200 30z"/>
<path class="middleman-logo__left-m" fill-opacity=".45" d="M0 78v184l45 5V152l45 83 47-83v129l53 7V52l-57 8-43 83-43-70z"/>
<path class="middleman-logo__right-m" fill="#fff" d="M400 78v184l-45 5V152l-45 83-47-83v129l-53 7V52l57 8 43 83 43-70z"/>
<path class="middleman-logo__bottom-left-bar" fill-opacity=".45" d="M0 300l200 40v-30L0 280z"/>
<path class="middleman-logo__bottom-right-bar" fill="#fff" d="M200 340l200-40v-20l-200 30z"/>
</svg>

<h1>
Middleman is Running
</h1>

<%= link_to(
"Read Documentation",
"https://middlemanapp.com/basics/templating_language/",
target: "_blank"
) %>
<h1>Errbit</h1>
1 change: 0 additions & 1 deletion source/javascripts/site.js

This file was deleted.

13 changes: 9 additions & 4 deletions source/layouts/layout.erb
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,15 @@
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1">

<!-- Use the title from a page's frontmatter if it has one -->
<title><%= current_page.data.title || "Middleman" %></title>
<%= stylesheet_link_tag "site" %>
<%= javascript_include_tag "site" %>
<title>
<% if current_page.data.title.present? %>
<%= current_page.data.title %> | Errbit
Comment thread
biow0lf marked this conversation as resolved.
<% else %>
Errbit
<% end %>
</title>
<%= stylesheet_link_tag "bootstrap" %>
<%= javascript_include_tag "bootstrap.bundle", defer: true %>
</head>

<body>
Expand Down
4 changes: 4 additions & 0 deletions source/release_notes/index.html.erb
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
---
title: "Release notes"
---

<h1>Release notes</h1>

<%= link_to "About", "" %>
6 changes: 4 additions & 2 deletions source/release_notes/v0.11.0.html.erb
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
Aloha
---
title: "Release notes for v0.11.0"
---

<%= Time.now %>
<h1>Release notes for v0.11.0</h1>
24 changes: 0 additions & 24 deletions source/stylesheets/site.css.scss

This file was deleted.