libretic/grav-theme-libretic
6
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'release/1.5.0'

Browse source
This commit is contained in:
Flavio Copes 2016-07-14 17:56:46 +02:00
commit 0bdbcf47f1
15 changed files with 33 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.gitignore vendored
View file

@ -1 +1,3 @@
.sass-cache .sass-cache
.DS_Store

12
CHANGELOG.md
View file

@ -1,3 +1,15 @@
# v1.5.0
## 07/14/2016
1. [](#improved)
* Remove unneeded streams from Theme YAML
* Delete unused composer.json
* Add the `theme_config` twig var
1. [](#bugfix)
* Fix missing fontawesome-webfont.woff2 file
* Fix slider buttons on tablet
* Fix setting the page language in the html tag
# v1.4.0 # v1.4.0
## 01/06/2016 ## 01/06/2016

2
blueprints.yaml
View file

@ -1,5 +1,5 @@
name: Deliver name: Deliver
version: 1.4.0 version: 1.5.0
description: "Deliver theme is a port of the Michael Reimer's Deliver Free PSD theme." description: "Deliver theme is a port of the Michael Reimer's Deliver Free PSD theme."
icon: newspaper-o icon: newspaper-o
author: author:

28
composer.json
View file

@ -1,28 +0,0 @@
{
"name": "getgrav/grav-theme-deliver",
"type": "grav-theme",
"description": "Deliver theme is a port of the Michael Reimer's Deliver Free PSD theme.",
"keywords": ["theme","grav", "deliver"],
"homepage": "http://getgrav.org",
"license": "MIT",
"support": {
"irc": "irc://irc.freenode.org/grav"
},
"authors": [
{
"name": "Team Grav",
"email": "devs@getgrav.org",
"homepage": "http://getgrav.org"
}
],
"require": {
"php": ">=5.4.0",
"composer/installers": "~1.0"
},
"extra": {
"installer-name": "deliver",
"installer-paths": {
"user/themes/{$name}/": ["getgrav/grav-theme-deliver"]
}
}
}

6
css-compiled/template.css
View file

@ -1081,8 +1081,10 @@ ul.pagination {
.modular .slideme_container .arrow { .modular .slideme_container .arrow {
position: absolute; position: absolute;
display: block; display: block;
width: 3.7rem; padding-bottom: 0;
height: 3.7rem; padding-left: 0.8rem;
padding-right: 0.8rem;
padding-top: 0;
cursor: pointer; cursor: pointer;
z-index: 50; z-index: 50;
text-align: center; text-align: center;

2
css-compiled/template.css.map
View file

File diff suppressed because one or more lines are too long

7
deliver.yaml
View file

@ -1,10 +1,3 @@
enabled: true enabled: true
dropdown: dropdown:
enabled: false enabled: false
streams:
scheme:
theme:
type: ReadOnlyStream
paths:
- user/themes/deliver

BIN
fonts/fontawesome-webfont.woff2 Normal file
View file

Binary file not shown.

6
scss/template/modular/_showcase.scss
View file

@ -86,8 +86,10 @@
@extend .default-animation; @extend .default-animation;
position: absolute; position: absolute;
display: block; display: block;
width: 3.7rem; padding-bottom: 0;
height: 3.7rem; padding-left: 0.8rem;
padding-right: 0.8rem;
padding-top: 0;
cursor: pointer; cursor: pointer;
z-index: 50; z-index: 50;
text-align: center; text-align: center;

2
templates/modular.html.twig
View file

@ -51,7 +51,7 @@
{% endmacro %} {% endmacro %}
{% if config.themes.deliver.dropdown.enabled %} {% if theme_config.dropdown.enabled %}
{{ _self.loop(pages) }} {{ _self.loop(pages) }}
{% else %} {% else %}
{% for page in pages.children %} {% for page in pages.children %}

2
templates/modular/contact.html.twig
View file

@ -2,7 +2,7 @@
<div class="g-grid pure-g-r"> <div class="g-grid pure-g-r">
<div id="listing" class="g-block pure-u-2-3"> <div id="listing" class="g-block pure-u-2-3">
{% if config.plugins.simple_form.enabled %} {% if config.plugins.simple_form.enabled %}
{% set simple_form_config = page.header.simple_form ?: config.themes.deliver.simple_form %} {% set simple_form_config = page.header.simple_form ?: theme_config.simple_form %}
{{ simple_form(simple_form_config) }} {{ simple_form(simple_form_config) }}
{% endif %} {% endif %}
</div> </div>

2
templates/modular_alt.html.twig
View file

@ -46,7 +46,7 @@
{% endif %} {% endif %}
{% endfor %} {% endfor %}
{% endmacro %} {% endmacro %}
{% if config.themes.deliver.dropdown.enabled %} {% if theme_config.dropdown.enabled %}
{{ _self.loop(pages) }} {{ _self.loop(pages) }}
{% else %} {% else %}
{% for page in pages.children %} {% for page in pages.children %}

3
templates/partials/base.html.twig
View file

@ -1,5 +1,6 @@
{% set theme_config = attribute(config.themes, config.system.pages.theme) %}
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en"> <html lang="{{ grav.language.getLanguage ?: 'en' }}">
<head> <head>
{% block head %} {% block head %}
<meta charset="utf-8" /> <meta charset="utf-8" />

2
templates/partials/navigation.html.twig
View file

@ -18,7 +18,7 @@
{% endmacro %} {% endmacro %}
<ul class="navigation"> <ul class="navigation">
{% if config.themes.deliver.dropdown.enabled %} {% if theme_config.dropdown.enabled %}
{{ _self.loop(pages) }} {{ _self.loop(pages) }}
{% else %} {% else %}
{% for page in pages.children %} {% for page in pages.children %}

2
templates/partials/simplesearch_base.html.twig
View file

@ -1,5 +1,5 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en"> <html lang="{{ grav.language.getLanguage ?: 'en' }}">
<head> <head>
{% block head %} {% block head %}
<meta charset="utf-8" /> <meta charset="utf-8" />