Merge pull request #1298 from modos189/v2_fix_material

fix material

2 files changed, 26 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 8ec83f89..25ec0bfc 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 {
@@ -80,6 +80,22 @@ nav, main, footer {
     float: right;
 }
 
+.nav-panels {
+    transition: background 0.2s ease;
+}
+
+.nav-panel-add .mdi-content-add,
+.nav-panel-search .mdi-action-search,
+.nav-panels .mdi-navigation-close {
+    color: #444 !important;
+}
+
+.nav-panels .action {
+    padding-left: 0.75rem;
+    font-size: 2.1rem;
+    white-space: nowrap;
+}
+
 /* ==========================================================================
    2 = Side-nav
    ========================================================================== */
@@ -129,7 +145,8 @@ main ul.row {
 }
 
 .data .card .card-content {
-    min-height: 25em;
+    height: 22em;
+    overflow: hidden;
 }
 
 .card .card-content .card-title {
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 b0f82c4b..eee3903e 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,19 +10,26 @@ $(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(){
         $(".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;
     });
     $('.mdi-navigation-close').click(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;
     });
 });
\ No newline at end of file