diff options
author | Alexandr Danilov <bitbucket@modos189.ru> | 2015-08-17 01:50:46 +0300 |
---|---|---|
committer | Alexandr Danilov <bitbucket@modos189.ru> | 2015-08-17 01:50:46 +0300 |
commit | fcb3faf10989caa0ec1fd27a6bad0b0abf0d77cc (patch) | |
tree | 870222548eeb8b7a62a2a1d31b67db0351133ad5 /src/Wallabag | |
parent | d75a9fa38b24b57fbbb11d52c17d56d04387718f (diff) | |
download | wallabag-fcb3faf10989caa0ec1fd27a6bad0b0abf0d77cc.tar.gz wallabag-fcb3faf10989caa0ec1fd27a6bad0b0abf0d77cc.tar.zst wallabag-fcb3faf10989caa0ec1fd27a6bad0b0abf0d77cc.zip |
My implementation progress bar at the top of the page #1348
Diffstat (limited to 'src/Wallabag')
3 files changed, 18 insertions, 0 deletions
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig index 4b0e1a7b..2aa9d1b8 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig | |||
@@ -3,6 +3,9 @@ | |||
3 | {% block title %}{{ entry.title|raw }} ({{ entry.domainName }}){% endblock %} | 3 | {% block title %}{{ entry.title|raw }} ({{ entry.domainName }}){% endblock %} |
4 | 4 | ||
5 | {% block menu %} | 5 | {% block menu %} |
6 | <div class="progress"> | ||
7 | <div class="determinate"></div> | ||
8 | </div> | ||
6 | <nav class="hide-on-large-only"> | 9 | <nav class="hide-on-large-only"> |
7 | <div class="nav-wrapper cyan darken-1"> | 10 | <div class="nav-wrapper cyan darken-1"> |
8 | <ul> | 11 | <ul> |
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/public/css/main.css b/src/Wallabag/CoreBundle/Resources/views/themes/material/public/css/main.css index cc1bbd3f..f06fd6db 100755 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/public/css/main.css +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/public/css/main.css | |||
@@ -269,6 +269,14 @@ main ul.row { | |||
269 | opacity: 1; | 269 | opacity: 1; |
270 | } | 270 | } |
271 | 271 | ||
272 | .progress { | ||
273 | position:fixed; | ||
274 | top:0px; | ||
275 | width: 100%; | ||
276 | height: 3px; | ||
277 | margin: 0; | ||
278 | z-index: 9999; | ||
279 | } | ||
272 | /* ========================================================================== | 280 | /* ========================================================================== |
273 | 6 = Media queries | 281 | 6 = Media queries |
274 | ========================================================================== */ | 282 | ========================================================================== */ |
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/public/js/init.js b/src/Wallabag/CoreBundle/Resources/views/themes/material/public/js/init.js index 5e5ea847..dffeaaad 100755 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/public/js/init.js +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/public/js/init.js | |||
@@ -46,4 +46,11 @@ $(document).ready(function(){ | |||
46 | $(".nav-panels").css('background', 'transparent'); | 46 | $(".nav-panels").css('background', 'transparent'); |
47 | return false; | 47 | return false; |
48 | }); | 48 | }); |
49 | $(window).scroll(function () { | ||
50 | var s = $(window).scrollTop(), | ||
51 | d = $(document).height(), | ||
52 | c = $(window).height(); | ||
53 | var scrollPercent = (s / (d-c)) * 100; | ||
54 | $(".progress .determinate").css('width', scrollPercent+'%'); | ||
55 | }); | ||
49 | }); | 56 | }); |