From b738bea9ca03c7c05e8c159b9c2f48fb40e58ccd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= <nicolas@loeuillet.org>
Date: Tue, 22 Jul 2014 16:37:13 +0200
Subject: Fix #776

---
 themes/baggy/config.twig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'themes/baggy')

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 @@
                 <fieldset class="w500p">
                     <div class="row">
                         <label class="col w150p" for="file">{% trans "File:" %}</label>
-                        <input class="col" type="file" id="file" name="file" tabindex="4">
+                        <input class="col" type="file" id="file" name="file" tabindex="4" required="required">
                     </div>
                     <div class="row mts txtcenter">
                         <button class="bouton" type="submit" tabindex="4">{% trans "Import" %}</button>
-- 
cgit v1.2.3


From 3e87066506bbbc5e0819c4f8bc7ec5b763b76303 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= <nicolas@loeuillet.org>
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/baggy')

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" %}</h2>
         <input type="hidden" name="autoclose" value="1" />
         <input required placeholder="example.com/article" class="addurl" id="plainurl" name="plainurl" type="url" />
+        <span id="add-link-result"></span>
         <input type="submit" value="{% trans "save link!" %}" />
-        <div id="add-link-result"></div>
     </form>
 </div>
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 <mariroz@mr.lviv.ua>
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 +
 2 files changed, 9 insertions(+)

(limited to 'themes/baggy')

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' %}
         <div id="article_toolbar">
             <ul class="links">
                 <li class="topPosF"><a href="#top" title="{% trans "Back to top" %}" class="tool top icon icon-arrow-up-thick"><span>{% trans "Back to top" %}</span></a></li>
-- 
cgit v1.2.3


From 8763e4efde17f133d0bda504640acada108e7870 Mon Sep 17 00:00:00 2001
From: Thomas Citharel <tcit@tcit.fr>
Date: Tue, 26 Aug 2014 12:43:56 +0200
Subject: Fix downloading SQLite database from all users

---
 themes/baggy/config.twig | 2 --
 1 file changed, 2 deletions(-)

(limited to 'themes/baggy')

diff --git a/themes/baggy/config.twig b/themes/baggy/config.twig
index e45c3218..7bd229cb 100755
--- a/themes/baggy/config.twig
+++ b/themes/baggy/config.twig
@@ -121,8 +121,6 @@
             <p><a href="?import">{% trans "You can click here to fetch content for articles with no content." %}</a></p>
             
             <h2>{% trans "Export your wallabag data" %}</h2>
-            {% if constant('STORAGE') == 'sqlite' %}
-            <p><a href="?download" target="_blank">{% trans "Click here" %}</a> {% trans "to download your database." %}</p>{% endif %}
             <p><a href="?export" target="_blank">{% trans "Click here" %}</a> {% trans "to export your wallabag data." %}</p>
             
             <h2>{% trans "Fancy an E-Book ?" %}</h2>
-- 
cgit v1.2.3