diff options
| author | Vincent Malley <vincent.malley@insalien.org> | 2015-06-02 11:09:37 -0400 |
|---|---|---|
| committer | Vincent Malley <vincent.malley@insalien.org> | 2015-06-02 11:09:37 -0400 |
| commit | 900f2a91604bf04e86ac7ff4a22f2b19439c6652 (patch) | |
| tree | 0185d8b6fbd1ea5a48ad1ed2e79394cb3596f95e /themes | |
| parent | f9c8087f787b6ac38ca2c3b6a876a803860b8991 (diff) | |
| parent | ddbb2308a3302e2d2d6ff89f4dd3235f85d335e1 (diff) | |
| download | wallabag-900f2a91604bf04e86ac7ff4a22f2b19439c6652.tar.gz wallabag-900f2a91604bf04e86ac7ff4a22f2b19439c6652.tar.zst wallabag-900f2a91604bf04e86ac7ff4a22f2b19439c6652.zip | |
Merge remote-tracking branch 'upstream/dev' into dev
Diffstat (limited to 'themes')
| -rw-r--r-- | themes/_global/img/appicon/firefox-service-icon-16.png | bin | 0 -> 337 bytes | |||
| -rw-r--r-- | themes/_global/img/appicon/firefox-service-icon-32.png | bin | 0 -> 675 bytes | |||
| -rw-r--r-- | themes/_global/img/appicon/firefox-service-icon-64.png | bin | 0 -> 1616 bytes | |||
| -rwxr-xr-x | themes/default/_import.twig | 2 |
4 files changed, 2 insertions, 0 deletions
diff --git a/themes/_global/img/appicon/firefox-service-icon-16.png b/themes/_global/img/appicon/firefox-service-icon-16.png new file mode 100644 index 00000000..cfbbf604 --- /dev/null +++ b/themes/_global/img/appicon/firefox-service-icon-16.png | |||
| Binary files differ | |||
diff --git a/themes/_global/img/appicon/firefox-service-icon-32.png b/themes/_global/img/appicon/firefox-service-icon-32.png new file mode 100644 index 00000000..0c6dcc1b --- /dev/null +++ b/themes/_global/img/appicon/firefox-service-icon-32.png | |||
| Binary files differ | |||
diff --git a/themes/_global/img/appicon/firefox-service-icon-64.png b/themes/_global/img/appicon/firefox-service-icon-64.png new file mode 100644 index 00000000..6da3247f --- /dev/null +++ b/themes/_global/img/appicon/firefox-service-icon-64.png | |||
| Binary files differ | |||
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"> |
