From 768303a573e20b80911c6442f22fa3cda3caa550 Mon Sep 17 00:00:00 2001 From: Alexandr Danilov Date: Fri, 7 Aug 2015 23:29:21 +0300 Subject: fix #1282 --- .../Resources/views/themes/material/public/css/main.css | 8 ++++++++ .../CoreBundle/Resources/views/themes/material/public/js/init.js | 2 ++ 2 files changed, 10 insertions(+) (limited to 'src/Wallabag/CoreBundle/Resources/views/themes/material/public') 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..3815ff3c 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 b0f82c4b..ff8bba7b 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 -- cgit v1.2.3 From 0e7650683d86413feeae07b99b1525c0e2089dcb Mon Sep 17 00:00:00 2001 From: Alexandr Danilov Date: Fri, 7 Aug 2015 23:59:11 +0300 Subject: Title in navigation bar --- .../CoreBundle/Resources/views/themes/material/public/css/main.css | 6 ++++++ .../CoreBundle/Resources/views/themes/material/public/js/init.js | 2 ++ 2 files changed, 8 insertions(+) (limited to 'src/Wallabag/CoreBundle/Resources/views/themes/material/public') 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 { 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 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(){ $('#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; -- cgit v1.2.3 From 342f0cc55aabd64dad2b819ca1c2fde6224b9579 Mon Sep 17 00:00:00 2001 From: Alexandr Danilov Date: Sat, 8 Aug 2015 00:00:11 +0300 Subject: 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)) --- .../CoreBundle/Resources/views/themes/material/public/css/main.css | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/Wallabag/CoreBundle/Resources/views/themes/material/public') 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 d5f03c91..154c1bc4 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 { -- cgit v1.2.3 From 946d6a512470613aa5ffa556b6547397064dd89f Mon Sep 17 00:00:00 2001 From: Alexandr Danilov Date: Sat, 8 Aug 2015 01:30:52 +0300 Subject: Preparation for adding links --- .../CoreBundle/Resources/views/themes/material/public/css/main.css | 4 +++- .../CoreBundle/Resources/views/themes/material/public/js/init.js | 3 +++ 2 files changed, 6 insertions(+), 1 deletion(-) (limited to 'src/Wallabag/CoreBundle/Resources/views/themes/material/public') 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 154c1bc4..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 @@ -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 6f5db066..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,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(){ -- cgit v1.2.3