diff options
author | Nicolas LÅ“uillet <nicolas.loeuillet@gmail.com> | 2013-08-25 08:04:51 -0700 |
---|---|---|
committer | Nicolas LÅ“uillet <nicolas.loeuillet@gmail.com> | 2013-08-25 08:04:51 -0700 |
commit | eb16ab407b4de8fadb432b057a20ecc6d999cbdd (patch) | |
tree | bab0a0b1124b95985fb1f25747064446f0566b28 /tpl | |
parent | b4f5c46ab0ec0da26e201266440511171785a338 (diff) | |
parent | e6ba0359119e93f3659876a7b1a17294f2da2b0e (diff) | |
download | wallabag-eb16ab407b4de8fadb432b057a20ecc6d999cbdd.tar.gz wallabag-eb16ab407b4de8fadb432b057a20ecc6d999cbdd.tar.zst wallabag-eb16ab407b4de8fadb432b057a20ecc6d999cbdd.zip |
Merge pull request #180 from NumEricR/externalize-css
Externalize some CSS code
Diffstat (limited to 'tpl')
-rw-r--r-- | tpl/_head.twig | 2 | ||||
-rw-r--r-- | tpl/config.twig | 2 | ||||
-rw-r--r-- | tpl/css/style.css | 21 |
3 files changed, 23 insertions, 2 deletions
diff --git a/tpl/_head.twig b/tpl/_head.twig index 6a8258a2..cab317a8 100644 --- a/tpl/_head.twig +++ b/tpl/_head.twig | |||
@@ -9,4 +9,4 @@ | |||
9 | <link rel="stylesheet" href="./tpl/css/print.css" media="print"> | 9 | <link rel="stylesheet" href="./tpl/css/print.css" media="print"> |
10 | <link href='//fonts.googleapis.com/css?family=Roboto' rel='stylesheet' type='text/css'> | 10 | <link href='//fonts.googleapis.com/css?family=Roboto' rel='stylesheet' type='text/css'> |
11 | <script src="./tpl/js/jquery-2.0.3.min.js"></script> | 11 | <script src="./tpl/js/jquery-2.0.3.min.js"></script> |
12 | <script type="text/javascript">$(document).ready(function(){$("body").prepend('<a href="#top" class="top_link" title="{% trans "back to top" %}"><img src="./tpl/img/{{ constant("THEME") }}/backtotop.png" alt={% trans "back to top" %}"/></a>');$(".top_link").css({position:"fixed",right:"15px",bottom:"15px",display:"none",padding:"20px",background:"#ccc","-moz-border-radius":"40px","-webkit-border-radius":"40px","border-radius":"40px",opacity:"0.9","z-index":"2000"});$(window).scroll(function(){posScroll=$(document).scrollTop();if(posScroll>=400)$(".top_link").fadeIn(600);else $(".top_link").fadeOut(600)})})</script> \ No newline at end of file | 12 | <script type="text/javascript">$(document).ready(function(){$("body").prepend('<a href="#top" class="top_link" title="{% trans "back to top" %}"><img src="./tpl/img/{{ constant("THEME") }}/backtotop.png" alt={% trans "back to top" %}"/></a>');$(window).scroll(function(){posScroll=$(document).scrollTop();if(posScroll>=400)$(".top_link").fadeIn(600);else $(".top_link").fadeOut(600)})})</script> \ No newline at end of file |
diff --git a/tpl/config.twig b/tpl/config.twig index 89d5bf84..9517fc32 100644 --- a/tpl/config.twig +++ b/tpl/config.twig | |||
@@ -17,7 +17,7 @@ | |||
17 | <li>firefox: <a href="https://bitbucket.org/jogaulupeau/poche/downloads/poche.xpi" title="download the firefox extension">download the extension</a></li> | 17 | <li>firefox: <a href="https://bitbucket.org/jogaulupeau/poche/downloads/poche.xpi" title="download the firefox extension">download the extension</a></li> |
18 | <li>chrome: <a href="https://bitbucket.org/jogaulupeau/poche/downloads/poche.crx" title="download the chrome extension">download the extension</a></li> | 18 | <li>chrome: <a href="https://bitbucket.org/jogaulupeau/poche/downloads/poche.crx" title="download the chrome extension">download the extension</a></li> |
19 | <li>android: <a href="https://bitbucket.org/jogaulupeau/poche/downloads/Poche.apk" title="download the application">download the application</a></li> | 19 | <li>android: <a href="https://bitbucket.org/jogaulupeau/poche/downloads/Poche.apk" title="download the application">download the application</a></li> |
20 | <li>bookmarklet: drag & drop this link to your bookmarks bar <a ondragend="this.click();" style="cursor: move; border: 1px dashed grey; background: white; padding: 5px;" title="i am a bookmarklet, use me !" href="javascript:if(top['bookmarklet-url@inthepoche.com']){top['bookmarklet-url@inthepoche.com'];}else{(function(){var%20url%20=%20location.href%20||%20url;window.open('{{ poche_url }}?action=add&url='%20+%20btoa(url),'_self');})();void(0);}">{% trans "poche it!" %}</a></li> | 20 | <li>bookmarklet: drag & drop this link to your bookmarks bar <a id="bookmarklet" ondragend="this.click();" title="i am a bookmarklet, use me !" href="javascript:if(top['bookmarklet-url@inthepoche.com']){top['bookmarklet-url@inthepoche.com'];}else{(function(){var%20url%20=%20location.href%20||%20url;window.open('{{ poche_url }}?action=add&url='%20+%20btoa(url),'_self');})();void(0);}">{% trans "poche it!" %}</a></li> |
21 | </ul> | 21 | </ul> |
22 | 22 | ||
23 | <h2>{% trans "Updating poche" %}</h2> | 23 | <h2>{% trans "Updating poche" %}</h2> |
diff --git a/tpl/css/style.css b/tpl/css/style.css index 1ae3a601..7633534c 100644 --- a/tpl/css/style.css +++ b/tpl/css/style.css | |||
@@ -229,6 +229,27 @@ a, a:hover, a:visited { | |||
229 | font-weight: bold; | 229 | font-weight: bold; |
230 | } | 230 | } |
231 | 231 | ||
232 | #bookmarklet { | ||
233 | padding: 5px; | ||
234 | border: 1px dashed #808080; | ||
235 | background: #fff; | ||
236 | cursor: move; | ||
237 | } | ||
238 | |||
239 | .top_link { | ||
240 | position: fixed; | ||
241 | right: 15px; | ||
242 | bottom: 15px; | ||
243 | display: none; | ||
244 | padding: 20px; | ||
245 | background: #ccc; | ||
246 | -moz-border-radius: 40px; | ||
247 | -webkit-border-radius: 40px; | ||
248 | border-radius: 40px; | ||
249 | opacity: 0.9; | ||
250 | z-index: 2000; | ||
251 | } | ||
252 | |||
232 | footer { | 253 | footer { |
233 | clear: both; | 254 | clear: both; |
234 | } | 255 | } |