Skip to content

Commit 24ef3eb

Browse files
Test against environment :production for middleman V4, set html characterset
1 parent e3d5eb2 commit 24ef3eb

4 files changed

Lines changed: 8 additions & 7 deletions

File tree

source/articles/index.html.haml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@ title: "TryRuby Articles"
55
.row
66
.col-sm-12
77
- blog.articles.each do |article|
8-
%h2= link_to article.title, "#{environment == :build ? '/TryRuby' : ''}#{article.url}"
8+
%h2= link_to article.title, "#{environment == :production ? '/TryRuby' : ''}#{article.url}"
99
%p= article.data.the_summary

source/index.html.markdown

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
title: "TryRuby: Learn programming with Ruby"
3-
description: Learn to program in Ruby in 15 minutes
3+
description: Learn to program in Ruby in 30 minutes
44
---
55

66
<div class="row">

source/layouts/_header.html.haml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
%nav.navbar.navbar-default.opal-nav(role="navigation")
22
.container
33
.navbar-header
4-
%a.navbar-brand(href="#{environment == :build ? '/TryRuby' : '/'}")
4+
%a.navbar-brand(href="#{environment == :production ? '/TryRuby' : '/'}")
55
TryRuby
66
%sup= 'R4'
77
%button.navbar-toggle(type="button" data-toggle="collapse" data-target="#opal-navbar")
@@ -12,14 +12,14 @@
1212
#opal-navbar.navbar-collapse.collapse
1313
%ul.nav.navbar-nav
1414
%li
15-
%a(href="#{environment == :build ? '/TryRuby/articles' : '/articles'}")
15+
%a(href="#{environment == :production ? '/TryRuby/articles' : '/articles'}")
1616
%span(class="glyphicon glyphicon-book" aria-hidden="true")
1717
Articles
1818
%li
19-
%a(href="#{environment == :build ? '/TryRuby/playground' : '/playground'}")
19+
%a(href="#{environment == :production ? '/TryRuby/playground' : '/playground'}")
2020
%span(class="glyphicon glyphicon-tower" aria-hidden="true")
2121
Playground
2222
%li
23-
%a(href="#{environment == :build ? '/TryRuby/about' : '/about'}")
23+
%a(href="#{environment == :production ? '/TryRuby/about' : '/about'}")
2424
%span(class="glyphicon glyphicon-info-sign" aria-hidden="true")
2525
About

source/layouts/layout.haml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
%html
33
%head
44
%meta{:name => "viewport", :content => "width=device-width, initial-scale=1.0, maximum-scale=1.0 user-scalable=no"}
5-
%meta{:name => "charset", :content => "utf-8"}
5+
%meta{:content => "text/html; charset=UTF-8", "http-equiv" => "Content-Type"}
6+
67
%title= current_page.data.title || 'TryRuby'
78
%meta{:name => "description", :content => "#{current_page.data.description || 'Learn programming with Ruby'}"}
89

0 commit comments

Comments
 (0)