diff --git a/composer.json b/composer.json index 6f4c0fb889..aa957a39c4 100644 --- a/composer.json +++ b/composer.json @@ -53,7 +53,6 @@ "phpdocumentor/type-resolver": "^1.0", "psr/cache": "^1.0", "psr/log": "^1.1", - "scrivo/highlight.php": "^9.17", "symfony/cache": "^5.0", "symfony/config": "^5.0", "symfony/console": "^5.0", diff --git a/composer.lock b/composer.lock index 500ab78605..3369867cd5 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "acc838630ea3769a4a9a90193a1665d1", + "content-hash": "bfa643ca88ba1d5b73777b6482fdbd05", "packages": [ { "name": "doctrine/event-manager", @@ -1554,78 +1554,6 @@ ], "time": "2020-03-23T09:12:05+00:00" }, - { - "name": "scrivo/highlight.php", - "version": "v9.18.1.6", - "source": { - "type": "git", - "url": "https://github.com/scrivo/highlight.php.git", - "reference": "44a3d4136edb5ad8551590bf90f437db80b2d466" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/scrivo/highlight.php/zipball/44a3d4136edb5ad8551590bf90f437db80b2d466", - "reference": "44a3d4136edb5ad8551590bf90f437db80b2d466", - "shasum": "" - }, - "require": { - "ext-json": "*", - "ext-mbstring": "*", - "php": ">=5.4" - }, - "require-dev": { - "phpunit/phpunit": "^4.8|^5.7", - "sabberworm/php-css-parser": "^8.3", - "symfony/finder": "^2.8|^3.4", - "symfony/var-dumper": "^2.8|^3.4" - }, - "type": "library", - "autoload": { - "psr-0": { - "Highlight\\": "", - "HighlightUtilities\\": "" - }, - "files": [ - "HighlightUtilities/functions.php" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Geert Bergman", - "homepage": "http://www.scrivo.org/", - "role": "Project Author" - }, - { - "name": "Vladimir Jimenez", - "homepage": "https://allejo.io", - "role": "Maintainer" - }, - { - "name": "Martin Folkers", - "homepage": "https://twobrain.io", - "role": "Contributor" - } - ], - "description": "Server side syntax highlighter that supports 185 languages. It's a PHP port of highlight.js", - "keywords": [ - "code", - "highlight", - "highlight.js", - "highlight.php", - "syntax" - ], - "funding": [ - { - "url": "https://github.com/allejo", - "type": "github" - } - ], - "time": "2020-12-22T19:20:29+00:00" - }, { "name": "symfony/cache", "version": "v5.2.2", diff --git a/data/templates/default/css/normalize.css.twig b/data/templates/default/css/normalize.css.twig index 46f646a5c0..579152b07f 100644 --- a/data/templates/default/css/normalize.css.twig +++ b/data/templates/default/css/normalize.css.twig @@ -230,7 +230,7 @@ code, kbd, pre, samp { - font-family: monospace, monospace; + font-family: var(--font-monospace); font-size: 1em; } diff --git a/data/templates/default/css/variables.css.twig b/data/templates/default/css/variables.css.twig index 3670137465..cfe2e63c85 100644 --- a/data/templates/default/css/variables.css.twig +++ b/data/templates/default/css/variables.css.twig @@ -2,6 +2,7 @@ /* Typography */ --font-primary: 'Source Sans Pro', Helvetica, Arial, sans-serif; --font-secondary: 'Source Sans Pro', Helvetica, Arial, sans-serif; + --font-monospace: 'Source Code Pro', monospace; --line-height--primary: 1.6; --letter-spacing--primary: .05rem; --text-base-size: 1em; @@ -22,12 +23,13 @@ --primary-color: hsl(96, 57%, 60%); --primary-color-darken: hsl(96, 57%, 40%); --primary-color-darker: hsl(96, 57%, 20%); + --primary-color-darkest: hsl(96, 57%, 10%); --primary-color-lighten: hsl(96, 57%, 80%); --primary-color-lighter: hsl(96, 57%, 99%); --dark-gray: #d1d1d1; --light-gray: #f0f0f0; - --text-color: #4b3b40; + --text-color: var(--primary-color-darkest); --header-height: var(--spacing-xxxxl); --header-bg-color: var(--primary-color); diff --git a/data/templates/default/guides/code.html.twig b/data/templates/default/guides/code.html.twig index fcbf185d29..0a8a2d2dd1 100644 --- a/data/templates/default/guides/code.html.twig +++ b/data/templates/default/guides/code.html.twig @@ -1 +1 @@ -
{{ codeNode.value }}
+{{ code }}
diff --git a/data/templates/default/layout.html.twig b/data/templates/default/layout.html.twig
index bbfe5011a6..f4fe8e178b 100644
--- a/data/templates/default/layout.html.twig
+++ b/data/templates/default/layout.html.twig
@@ -9,9 +9,13 @@
{% block stylesheets %}
+
+
+
+
{% endblock %}
{% block javascripts %}
@@ -38,5 +42,8 @@
+
+
+