aboutsummaryrefslogtreecommitdiffhomepage
path: root/themes
diff options
context:
space:
mode:
authorNicolas LÅ“uillet <nicolas.loeuillet@gmail.com>2013-11-25 02:00:07 -0800
committerNicolas LÅ“uillet <nicolas.loeuillet@gmail.com>2013-11-25 02:00:07 -0800
commitc2b7a11c772a5b503896add11ea18838999f8d58 (patch)
tree1976b248eb85e335febc13e0442b8fe766b91687 /themes
parentcd8a3441561fa63b9da1b705c4b28dee787f79b0 (diff)
parent7a4482b8a43afca7f5c311ae7e44b3f0c4d239c0 (diff)
downloadwallabag-c2b7a11c772a5b503896add11ea18838999f8d58.tar.gz
wallabag-c2b7a11c772a5b503896add11ea18838999f8d58.tar.zst
wallabag-c2b7a11c772a5b503896add11ea18838999f8d58.zip
Merge pull request #326 from inthepoche/dev
1.2.0
Diffstat (limited to 'themes')
-rw-r--r--[-rwxr-xr-x]themes/dark/img/dark/backtotop.pngbin326 -> 250 bytes
-rw-r--r--[-rwxr-xr-x]themes/dark/img/dark/bad-display.pngbin343 -> 403 bytes
-rw-r--r--themes/dark/img/dark/checkmark-off.pngbin277 -> 339 bytes
-rw-r--r--themes/dark/img/dark/checkmark-on.pngbin235 -> 288 bytes
-rw-r--r--themes/dark/img/dark/down.pngbin216 -> 269 bytes
-rw-r--r--themes/dark/img/dark/envelop.pngbin285 -> 361 bytes
-rw-r--r--[-rwxr-xr-x]themes/dark/img/dark/flattr.pngbin270 -> 331 bytes
-rw-r--r--themes/dark/img/dark/left.pngbin196 -> 264 bytes
-rw-r--r--[-rwxr-xr-x]themes/dark/img/dark/link.pngbin341 -> 404 bytes
-rw-r--r--themes/dark/img/dark/remove.pngbin252 -> 300 bytes
-rw-r--r--themes/dark/img/dark/shaarli.pngbin729 -> 841 bytes
-rw-r--r--themes/dark/img/dark/star-off.pngbin314 -> 382 bytes
-rw-r--r--themes/dark/img/dark/star-on.pngbin281 -> 327 bytes
-rw-r--r--themes/dark/img/dark/top.pngbin212 -> 250 bytes
-rw-r--r--themes/dark/img/dark/twitter.pngbin297 -> 375 bytes
-rw-r--r--themes/default/_head.twig1
-rw-r--r--themes/default/config.twig7
-rw-r--r--themes/default/css/print.css3
-rw-r--r--themes/default/js/autoClose.js6
19 files changed, 13 insertions, 4 deletions
diff --git a/themes/dark/img/dark/backtotop.png b/themes/dark/img/dark/backtotop.png
index 051238ef..c885086d 100755..100644
--- a/themes/dark/img/dark/backtotop.png
+++ b/themes/dark/img/dark/backtotop.png
Binary files differ
diff --git a/themes/dark/img/dark/bad-display.png b/themes/dark/img/dark/bad-display.png
index 6866799f..66ea2e16 100755..100644
--- a/themes/dark/img/dark/bad-display.png
+++ b/themes/dark/img/dark/bad-display.png
Binary files differ
diff --git a/themes/dark/img/dark/checkmark-off.png b/themes/dark/img/dark/checkmark-off.png
index 3db5a06d..661ea997 100644
--- a/themes/dark/img/dark/checkmark-off.png
+++ b/themes/dark/img/dark/checkmark-off.png
Binary files differ
diff --git a/themes/dark/img/dark/checkmark-on.png b/themes/dark/img/dark/checkmark-on.png
index cd3abb2c..5ee8c8d3 100644
--- a/themes/dark/img/dark/checkmark-on.png
+++ b/themes/dark/img/dark/checkmark-on.png
Binary files differ
diff --git a/themes/dark/img/dark/down.png b/themes/dark/img/dark/down.png
index b9d536a7..4150e17c 100644
--- a/themes/dark/img/dark/down.png
+++ b/themes/dark/img/dark/down.png
Binary files differ
diff --git a/themes/dark/img/dark/envelop.png b/themes/dark/img/dark/envelop.png
index 6be1c886..73d9b0b9 100644
--- a/themes/dark/img/dark/envelop.png
+++ b/themes/dark/img/dark/envelop.png
Binary files differ
diff --git a/themes/dark/img/dark/flattr.png b/themes/dark/img/dark/flattr.png
index 0404aaea..b457d080 100755..100644
--- a/themes/dark/img/dark/flattr.png
+++ b/themes/dark/img/dark/flattr.png
Binary files differ
diff --git a/themes/dark/img/dark/left.png b/themes/dark/img/dark/left.png
index a0a53631..c2f7a20e 100644
--- a/themes/dark/img/dark/left.png
+++ b/themes/dark/img/dark/left.png
Binary files differ
diff --git a/themes/dark/img/dark/link.png b/themes/dark/img/dark/link.png
index db62819d..a5b8d8d2 100755..100644
--- a/themes/dark/img/dark/link.png
+++ b/themes/dark/img/dark/link.png
Binary files differ
diff --git a/themes/dark/img/dark/remove.png b/themes/dark/img/dark/remove.png
index f8ad56a3..0c3dcfdf 100644
--- a/themes/dark/img/dark/remove.png
+++ b/themes/dark/img/dark/remove.png
Binary files differ
diff --git a/themes/dark/img/dark/shaarli.png b/themes/dark/img/dark/shaarli.png
index 1eb30f60..e68ac8b5 100644
--- a/themes/dark/img/dark/shaarli.png
+++ b/themes/dark/img/dark/shaarli.png
Binary files differ
diff --git a/themes/dark/img/dark/star-off.png b/themes/dark/img/dark/star-off.png
index 6a0133a7..8194bc2d 100644
--- a/themes/dark/img/dark/star-off.png
+++ b/themes/dark/img/dark/star-off.png
Binary files differ
diff --git a/themes/dark/img/dark/star-on.png b/themes/dark/img/dark/star-on.png
index a9f96eaa..109c3aec 100644
--- a/themes/dark/img/dark/star-on.png
+++ b/themes/dark/img/dark/star-on.png
Binary files differ
diff --git a/themes/dark/img/dark/top.png b/themes/dark/img/dark/top.png
index 954a8c0a..d137bd24 100644
--- a/themes/dark/img/dark/top.png
+++ b/themes/dark/img/dark/top.png
Binary files differ
diff --git a/themes/dark/img/dark/twitter.png b/themes/dark/img/dark/twitter.png
index cfcfe419..6ce8a4d9 100644
--- a/themes/dark/img/dark/twitter.png
+++ b/themes/dark/img/dark/twitter.png
Binary files differ
diff --git a/themes/default/_head.twig b/themes/default/_head.twig
index d0cbd320..577cc693 100644
--- a/themes/default/_head.twig
+++ b/themes/default/_head.twig
@@ -8,3 +8,4 @@
8 <link rel="stylesheet" href="{{ poche_url }}/themes/{{ constant('DEFAULT_THEME') }}/css/messages.css" media="all"> 8 <link rel="stylesheet" href="{{ poche_url }}/themes/{{ constant('DEFAULT_THEME') }}/css/messages.css" media="all">
9 <link rel="stylesheet" href="{{ poche_url }}/themes/{{ constant('DEFAULT_THEME') }}/css/print.css" media="print"> 9 <link rel="stylesheet" href="{{ poche_url }}/themes/{{ constant('DEFAULT_THEME') }}/css/print.css" media="print">
10 <script src="{{ poche_url }}/themes/{{ constant('DEFAULT_THEME') }}/js/jquery-2.0.3.min.js"></script> 10 <script src="{{ poche_url }}/themes/{{ constant('DEFAULT_THEME') }}/js/jquery-2.0.3.min.js"></script>
11 <script src="{{ poche_url }}/themes/{{ constant('DEFAULT_THEME') }}/js/autoClose.js"></script> \ No newline at end of file
diff --git a/themes/default/config.twig b/themes/default/config.twig
index 72671702..21345827 100644
--- a/themes/default/config.twig
+++ b/themes/default/config.twig
@@ -8,9 +8,10 @@
8 <h2>{% trans "Poching a link" %}</h2> 8 <h2>{% trans "Poching a link" %}</h2>
9 <p>{% trans "You can poche a link by several methods:" %} (<a href="http://inthepoche.com/doc" title="{% trans "read the documentation" %}">?</a>)</p> 9 <p>{% trans "You can poche a link by several methods:" %} (<a href="http://inthepoche.com/doc" title="{% trans "read the documentation" %}">?</a>)</p>
10 <ul> 10 <ul>
11 <li>firefox: <a href="https://bitbucket.org/jogaulupeau/poche/downloads/poche.xpi" title="download the firefox extension">{% trans "download the extension" %}</a></li> 11 <li>firefox: <a href="https://addons.mozilla.org/fr/firefox/addon/poche/" title="download the firefox extension">{% trans "download the extension" %}</a></li>
12 <li>chrome: <a href="https://bitbucket.org/jogaulupeau/poche/downloads/poche.crx" title="download the chrome extension">{% trans "download the extension" %}</a></li> 12 <li>chrome: <a href="http://doc.inthepoche.com/doku.php?id=users:chrome_extension" title="download the chrome extension">{% trans "download the extension" %}</a></li>
13 <li>android: <a href="https://bitbucket.org/jogaulupeau/poche/downloads/Poche.apk" title="download the application">{% trans "download the application" %}</a></li> 13 <li>android: <a href="https://f-droid.org/repository/browse/?fdid=fr.gaulupeau.apps.Poche" title="download the application">{% trans "via f-droid" %}</a>{% trans "or" %}<a href="https://play.google.com/store/apps/details?id=fr.gaulupeau.apps.Poche" title="download the application">{% trans "via google play" %}</a></li>
14 <li>windows phone: <a href="http://www.windowsphone.com/en-us/store/app/poche/334de2f0-51b5-4826-8549-a3d805a37e83" title="download the window phone application">{% trans "download the application" %}</a></li>
14 <li> 15 <li>
15 <form method="get" action="index.php"> 16 <form method="get" action="index.php">
16 <label class="addurl" for="plainurl">{% trans "by filling this field" %}:</label> 17 <label class="addurl" for="plainurl">{% trans "by filling this field" %}:</label>
diff --git a/themes/default/css/print.css b/themes/default/css/print.css
index 9aefa779..99c00bdf 100644
--- a/themes/default/css/print.css
+++ b/themes/default/css/print.css
@@ -24,7 +24,8 @@ body > footer,
24div.tools, 24div.tools,
25header div, 25header div,
26.messages, 26.messages,
27.entrie + .results { 27.entrie + .results,
28#article_toolbar {
28 display: none !important; 29 display: none !important;
29} 30}
30 31
diff --git a/themes/default/js/autoClose.js b/themes/default/js/autoClose.js
new file mode 100644
index 00000000..e9145b7e
--- /dev/null
+++ b/themes/default/js/autoClose.js
@@ -0,0 +1,6 @@
1$(document).ready(function() {
2 current_url = window.location.href
3 if (current_url.match("&closewin=true")) {
4 window.close();
5 }
6});