Merge branch 'release/1.5.0'
This commit is contained in:
Flavio Copes
commit
0bdbcf47f1
15 changed files with 33 additions and 49 deletions
2
.gitignore
vendored
2
.gitignore
vendored
|
|
@ -1 +1,3 @@
|
|||
.sass-cache
|
||||
|
||||
.DS_Store
|
||||
|
|
|
|||
12
CHANGELOG.md
12
CHANGELOG.md
|
|
@ -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
|
||||
## 01/06/2016
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
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."
|
||||
icon: newspaper-o
|
||||
author:
|
||||
|
|
|
|||
|
|
@ -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"]
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1081,8 +1081,10 @@ ul.pagination {
|
|||
.modular .slideme_container .arrow {
|
||||
position: absolute;
|
||||
display: block;
|
||||
width: 3.7rem;
|
||||
height: 3.7rem;
|
||||
padding-bottom: 0;
|
||||
padding-left: 0.8rem;
|
||||
padding-right: 0.8rem;
|
||||
padding-top: 0;
|
||||
cursor: pointer;
|
||||
z-index: 50;
|
||||
text-align: center;
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
|
|
@ -1,10 +1,3 @@
|
|||
enabled: true
|
||||
dropdown:
|
||||
enabled: false
|
||||
|
||||
streams:
|
||||
scheme:
|
||||
theme:
|
||||
type: ReadOnlyStream
|
||||
paths:
|
||||
- user/themes/deliver
|
||||
|
|
|
|||
BIN
fonts/fontawesome-webfont.woff2
Normal file
BIN
fonts/fontawesome-webfont.woff2
Normal file
Binary file not shown.
|
|
@ -86,8 +86,10 @@
|
|||
@extend .default-animation;
|
||||
position: absolute;
|
||||
display: block;
|
||||
width: 3.7rem;
|
||||
height: 3.7rem;
|
||||
padding-bottom: 0;
|
||||
padding-left: 0.8rem;
|
||||
padding-right: 0.8rem;
|
||||
padding-top: 0;
|
||||
cursor: pointer;
|
||||
z-index: 50;
|
||||
text-align: center;
|
||||
|
|
|
|||
|
|
@ -51,7 +51,7 @@
|
|||
{% endmacro %}
|
||||
|
||||
|
||||
{% if config.themes.deliver.dropdown.enabled %}
|
||||
{% if theme_config.dropdown.enabled %}
|
||||
{{ _self.loop(pages) }}
|
||||
{% else %}
|
||||
{% for page in pages.children %}
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
<div class="g-grid pure-g-r">
|
||||
<div id="listing" class="g-block pure-u-2-3">
|
||||
{% 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) }}
|
||||
{% endif %}
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -46,7 +46,7 @@
|
|||
{% endif %}
|
||||
{% endfor %}
|
||||
{% endmacro %}
|
||||
{% if config.themes.deliver.dropdown.enabled %}
|
||||
{% if theme_config.dropdown.enabled %}
|
||||
{{ _self.loop(pages) }}
|
||||
{% else %}
|
||||
{% for page in pages.children %}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
{% set theme_config = attribute(config.themes, config.system.pages.theme) %}
|
||||
<!DOCTYPE html>
|
||||
<html lang="en">
|
||||
<html lang="{{ grav.language.getLanguage ?: 'en' }}">
|
||||
<head>
|
||||
{% block head %}
|
||||
<meta charset="utf-8" />
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@
|
|||
{% endmacro %}
|
||||
|
||||
<ul class="navigation">
|
||||
{% if config.themes.deliver.dropdown.enabled %}
|
||||
{% if theme_config.dropdown.enabled %}
|
||||
{{ _self.loop(pages) }}
|
||||
{% else %}
|
||||
{% for page in pages.children %}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
<!DOCTYPE html>
|
||||
<html lang="en">
|
||||
<html lang="{{ grav.language.getLanguage ?: 'en' }}">
|
||||
<head>
|
||||
{% block head %}
|
||||
<meta charset="utf-8" />
|
||||
|
|
|
|||
Loading…
Reference in a new issue