aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorAlexandr Danilov <bitbucket@modos189.ru>2015-08-07 23:59:11 +0300
committerAlexandr Danilov <bitbucket@modos189.ru>2015-08-07 23:59:11 +0300
commit0e7650683d86413feeae07b99b1525c0e2089dcb (patch)
treecbd1811b63d31944d704bfa67e060de2ddf6e082
parent768303a573e20b80911c6442f22fa3cda3caa550 (diff)
downloadwallabag-0e7650683d86413feeae07b99b1525c0e2089dcb.tar.gz
wallabag-0e7650683d86413feeae07b99b1525c0e2089dcb.tar.zst
wallabag-0e7650683d86413feeae07b99b1525c0e2089dcb.zip
Title in navigation bar
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/material/base.html.twig7
-rwxr-xr-xsrc/Wallabag/CoreBundle/Resources/views/themes/material/public/css/main.css6
-rwxr-xr-xsrc/Wallabag/CoreBundle/Resources/views/themes/material/public/js/init.js2
3 files changed, 15 insertions, 0 deletions
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 a767f8cf..773a3729 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 @@
80 </ul> 80 </ul>
81 <div class="nav-wrapper nav-panels"> 81 <div class="nav-wrapper nav-panels">
82 <a href="#" data-activates="slide-out" class="nav-panel-menu button-collapse"><i class="mdi-navigation-menu"></i></a> 82 <a href="#" data-activates="slide-out" class="nav-panel-menu button-collapse"><i class="mdi-navigation-menu"></i></a>
83 <div class="left action">
84 {% if currentRoute == 'unread' or currentRoute == 'homepage' %}{% trans %}Unread{% endtrans %}{% endif %}
85 {% if currentRoute == 'starred' %}{% trans %}Starred{% endtrans %}{% endif %}
86 {% if currentRoute == 'archive' %}{% trans %}Archive{% endtrans %}{% endif %}
87 {% if currentRoute == 'tags' %}{% trans %}Tags{% endtrans %}{% endif %}
88 {% if currentRoute == 'config' %}{% trans %}Config{% endtrans %}{% endif %}
89 </div>
83 <div class="input-field nav-panel-buttom"> 90 <div class="input-field nav-panel-buttom">
84 <ul> 91 <ul>
85 <li class="bold"><a class="waves-effect" href="{{ path('new_entry') }}" id="nav-btn-add"><i class="mdi-content-add"></i></a></li> 92 <li class="bold"><a class="waves-effect" href="{{ path('new_entry') }}" id="nav-btn-add"><i class="mdi-content-add"></i></a></li>
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 3815ff3c..d5f03c91 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 {
88 color: #444 !important; 88 color: #444 !important;
89} 89}
90 90
91.nav-panels .action {
92 padding-left: 0.75rem;
93 font-size: 2.1rem;
94 white-space: nowrap;
95}
96
91/* ========================================================================== 97/* ==========================================================================
92 2 = Side-nav 98 2 = Side-nav
93 ========================================================================== */ 99 ========================================================================== */
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 ff8bba7b..6f5db066 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(){
15 $('#nav-btn-search').click(function(){ 15 $('#nav-btn-search').click(function(){
16 $(".nav-panel-buttom").hide(100); 16 $(".nav-panel-buttom").hide(100);
17 $(".nav-panel-search").show(100); 17 $(".nav-panel-search").show(100);
18 $(".nav-panels .action").hide(100);
18 $(".nav-panel-menu").addClass('hidden'); 19 $(".nav-panel-menu").addClass('hidden');
19 $(".nav-panels").css('background', 'white'); 20 $(".nav-panels").css('background', 'white');
20 return false; 21 return false;
@@ -23,6 +24,7 @@ $(document).ready(function(){
23 $(".nav-panel-add").hide(100); 24 $(".nav-panel-add").hide(100);
24 $(".nav-panel-search").hide(100); 25 $(".nav-panel-search").hide(100);
25 $(".nav-panel-buttom").show(100); 26 $(".nav-panel-buttom").show(100);
27 $(".nav-panels .action").show(100);
26 $(".nav-panel-menu").removeClass('hidden'); 28 $(".nav-panel-menu").removeClass('hidden');
27 $(".nav-panels").css('background', 'transparent'); 29 $(".nav-panels").css('background', 'transparent');
28 return false; 30 return false;