From b738bea9ca03c7c05e8c159b9c2f48fb40e58ccd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Tue, 22 Jul 2014 16:37:13 +0200 Subject: Fix #776 --- themes/baggy/config.twig | 2 +- themes/default/config.twig | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'themes') diff --git a/themes/baggy/config.twig b/themes/baggy/config.twig index 46735f07..e45c3218 100755 --- a/themes/baggy/config.twig +++ b/themes/baggy/config.twig @@ -111,7 +111,7 @@
- +
diff --git a/themes/default/config.twig b/themes/default/config.twig index 160f6046..8f047ae6 100755 --- a/themes/default/config.twig +++ b/themes/default/config.twig @@ -110,7 +110,7 @@
- +
-- cgit v1.2.3 From 3e87066506bbbc5e0819c4f8bc7ec5b763b76303 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Tue, 22 Jul 2014 18:12:03 +0200 Subject: fix display of 'Done' message when we add a link from 'save a link' item --- themes/baggy/_pocheit-form.twig | 2 +- themes/baggy/css/main.css | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'themes') diff --git a/themes/baggy/_pocheit-form.twig b/themes/baggy/_pocheit-form.twig index 505ec368..57a928c0 100755 --- a/themes/baggy/_pocheit-form.twig +++ b/themes/baggy/_pocheit-form.twig @@ -4,7 +4,7 @@ {% trans "Save a link" %} + -
diff --git a/themes/baggy/css/main.css b/themes/baggy/css/main.css index 6d320cd2..711c152b 100755 --- a/themes/baggy/css/main.css +++ b/themes/baggy/css/main.css @@ -630,7 +630,7 @@ a.add-to-wallabag-link-after:after { #add-link-result { font-weight: bold; - margin-top: 10px; + font-size: 0.9em; } /* ========================================================================== -- cgit v1.2.3 From 9f8541ef2a9dc670ca75fb452c0930e1afa4a8f6 Mon Sep 17 00:00:00 2001 From: Maryana Rozhankivska Date: Tue, 22 Jul 2014 20:17:15 +0300 Subject: highlight.js library added to highlight programming code examples in article view --- themes/baggy/css/main.css | 8 ++ themes/baggy/view.twig | 1 + themes/default/_highlight.twig | 4 + themes/default/css/style.css | 6 + themes/default/highlightjs/highlight.pack.js | 1 + themes/default/highlightjs/styles/default.css | 152 +++++++++++++++++++++++ themes/default/highlightjs/styles/github.css | 127 +++++++++++++++++++ themes/default/highlightjs/styles/googlecode.css | 148 ++++++++++++++++++++++ themes/default/view.twig | 1 + 9 files changed, 448 insertions(+) create mode 100755 themes/default/_highlight.twig create mode 100644 themes/default/highlightjs/highlight.pack.js create mode 100644 themes/default/highlightjs/styles/default.css create mode 100644 themes/default/highlightjs/styles/github.css create mode 100644 themes/default/highlightjs/styles/googlecode.css (limited to 'themes') diff --git a/themes/baggy/css/main.css b/themes/baggy/css/main.css index 6d320cd2..f8238744 100755 --- a/themes/baggy/css/main.css +++ b/themes/baggy/css/main.css @@ -923,6 +923,13 @@ blockquote { text-decoration: underline; } +pre code { + font-family: "Courier New", Courier, monospace; + border: 1px solid #ccc; + font-size: 0.96em; +} + + /* ========================================================================== 6 = Media Queries ========================================================================== */ @@ -1055,3 +1062,4 @@ blockquote { left: 0; } } + diff --git a/themes/baggy/view.twig b/themes/baggy/view.twig index af97407d..703ce5be 100755 --- a/themes/baggy/view.twig +++ b/themes/baggy/view.twig @@ -4,6 +4,7 @@ {% endblock %} {% block title %}{{ entry.title|raw }} ({{ entry.url | e | getDomain }}){% endblock %} {% block content %} + {% include '_highlight.twig' %}