Labyricorn/liquid
1
0
Fork 0
mirror of https://github.com/Shopify/liquid.git synced 2026-09-29 07:05:12 -07:00
Code Issues Packages Projects Releases Wiki Activity

Fixed conflicts

Browse Source
This commit is contained in:
Tetsuro
2015-12-04 21:35:11 -05:00
parent 6bf836b719 1ce90ed355
commit 6ef9c176dd
8 changed files with 48 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files
_config.yml
+11 -18
View File
@@ -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 # Build settings
baseurl: "" # the subpath of your site, e.g. /blog/ baseurl: "" # the subpath of your site, e.g. /blog/
url: "http://liquidmarkup.org" # the base hostname & protocol for your site url: http://liquidmarkup.org # the base hostname & protocol for your site
markdown: kramdown markdown: kramdown
highlighter: pygments highlighter: pygments
permalink: /:year/:month/:day/:basename:output_ext permalink: pretty
exclude: exclude:
- README.md - README.md
- CNAME - CNAME
- node_modules - node_modules
keep_files: ['css'] keep_files: ['css']
# Front matter defaults
defaults: defaults:
- scope: - scope:
path: "" # an empty string here means all files in the project path: "" # an empty string here means all files in the project
values: values:
layout: "default" layout: "default"
- scope:
path: "basics"
values:
type: "basics"
- scope:
path: "filters"
values:
type: "filters"
- scope:
path: "tags"
values:
type: "tags"
_data/site.yml
-6
View File
@@ -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.
_includes/sidebar.html
+28
View File
@@ -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>
_layouts/default.html
+3 -64
View File
@@ -1,12 +1,12 @@
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<head> <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 charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge"> <meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1"> <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 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'> <link href='http://fonts.googleapis.com/css?family=Droid+Sans:400,700' rel='stylesheet' type='text/css'>
@@ -16,68 +16,7 @@
</head> </head>
<body> <body>
<div class="sidebar"> {% include sidebar.html %}
<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>
<div class="content__area"> <div class="content__area">
<div class="content__list"> <div class="content__list">
basics/truthy-and-falsy.md
+1 -1
View File
@@ -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. 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.
feed.xml
+2 -2
View File
@@ -4,8 +4,8 @@ layout: null
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom"> <rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom">
<channel> <channel>
<title>{{ site.data.site.title | xml_escape }}</title> <title>{{ site.title | xml_escape }}</title>
<description>{{ site.data.site.description | xml_escape }}</description> <description>{{ site.description | xml_escape }}</description>
<link>{{ site.url }}{{ site.baseurl }}/</link> <link>{{ site.url }}{{ site.baseurl }}/</link>
<atom:link href="{{ "/feed.xml" | prepend: site.baseurl | prepend: site.url }}" rel="self" type="application/rss+xml"/> <atom:link href="{{ "/feed.xml" | prepend: site.baseurl | prepend: site.url }}" rel="self" type="application/rss+xml"/>
<pubDate>{{ site.time | date_to_rfc822 }}</pubDate> <pubDate>{{ site.time | date_to_rfc822 }}</pubDate>
index.md
+1 -1
View File
@@ -4,7 +4,7 @@ layout: default
{% include home-banner.html %} {% 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. Liquid has been in production use since June 2006 and is now used by many other hosted web applications.
tags/control-flow.md
+2 -3
View File
@@ -1,6 +1,5 @@
---
title: Control Flow title: Control flow
---
## case/when ## case/when