merge changes from develop
This commit is contained in:
commit
3b118782ef
3 changed files with 7 additions and 6 deletions
|
@ -21,7 +21,8 @@ class Render
|
||||||
? $settings["global"]["keywords"]
|
? $settings["global"]["keywords"]
|
||||||
: "fipamo, blog, jamstack, php, markdown, js",
|
: "fipamo, blog, jamstack, php, markdown, js",
|
||||||
"description" => $settings["global"]["descriptions"],
|
"description" => $settings["global"]["descriptions"],
|
||||||
"image" => $settings["global"]["background"],
|
"image" =>
|
||||||
|
$settings["global"]["base_url"] . $settings["global"]["background"],
|
||||||
];
|
];
|
||||||
//copy current theme assets to public
|
//copy current theme assets to public
|
||||||
if (is_file("../public/assets/css/base.css")) {
|
if (is_file("../public/assets/css/base.css")) {
|
||||||
|
|
|
@ -15,7 +15,7 @@
|
||||||
</title>
|
</title>
|
||||||
<meta charset="UTF-8" />
|
<meta charset="UTF-8" />
|
||||||
<meta name='viewport' content='width=device-width, initial-scale=1.0' />
|
<meta name='viewport' content='width=device-width, initial-scale=1.0' />
|
||||||
<meta name="keywords" content="{{ info['keywords'] }}") />
|
<meta name="keywords" content="{{ info['keywords'] }}"/>
|
||||||
<meta name="description" content="{{info['description']}} " />
|
<meta name="description" content="{{info['description']}} " />
|
||||||
<meta http-equiv="content-type" content="text/html; charset=utf-8" />
|
<meta http-equiv="content-type" content="text/html; charset=utf-8" />
|
||||||
<meta property="og:image" content="{{info["image"]}}" />
|
<meta property="og:image" content="{{info["image"]}}" />
|
||||||
|
|
8
public/assets/scripts/dash.min.js
vendored
8
public/assets/scripts/dash.min.js
vendored
File diff suppressed because one or more lines are too long
Loading…
Reference in a new issue