summaryrefslogtreecommitdiff
path: root/source/layouts
diff options
context:
space:
mode:
authorLars Henrik Mai <lars.mai@kontinui.de>2014-09-21 11:57:48 +0200
committerLars Henrik Mai <lars.mai@kontinui.de>2014-09-21 11:57:48 +0200
commit33fe06d9edd5bc3a637e5b0e5f979dbced8f95d0 (patch)
tree5d8370d7dd2f0ecae9de7b35fb7d952e841b4e0b /source/layouts
parent35239fc1f4641db1e602383b43cc29b151cde9b9 (diff)
parentf3100ad9d93fd31a043594815e260958f5ceaff0 (diff)
Merge branch 'convert-templates-to-haml' into next-tech-1
Diffstat (limited to 'source/layouts')
-rw-r--r--source/layouts/layout.erb45
-rw-r--r--source/layouts/layout.haml25
2 files changed, 25 insertions, 45 deletions
diff --git a/source/layouts/layout.erb b/source/layouts/layout.erb
deleted file mode 100644
index 030e78c..0000000
--- a/source/layouts/layout.erb
+++ /dev/null
@@ -1,45 +0,0 @@
-<!doctype html>
-<html>
- <head>
- <meta charset="utf-8">
-
- <!-- Always force latest IE rendering engine or request Chrome Frame -->
- <meta content="IE=edge,chrome=1" http-equiv="X-UA-Compatible">
-
- <!-- For proper display on mobile -->
- <meta name="viewport" content="width=device-width, initial-scale=1">
-
- <!-- Use title if it's in the page YAML frontmatter -->
- <title><%= current_page.data.title || "sublab" %></title>
-
- <%= stylesheet_link_tag "base" %>
- <%#= stylesheet_link_tag "http://localhost:9393/status.css" %>
-
- <%= javascript_include_tag "all"%>
- </head>
-
- <body class="<%= page_classes %>">
-
- <!-- header -->
- <header>
- <div id="logo">
- <% link_to '/index.html' do %>
- <%= image_tag 'sublab-logo.png', class: "img-responsive" %>
- <% end %>
- </div>
- </header>
-
- <!-- main navigation -->
- <nav>
- <%= partial "navigation" %>
- </nav>
-
- <!-- content -->
- <div id="content">
- <section id="main">
- <%= yield %>
- </section>
- </div>
-
- </body>
-</html>
diff --git a/source/layouts/layout.haml b/source/layouts/layout.haml
new file mode 100644
index 0000000..53cf1ae
--- /dev/null
+++ b/source/layouts/layout.haml
@@ -0,0 +1,25 @@
+<!doctype html>
+%html
+ %head
+ %meta{:charset => "utf-8"}/
+ / Always force latest IE rendering engine or request Chrome Frame
+ %meta{:content => "IE=edge,chrome=1", "http-equiv" => "X-UA-Compatible"}/
+ / For proper display on mobile
+ %meta{:content => "width=device-width, initial-scale=1", :name => "viewport"}/
+ / Use title if it's in the page YAML frontmatter
+ %title= current_page.data.title || "sublab"
+ = stylesheet_link_tag "base"
+ = javascript_include_tag "all"
+ %body{:class => page_classes}
+ / header
+ %header
+ #logo
+ - link_to '/index.html' do
+ = image_tag 'sublab-logo.png', class: "img-responsive"
+ / main navigation
+ %nav
+ = partial "navigation"
+ / content
+ #content
+ %section#main
+ = yield