mirror of
https://github.com/Shopify/liquid.git
synced 2026-09-17 01:40:42 -07:00
Fixed conflicts
This commit is contained in:
Tetsuro
+11
-18
@@ -1,28 +1,21 @@
|
||||
title: Liquid Templating Engine
|
||||
description: "Liquid is a template language and accompanying rendering engine. It is built for security, so is perfect for rendering custom templates from your users."
|
||||
|
||||
# Build settings
|
||||
baseurl: "" # the subpath of your site, e.g. /blog/
|
||||
url: "http://liquidmarkup.org" # the base hostname & protocol for your site
|
||||
markdown: kramdown
|
||||
highlighter: pygments
|
||||
permalink: /:year/:month/:day/:basename:output_ext
|
||||
baseurl: "" # the subpath of your site, e.g. /blog/
|
||||
url: http://liquidmarkup.org # the base hostname & protocol for your site
|
||||
markdown: kramdown
|
||||
highlighter: pygments
|
||||
permalink: pretty
|
||||
exclude:
|
||||
- README.md
|
||||
- CNAME
|
||||
- node_modules
|
||||
keep_files: ['css']
|
||||
keep_files: ['css']
|
||||
|
||||
# Front matter defaults
|
||||
defaults:
|
||||
- scope:
|
||||
path: "" # an empty string here means all files in the project
|
||||
values:
|
||||
layout: "default"
|
||||
- scope:
|
||||
path: "basics"
|
||||
values:
|
||||
type: "basics"
|
||||
- scope:
|
||||
path: "filters"
|
||||
values:
|
||||
type: "filters"
|
||||
- scope:
|
||||
path: "tags"
|
||||
values:
|
||||
type: "tags"
|
||||
|
||||
@@ -1,6 +0,0 @@
|
||||
# Site settings
|
||||
title: Liquid Templating Engine
|
||||
description: > # this means to ignore newlines until "baseurl:"
|
||||
Liquid is a template language and accompanying rendering engine.
|
||||
It is built for security, so is perfect for rendering custom
|
||||
templates from your users.
|
||||
@@ -0,0 +1,28 @@
|
||||
<div class="sidebar">
|
||||
<div class="sidebar--logo">
|
||||
<a href="/">Liquid</a>
|
||||
</div>
|
||||
<nav class="sidebar--nav">
|
||||
|
||||
{% capture folders %}basics,tags,filters{% endcapture %}
|
||||
{% assign sections = folders | split: "," %}
|
||||
|
||||
{% for section in sections %}
|
||||
<ul class="section">
|
||||
<li>
|
||||
<h3 class="section__header">{{ section | capitalize }}</h3>
|
||||
<ul class="section__links">
|
||||
{% for page in site.pages %}
|
||||
{% if page.path contains section/ %}
|
||||
{% unless page.path contains "index.html" %}
|
||||
<li><a href="{{ page.url | prepend: site.baseurl }}" class="section__link">{{ page.title }}</a></li>
|
||||
{% endunless %}
|
||||
{% endif %}
|
||||
{% endfor %}
|
||||
</ul>
|
||||
</li>
|
||||
</ul>
|
||||
{% endfor %}
|
||||
|
||||
</nav>
|
||||
</div>
|
||||
+3
-64
@@ -1,12 +1,12 @@
|
||||
<!DOCTYPE html>
|
||||
<html>
|
||||
<head>
|
||||
<title>{% if page.title %}{{ page.title }} – {% endif %}{{ site.data.site.title }}</title>
|
||||
<title>{% if page.title %}{{ page.title }} – {% endif %}{{ site.title }}</title>
|
||||
|
||||
<meta charset="utf-8">
|
||||
<meta http-equiv="X-UA-Compatible" content="IE=edge">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||
<meta name="description" content="{% if page.excerpt %}{{ page.excerpt | strip_html | strip_newlines | truncate: 160 }}{% else %}{{ site.data.site.description }}{% endif %}">
|
||||
<meta name="description" content="{% if page.excerpt %}{{ page.excerpt | strip_html | strip_newlines | truncate: 160 }}{% else %}{{ site.description }}{% endif %}">
|
||||
|
||||
<link rel="stylesheet" href="{{ '/css/main.css' | prepend: site.baseurl }}">
|
||||
<link href='http://fonts.googleapis.com/css?family=Droid+Sans:400,700' rel='stylesheet' type='text/css'>
|
||||
@@ -16,68 +16,7 @@
|
||||
</head>
|
||||
|
||||
<body>
|
||||
<div class="sidebar">
|
||||
<div class="sidebar--logo">
|
||||
<a href="/">Liquid</a>
|
||||
</div>
|
||||
<nav class="sidebar--nav">
|
||||
|
||||
<!-- Basics -->
|
||||
<ul class="section">
|
||||
<li>
|
||||
<h3 class="section__header">Basics</h3>
|
||||
<ul class="section__links">
|
||||
{% for doc in site.pages %}
|
||||
{% if doc.type == "basics" %}
|
||||
{% unless doc.path contains "index.html" %}
|
||||
<li>
|
||||
<a href="/{{ doc.type }}/{{ doc.title | slugify }}" class="section__link">{{ doc.title }}</a>
|
||||
</li>
|
||||
{% endunless %}
|
||||
{% endif %}
|
||||
{% endfor %}
|
||||
</ul>
|
||||
</li>
|
||||
</ul>
|
||||
|
||||
<!-- Tags -->
|
||||
<ul class="section">
|
||||
<li>
|
||||
<h3 class="section__header">Tags</h3>
|
||||
<ul class="section__links">
|
||||
{% for doc in site.pages %}
|
||||
{% if doc.type == "tags" %}
|
||||
{% unless doc.path contains "index.html" %}
|
||||
<li>
|
||||
<a href="/{{ doc.type }}/{{ doc.title | slugify }}" class="section__link">{{ doc.title }}</a>
|
||||
</li>
|
||||
{% endunless %}
|
||||
{% endif %}
|
||||
{% endfor %}
|
||||
</ul>
|
||||
</li>
|
||||
</ul>
|
||||
|
||||
<!-- Filters -->
|
||||
<ul class="section">
|
||||
<li>
|
||||
<h3 class="section__header">Filters</h3>
|
||||
<ul class="section__links">
|
||||
{% for doc in site.pages %}
|
||||
{% if doc.type == "filters" %}
|
||||
{% unless doc.path contains "index.html" %}
|
||||
<li>
|
||||
<a href="/{{ doc.type }}/{{ doc.title | slugify }}" class="section__link">{{ doc.title }}</a>
|
||||
</li>
|
||||
{% endunless %}
|
||||
{% endif %}
|
||||
{% endfor %}
|
||||
</ul>
|
||||
</li>
|
||||
</ul>
|
||||
|
||||
</nav>
|
||||
</div>
|
||||
{% include sidebar.html %}
|
||||
|
||||
<div class="content__area">
|
||||
<div class="content__list">
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
---
|
||||
title: Truthy and Falsy
|
||||
title: Truthy and falsy
|
||||
---
|
||||
|
||||
In programming, anything that returns `true` in a conditional is called **truthy**. Anything that returns `false` in a conditional is called **falsy**. All object types can be described as either truthy or falsy.
|
||||
|
||||
@@ -4,8 +4,8 @@ layout: null
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom">
|
||||
<channel>
|
||||
<title>{{ site.data.site.title | xml_escape }}</title>
|
||||
<description>{{ site.data.site.description | xml_escape }}</description>
|
||||
<title>{{ site.title | xml_escape }}</title>
|
||||
<description>{{ site.description | xml_escape }}</description>
|
||||
<link>{{ site.url }}{{ site.baseurl }}/</link>
|
||||
<atom:link href="{{ "/feed.xml" | prepend: site.baseurl | prepend: site.url }}" rel="self" type="application/rss+xml"/>
|
||||
<pubDate>{{ site.time | date_to_rfc822 }}</pubDate>
|
||||
|
||||
@@ -4,7 +4,7 @@ layout: default
|
||||
|
||||
{% include home-banner.html %}
|
||||
|
||||
Liquid is an open-source template language created by [Shopify](https://www.shopify.com) and written in Ruby. It is the backbone of Shopify themes and is used to load dynamic content on storefronts. Liquid is also used in static site genrators like [Jekyll](http://jekyllrb.com).
|
||||
Liquid is an open-source template language created by [Shopify](https://www.shopify.com) and written in Ruby. It is the backbone of Shopify themes and is used to load dynamic content on storefronts. Liquid is also used in static site generators like [Jekyll](http://jekyllrb.com).
|
||||
|
||||
Liquid has been in production use since June 2006 and is now used by many other hosted web applications.
|
||||
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
---
|
||||
title: Control Flow
|
||||
---
|
||||
|
||||
title: Control flow
|
||||
|
||||
## case/when
|
||||
|
||||
|
||||
Reference in New Issue
Block a user