1
0
mirror of https://tildegit.org/sbgodin/HtmGem.git synced 2023-08-25 13:53:12 +02:00

Merge branch 'master' into dev

This commit is contained in:
Christophe HENRY 2023-08-01 22:19:25 +02:00
commit 61ba2a9502
4 changed files with 132 additions and 3 deletions

View File

@ -21,6 +21,12 @@ All notable changes to this project will be documented in this file.
* Be able to change the page style on the top bar. * Be able to change the page style on the top bar.
* Be able to change the font size. * Be able to change the font size.
## [1.5.1] - 2023-08-01
* Adds style from Omar Polo's site, thanks to <lazarus at sdfeu.org>
* Fix getCss() calls, thanks to <lazarus at sdfeu.org>
* Fixes a bug on CSS when hosted on filesystem root
* Fix typo in the English documentation about Apache
## [1.5.0] - 2022-08-23 ## [1.5.0] - 2022-08-23
* Adds the Lagrange style, thanks to Eric <ortie10 at gmx.fr> * Adds the Lagrange style, thanks to Eric <ortie10 at gmx.fr>
* Adds circumlunar css * Adds circumlunar css

123
css/lazarus/omarpolo.css Normal file
View File

@ -0,0 +1,123 @@
@import "base.css";
/* style from Omar Polo: https://gmid.omarpolo.com/style.css */
body {
font-family: monospace;
font-size: 14px;
max-width: 780px;
margin: 0 auto;
padding: 10px;
padding-bottom: 80px;
}
h1::before {
content: "# ";
}
h2 {
margin-top: 40px;
}
h2::before {
content: "## ";
}
h3::before {
content: "### ";
}
#gmi a::before {
content: "=> ";
}
blockquote {
margin: 0;
padding: 0;
}
blockquote::before {
content: "> ";
}
blockquote p {
font-style: italic;
display: inline;
}
p.link::before {
content: "→ ";
}
strong::before { content: "*" }
strong::after { content: "*" }
hr {
border: 0;
height: 1px;
background-color: #222;
width: 100%;
display: block;
margin: 2em auto;
}
ul.link-list {
list-style: disclosure-closed;
}
img {
border-radius: 5px;
}
pre {
overflow: auto;
padding: 1rem;
background-color: #f0f0f0;
border-radius: 3px;
}
pre.banner {
display: flex;
flex-direction: row;
justify-content: center;
}
code, kbd {
color: #9d109d;
}
img {
display: block;
margin: 0 auto;
max-width: 100%;
}
@media (prefers-color-scheme: dark) {
body {
background-color: #222;
color: white;
}
a {
color: aqua;
}
hr {
background-color: #ddd;
}
pre {
background-color: #353535;
}
code, kbd {
color: #ff4cff;
}
}
@media (max-width: 400px) {
pre.banner { font-size: 9px; }
}
@media (max-width: 500px) {
pre.banner { font-size: 10px; }
}

View File

@ -28,7 +28,7 @@ location = /favicon.ico { alias /var/www/dev/htmgem/favicon.ico; }
``` ```
DirectoryIndex index.gmi index.php index.html DirectoryIndex index.gmi index.php index.html
RewriteEngine on RewriteEngine on
rewriteRule ^(.+\.gmi)$ htmgem/index.php?rw=1&url=$1&style=default,htmgem.css RewriteRule ^(.+\.gmi)$ htmgem/index.php?rw=1&url=$1&style=default,htmgem.css
``` ```
Other available styles: Other available styles:

View File

@ -26,7 +26,7 @@ if (empty($url)) {
http_response_code(403); http_response_code(403);
} else { } else {
$gt_html = new \htmgem\GemTextTranslate_html(file_get_contents("index.gmi"), true, "$php_self?url=", $php_self_dir); $gt_html = new \htmgem\GemTextTranslate_html(file_get_contents("index.gmi"), true, "$php_self?url=", $php_self_dir);
if (empty($gt_html->getCss)) $gt_html->addCss($php_self_dir.DEFAULT_CSS); if (empty($gt_html->getCss())) $gt_html->addCss($php_self_dir.DEFAULT_CSS);
// No URL Rewritting assumed // No URL Rewritting assumed
echo \htmgem\html\getHtmlWithMenu($gt_html, $scheme, $domain, $php_self, "$php_self?url="); echo \htmgem\html\getHtmlWithMenu($gt_html, $scheme, $domain, $php_self, "$php_self?url=");
@ -66,7 +66,7 @@ if ($go404) {
http_response_code(404); http_response_code(404);
$page404 = \htmgem\html\get404GmiPage($url); $page404 = \htmgem\html\get404GmiPage($url);
$gt_html = new \htmgem\GemTextTranslate_html($page404); $gt_html = new \htmgem\GemTextTranslate_html($page404);
if (empty($gt_html->getCss)) $gt_html->addCss($php_self_dir."/css/htmgem.css"); if (empty($gt_html->getCss())) $gt_html->addCss($php_self_dir."/css/htmgem.css");
if ($urlRewriting) if ($urlRewriting)
echo \htmgem\html\getHtmlWithMenu($gt_html, $scheme, $domain, $url); echo \htmgem\html\getHtmlWithMenu($gt_html, $scheme, $domain, $url);
else else