aboutsummaryrefslogtreecommitdiffhomepage
path: root/themes/default
diff options
context:
space:
mode:
authorVincent Malley <vincent.malley@insalien.org>2015-06-02 11:09:37 -0400
committerVincent Malley <vincent.malley@insalien.org>2015-06-02 11:09:37 -0400
commit900f2a91604bf04e86ac7ff4a22f2b19439c6652 (patch)
tree0185d8b6fbd1ea5a48ad1ed2e79394cb3596f95e /themes/default
parentf9c8087f787b6ac38ca2c3b6a876a803860b8991 (diff)
parentddbb2308a3302e2d2d6ff89f4dd3235f85d335e1 (diff)
downloadwallabag-900f2a91604bf04e86ac7ff4a22f2b19439c6652.tar.gz
wallabag-900f2a91604bf04e86ac7ff4a22f2b19439c6652.tar.zst
wallabag-900f2a91604bf04e86ac7ff4a22f2b19439c6652.zip
Merge remote-tracking branch 'upstream/dev' into dev
Diffstat (limited to 'themes/default')
-rwxr-xr-xthemes/default/_import.twig2
1 files changed, 2 insertions, 0 deletions
diff --git a/themes/default/_import.twig b/themes/default/_import.twig
index c59b7a15..079203a2 100755
--- a/themes/default/_import.twig
+++ b/themes/default/_import.twig
@@ -2,11 +2,13 @@
2<!-- 2<!--
3 $(document).ready(function() { 3 $(document).ready(function() {
4 $("body").css("cursor", "wait"); 4 $("body").css("cursor", "wait");
5 $("#content").css("display", "none");
5 6
6 setTimeout(function(){ 7 setTimeout(function(){
7 window.location = './?import'; 8 window.location = './?import';
8 }, {{ import.delay }} ); 9 }, {{ import.delay }} );
9 }); 10 });
11
10//--> 12//-->
11</script> 13</script>
12<div class="messages warning"> 14<div class="messages warning">