From 768303a573e20b80911c6442f22fa3cda3caa550 Mon Sep 17 00:00:00 2001 From: Alexandr Danilov Date: Fri, 7 Aug 2015 23:29:21 +0300 Subject: [PATCH 1/6] fix #1282 --- .../Resources/views/themes/material/public/css/main.css | 8 ++++++++ .../Resources/views/themes/material/public/js/init.js | 2 ++ 2 files changed, 10 insertions(+) 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 8ec83f899..3815ff3c6 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 @@ -80,6 +80,14 @@ nav, main, footer { float: right; } +.nav-panels { + transition: background 0.2s ease; +} + +.nav-panel-search .mdi-navigation-close, .nav-panel-search .mdi-action-search { + color: #444 !important; +} + /* ========================================================================== 2 = Side-nav ========================================================================== */ 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 b0f82c4bc..ff8bba7bc 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 @@ -16,6 +16,7 @@ $(document).ready(function(){ $(".nav-panel-buttom").hide(100); $(".nav-panel-search").show(100); $(".nav-panel-menu").addClass('hidden'); + $(".nav-panels").css('background', 'white'); return false; }); $('.mdi-navigation-close').click(function(){ @@ -23,6 +24,7 @@ $(document).ready(function(){ $(".nav-panel-search").hide(100); $(".nav-panel-buttom").show(100); $(".nav-panel-menu").removeClass('hidden'); + $(".nav-panels").css('background', 'transparent'); return false; }); }); \ No newline at end of file From 0e7650683d86413feeae07b99b1525c0e2089dcb Mon Sep 17 00:00:00 2001 From: Alexandr Danilov Date: Fri, 7 Aug 2015 23:59:11 +0300 Subject: [PATCH 2/6] Title in navigation bar --- .../Resources/views/themes/material/base.html.twig | 7 +++++++ .../Resources/views/themes/material/public/css/main.css | 6 ++++++ .../Resources/views/themes/material/public/js/init.js | 2 ++ 3 files changed, 15 insertions(+) diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/base.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/base.html.twig index a767f8cfd..773a37291 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/base.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/base.html.twig @@ -80,6 +80,13 @@
+
+ {% if currentRoute == 'unread' or currentRoute == 'homepage' %}{% trans %}Unread{% endtrans %}{% endif %} + {% if currentRoute == 'starred' %}{% trans %}Starred{% endtrans %}{% endif %} + {% if currentRoute == 'archive' %}{% trans %}Archive{% endtrans %}{% endif %} + {% if currentRoute == 'tags' %}{% trans %}Tags{% endtrans %}{% endif %} + {% if currentRoute == 'config' %}{% trans %}Config{% endtrans %}{% endif %} +
    • 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 3815ff3c6..d5f03c916 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 @@ -88,6 +88,12 @@ nav, main, footer { color: #444 !important; } +.nav-panels .action { + padding-left: 0.75rem; + font-size: 2.1rem; + white-space: nowrap; +} + /* ========================================================================== 2 = Side-nav ========================================================================== */ 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 ff8bba7bc..6f5db0669 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 @@ -15,6 +15,7 @@ $(document).ready(function(){ $('#nav-btn-search').click(function(){ $(".nav-panel-buttom").hide(100); $(".nav-panel-search").show(100); + $(".nav-panels .action").hide(100); $(".nav-panel-menu").addClass('hidden'); $(".nav-panels").css('background', 'white'); return false; @@ -23,6 +24,7 @@ $(document).ready(function(){ $(".nav-panel-add").hide(100); $(".nav-panel-search").hide(100); $(".nav-panel-buttom").show(100); + $(".nav-panels .action").show(100); $(".nav-panel-menu").removeClass('hidden'); $(".nav-panels").css('background', 'transparent'); return false; From 342f0cc55aabd64dad2b819ca1c2fde6224b9579 Mon Sep 17 00:00:00 2001 From: Alexandr Danilov Date: Sat, 8 Aug 2015 00:00:11 +0300 Subject: [PATCH 3/6] fix #1281 (When I save 10 articles, I've got 4 lines: 3 articles on 1st line, 3 on 2nd one, only 1 on 3rd line and 3 on last lines (chrome and firefox)) --- .../Resources/views/themes/material/public/css/main.css | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) 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 d5f03c916..154c1bc41 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 @@ -69,7 +69,7 @@ nav, main, footer { } .nav-panels { - overflov: hidden; + overflow: hidden; } .nav-panel-buttom li { @@ -143,7 +143,8 @@ main ul.row { } .data .card .card-content { - min-height: 25em; + height: 22em; + overflow: hidden; } .card .card-content .card-title { From c54ea989a3cadf49dbb991a4a270ebee38ac18d9 Mon Sep 17 00:00:00 2001 From: Alexandr Danilov Date: Sat, 8 Aug 2015 00:08:29 +0300 Subject: [PATCH 4/6] fix #1281 (notifications when we star articles are buggy) All notification corrected --- .../Resources/views/themes/material/layout.html.twig | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig index 54bba9a6a..632f8c8bb 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig @@ -51,4 +51,12 @@
+{% endblock %} + +{% block messages %} + {% for flashMessage in app.session.flashbag.get('notice') %} + + {% endfor %} {% endblock %} \ No newline at end of file From a6523cfe86a4555df4f02622db74e4df77f895c2 Mon Sep 17 00:00:00 2001 From: Alexandr Danilov Date: Sat, 8 Aug 2015 00:16:14 +0300 Subject: [PATCH 5/6] fix #1281 --- .../CoreBundle/Resources/views/base.html.twig | 26 ++-- .../views/themes/material/base.html.twig | 140 ------------------ .../views/themes/material/layout.html.twig | 69 ++++++++- 3 files changed, 75 insertions(+), 160 deletions(-) delete mode 100644 src/Wallabag/CoreBundle/Resources/views/themes/material/base.html.twig diff --git a/src/Wallabag/CoreBundle/Resources/views/base.html.twig b/src/Wallabag/CoreBundle/Resources/views/base.html.twig index 4f27f413f..f17feeddc 100644 --- a/src/Wallabag/CoreBundle/Resources/views/base.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/base.html.twig @@ -90,20 +90,22 @@ {% endblock %} - {% block precontent %}{% endblock %} +
+ {% block precontent %}{% endblock %} - {% block messages %} - {% for flashMessage in app.session.flashbag.get('notice') %} -
- × -

{{ flashMessage }}

-
- {% endfor %} - {% endblock %} + {% block messages %} + {% for flashMessage in app.session.flashbag.get('notice') %} +
+ × +

{{ flashMessage }}

+
+ {% endfor %} + {% endblock %} -
- {% block content %}{% endblock %} -
+
+ {% block content %}{% endblock %} +
+
{% block footer %} diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/base.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/base.html.twig deleted file mode 100644 index 773a37291..000000000 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/base.html.twig +++ /dev/null @@ -1,140 +0,0 @@ - - - - - - - - {% block head %} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {% block css %}{% endblock %} - {% block scripts %} - - - - - - - - {% endblock %} - - {% block title %}{% endblock %} - wallabag - {% endblock %} - - - - {% block header %} - {% endblock %} - -
- {% block menu %} - - {% endblock %} - -
- - {% block precontent %}{% endblock %} - - {% block messages %} - {% for flashMessage in app.session.flashbag.get('notice') %} -
- × -

{{ flashMessage }}

-
- {% endfor %} - {% endblock %} - -
- {% block content %}{% endblock %} -
- -
-
- - {% block footer %} -
-

{% trans %}powered by{% endtrans %} wallabag

-
- {% endblock %} - - diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig index 632f8c8bb..8a49190e8 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig @@ -18,6 +18,67 @@ {% block header %} {% endblock %} +{% block messages %} + {% for flashMessage in app.session.flashbag.get('notice') %} + + {% endfor %} +{% endblock %} + +{% block menu %} + +{% endblock %} + {% block footer %}
@@ -51,12 +112,4 @@
-{% endblock %} - -{% block messages %} - {% for flashMessage in app.session.flashbag.get('notice') %} - - {% endfor %} {% endblock %} \ No newline at end of file From 946d6a512470613aa5ffa556b6547397064dd89f Mon Sep 17 00:00:00 2001 From: Alexandr Danilov Date: Sat, 8 Aug 2015 01:30:52 +0300 Subject: [PATCH 6/6] Preparation for adding links --- .../Resources/views/themes/material/public/css/main.css | 4 +++- .../Resources/views/themes/material/public/js/init.js | 3 +++ 2 files changed, 6 insertions(+), 1 deletion(-) 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 154c1bc41..25ec0bfcb 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 @@ -84,7 +84,9 @@ nav, main, footer { transition: background 0.2s ease; } -.nav-panel-search .mdi-navigation-close, .nav-panel-search .mdi-action-search { +.nav-panel-add .mdi-content-add, +.nav-panel-search .mdi-action-search, +.nav-panels .mdi-navigation-close { color: #444 !important; } 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 6f5db0669..eee3903e8 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 @@ -10,6 +10,9 @@ $(document).ready(function(){ // $(".nav-panel-buttom").hide(100); // $(".nav-panel-add").show(100); // $(".nav-panel-menu").hide(100); + // $(".nav-panels .action").hide(100); + // $(".nav-panel-menu").addClass('hidden'); + // $(".nav-panels").css('background', 'white'); // return false; //}); $('#nav-btn-search').click(function(){