aboutsummaryrefslogtreecommitdiffhomepage
path: root/themes/baggy
diff options
context:
space:
mode:
authortcit <tcit@tcit.fr>2014-09-27 17:54:13 +0200
committertcit <tcit@tcit.fr>2014-09-27 17:54:13 +0200
commit04a7674bdd20f2f24b32de69c086ecffdf20ceb4 (patch)
treebcc26634c68a8689ad511513c316058647e90789 /themes/baggy
parent657245dcbdbca323621952d2b6f9e991dd94fa03 (diff)
parenta15108e65b12ceaf50821783bcaa1ee3fee10d13 (diff)
downloadwallabag-04a7674bdd20f2f24b32de69c086ecffdf20ceb4.tar.gz
wallabag-04a7674bdd20f2f24b32de69c086ecffdf20ceb4.tar.zst
wallabag-04a7674bdd20f2f24b32de69c086ecffdf20ceb4.zip
merge refactor and dev
Diffstat (limited to 'themes/baggy')
-rwxr-xr-xthemes/baggy/_pocheit-form.twig2
-rwxr-xr-xthemes/baggy/config.twig4
-rwxr-xr-xthemes/baggy/css/main.css10
-rwxr-xr-xthemes/baggy/view.twig1
4 files changed, 12 insertions, 5 deletions
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 @@
4 {% trans "Save a link" %}</h2> 4 {% trans "Save a link" %}</h2>
5 <input type="hidden" name="autoclose" value="1" /> 5 <input type="hidden" name="autoclose" value="1" />
6 <input required placeholder="example.com/article" class="addurl" id="plainurl" name="plainurl" type="url" /> 6 <input required placeholder="example.com/article" class="addurl" id="plainurl" name="plainurl" type="url" />
7 <span id="add-link-result"></span>
7 <input type="submit" value="{% trans "save link!" %}" /> 8 <input type="submit" value="{% trans "save link!" %}" />
8 <div id="add-link-result"></div>
9 </form> 9 </form>
10</div> 10</div>
diff --git a/themes/baggy/config.twig b/themes/baggy/config.twig
index 46735f07..7bd229cb 100755
--- a/themes/baggy/config.twig
+++ b/themes/baggy/config.twig
@@ -111,7 +111,7 @@
111 <fieldset class="w500p"> 111 <fieldset class="w500p">
112 <div class="row"> 112 <div class="row">
113 <label class="col w150p" for="file">{% trans "File:" %}</label> 113 <label class="col w150p" for="file">{% trans "File:" %}</label>
114 <input class="col" type="file" id="file" name="file" tabindex="4"> 114 <input class="col" type="file" id="file" name="file" tabindex="4" required="required">
115 </div> 115 </div>
116 <div class="row mts txtcenter"> 116 <div class="row mts txtcenter">
117 <button class="bouton" type="submit" tabindex="4">{% trans "Import" %}</button> 117 <button class="bouton" type="submit" tabindex="4">{% trans "Import" %}</button>
@@ -121,8 +121,6 @@
121 <p><a href="?import">{% trans "You can click here to fetch content for articles with no content." %}</a></p> 121 <p><a href="?import">{% trans "You can click here to fetch content for articles with no content." %}</a></p>
122 122
123 <h2>{% trans "Export your wallabag data" %}</h2> 123 <h2>{% trans "Export your wallabag data" %}</h2>
124 {% if constant('STORAGE') == 'sqlite' %}
125 <p><a href="?download" target="_blank">{% trans "Click here" %}</a> {% trans "to download your database." %}</p>{% endif %}
126 <p><a href="?export" target="_blank">{% trans "Click here" %}</a> {% trans "to export your wallabag data." %}</p> 124 <p><a href="?export" target="_blank">{% trans "Click here" %}</a> {% trans "to export your wallabag data." %}</p>
127 125
128 <h2>{% trans "Fancy an E-Book ?" %}</h2> 126 <h2>{% trans "Fancy an E-Book ?" %}</h2>
diff --git a/themes/baggy/css/main.css b/themes/baggy/css/main.css
index 6d320cd2..9c50786b 100755
--- a/themes/baggy/css/main.css
+++ b/themes/baggy/css/main.css
@@ -630,7 +630,7 @@ a.add-to-wallabag-link-after:after {
630 630
631#add-link-result { 631#add-link-result {
632 font-weight: bold; 632 font-weight: bold;
633 margin-top: 10px; 633 font-size: 0.9em;
634} 634}
635 635
636/* ========================================================================== 636/* ==========================================================================
@@ -923,6 +923,13 @@ blockquote {
923 text-decoration: underline; 923 text-decoration: underline;
924} 924}
925 925
926pre code {
927 font-family: "Courier New", Courier, monospace;
928 border: 1px solid #ccc;
929 font-size: 0.96em;
930}
931
932
926/* ========================================================================== 933/* ==========================================================================
927 6 = Media Queries 934 6 = Media Queries
928 ========================================================================== */ 935 ========================================================================== */
@@ -1055,3 +1062,4 @@ blockquote {
1055 left: 0; 1062 left: 0;
1056 } 1063 }
1057} 1064}
1065
diff --git a/themes/baggy/view.twig b/themes/baggy/view.twig
index 7b65340a..53a9ee69 100755
--- a/themes/baggy/view.twig
+++ b/themes/baggy/view.twig
@@ -4,6 +4,7 @@
4{% endblock %} 4{% endblock %}
5{% block title %}{{ entry.title|raw }} ({{ entry.url | e | getDomain }}){% endblock %} 5{% block title %}{{ entry.title|raw }} ({{ entry.url | e | getDomain }}){% endblock %}
6{% block content %} 6{% block content %}
7 {% include '_highlight.twig' %}
7 <div id="article_toolbar"> 8 <div id="article_toolbar">
8 <ul class="links"> 9 <ul class="links">
9 <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> 10 <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>