deac/middleman
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

merge more into core, use gem availability to autoload

Browse source
This commit is contained in:
Thomas Reynolds 2013-05-08 11:37:55 -07:00
parent 27a9fa98f7
commit 9ebddeed1d
476 changed files with 81 additions and 141 deletions
Download patch file Download diff file Expand all files Collapse all files

7
middleman-core/fixtures/nested-layout-app/source/another.html.markdown Normal file
View file

@ -0,0 +1,7 @@
---
title: "New Article Title"
date: 2011-01-01
layout: inner
---
The Article Content

5
middleman-core/fixtures/nested-layout-app/source/data-one.html.erb Normal file
View file

@ -0,0 +1,5 @@
---
title: Page Number One
layout: inner
---
Page #1

5
middleman-core/fixtures/nested-layout-app/source/data-two.html.erb Normal file
View file

@ -0,0 +1,5 @@
---
title: Page Number Two
layout: outer
---
Page #2

7
middleman-core/fixtures/nested-layout-app/source/haml-test.html.markdown Normal file
View file

@ -0,0 +1,7 @@
---
title: "New Article Title"
date: 2011-01-01
layout: inner_haml
---
The Article Content

6
middleman-core/fixtures/nested-layout-app/source/index.html.erb Normal file
View file

@ -0,0 +1,6 @@
---
title: "Index Title"
layout: inner
---
Template

4
middleman-core/fixtures/nested-layout-app/source/layouts/inner.erb Normal file
View file

@ -0,0 +1,4 @@
<% wrap_layout :outer do %>
Inner
<%= yield %>
<% end %>

3
middleman-core/fixtures/nested-layout-app/source/layouts/inner_haml.haml Normal file
View file

@ -0,0 +1,3 @@
- wrap_layout :outer_haml do
Inner
= yield

3
middleman-core/fixtures/nested-layout-app/source/layouts/inner_slim.slim Normal file
View file

@ -0,0 +1,3 @@
- wrap_layout :outer_slim do
h3 Inner
== yield

3
middleman-core/fixtures/nested-layout-app/source/layouts/master.erb Normal file
View file

@ -0,0 +1,3 @@
Master
<h1><%= data.page.title %></h1>
<%= yield %>

3
middleman-core/fixtures/nested-layout-app/source/layouts/master_haml.haml Normal file
View file

@ -0,0 +1,3 @@
Master
%h1= data.page.title
= yield

3
middleman-core/fixtures/nested-layout-app/source/layouts/master_slim.slim Normal file
View file

@ -0,0 +1,3 @@
h1 Master
p== data.page.title
div== yield

4
middleman-core/fixtures/nested-layout-app/source/layouts/outer.erb Normal file
View file

@ -0,0 +1,4 @@
<% wrap_layout :master do %>
Outer
<%= yield %>
<% end %>

3
middleman-core/fixtures/nested-layout-app/source/layouts/outer_haml.haml Normal file
View file

@ -0,0 +1,3 @@
- wrap_layout :master_haml do
Outer
= yield

3
middleman-core/fixtures/nested-layout-app/source/layouts/outer_slim.slim Normal file
View file

@ -0,0 +1,3 @@
- wrap_layout :master_slim do
h2 Outer
== yield

7
middleman-core/fixtures/nested-layout-app/source/slim-test.html.markdown Normal file
View file

@ -0,0 +1,7 @@
---
title: "New Article Title"
date: 2011-01-01
layout: inner_slim
---
The Article Content