diff options
author | Nicolas LÅ“uillet <nicolas@loeuillet.org> | 2015-08-10 19:35:23 +0200 |
---|---|---|
committer | Nicolas LÅ“uillet <nicolas@loeuillet.org> | 2015-08-10 19:35:23 +0200 |
commit | f59601fced49d04a38b27e8b017b5e35cd851747 (patch) | |
tree | 1774492e41b73c185a62842148806af0c35e300c /src/Wallabag/CoreBundle/Resources/views/themes/material/public | |
parent | f48a0189290ae6dbdb0412a3abd95acd257e55cd (diff) | |
parent | 0e654f62730e233f586a4efee0d654311a498b9e (diff) | |
download | wallabag-f59601fced49d04a38b27e8b017b5e35cd851747.tar.gz wallabag-f59601fced49d04a38b27e8b017b5e35cd851747.tar.zst wallabag-f59601fced49d04a38b27e8b017b5e35cd851747.zip |
Merge pull request #1298 from modos189/v2_fix_material
fix material
Diffstat (limited to 'src/Wallabag/CoreBundle/Resources/views/themes/material/public')
-rwxr-xr-x | src/Wallabag/CoreBundle/Resources/views/themes/material/public/css/main.css | 21 | ||||
-rwxr-xr-x | src/Wallabag/CoreBundle/Resources/views/themes/material/public/js/init.js | 7 |
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 { | |||
69 | } | 69 | } |
70 | 70 | ||
71 | .nav-panels { | 71 | .nav-panels { |
72 | overflov: hidden; | 72 | overflow: hidden; |
73 | } | 73 | } |
74 | 74 | ||
75 | .nav-panel-buttom li { | 75 | .nav-panel-buttom li { |
@@ -80,6 +80,22 @@ nav, main, footer { | |||
80 | float: right; | 80 | float: right; |
81 | } | 81 | } |
82 | 82 | ||
83 | .nav-panels { | ||
84 | transition: background 0.2s ease; | ||
85 | } | ||
86 | |||
87 | .nav-panel-add .mdi-content-add, | ||
88 | .nav-panel-search .mdi-action-search, | ||
89 | .nav-panels .mdi-navigation-close { | ||
90 | color: #444 !important; | ||
91 | } | ||
92 | |||
93 | .nav-panels .action { | ||
94 | padding-left: 0.75rem; | ||
95 | font-size: 2.1rem; | ||
96 | white-space: nowrap; | ||
97 | } | ||
98 | |||
83 | /* ========================================================================== | 99 | /* ========================================================================== |
84 | 2 = Side-nav | 100 | 2 = Side-nav |
85 | ========================================================================== */ | 101 | ========================================================================== */ |
@@ -129,7 +145,8 @@ main ul.row { | |||
129 | } | 145 | } |
130 | 146 | ||
131 | .data .card .card-content { | 147 | .data .card .card-content { |
132 | min-height: 25em; | 148 | height: 22em; |
149 | overflow: hidden; | ||
133 | } | 150 | } |
134 | 151 | ||
135 | .card .card-content .card-title { | 152 | .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(){ | |||
10 | // $(".nav-panel-buttom").hide(100); | 10 | // $(".nav-panel-buttom").hide(100); |
11 | // $(".nav-panel-add").show(100); | 11 | // $(".nav-panel-add").show(100); |
12 | // $(".nav-panel-menu").hide(100); | 12 | // $(".nav-panel-menu").hide(100); |
13 | // $(".nav-panels .action").hide(100); | ||
14 | // $(".nav-panel-menu").addClass('hidden'); | ||
15 | // $(".nav-panels").css('background', 'white'); | ||
13 | // return false; | 16 | // return false; |
14 | //}); | 17 | //}); |
15 | $('#nav-btn-search').click(function(){ | 18 | $('#nav-btn-search').click(function(){ |
16 | $(".nav-panel-buttom").hide(100); | 19 | $(".nav-panel-buttom").hide(100); |
17 | $(".nav-panel-search").show(100); | 20 | $(".nav-panel-search").show(100); |
21 | $(".nav-panels .action").hide(100); | ||
18 | $(".nav-panel-menu").addClass('hidden'); | 22 | $(".nav-panel-menu").addClass('hidden'); |
23 | $(".nav-panels").css('background', 'white'); | ||
19 | return false; | 24 | return false; |
20 | }); | 25 | }); |
21 | $('.mdi-navigation-close').click(function(){ | 26 | $('.mdi-navigation-close').click(function(){ |
22 | $(".nav-panel-add").hide(100); | 27 | $(".nav-panel-add").hide(100); |
23 | $(".nav-panel-search").hide(100); | 28 | $(".nav-panel-search").hide(100); |
24 | $(".nav-panel-buttom").show(100); | 29 | $(".nav-panel-buttom").show(100); |
30 | $(".nav-panels .action").show(100); | ||
25 | $(".nav-panel-menu").removeClass('hidden'); | 31 | $(".nav-panel-menu").removeClass('hidden'); |
32 | $(".nav-panels").css('background', 'transparent'); | ||
26 | return false; | 33 | return false; |
27 | }); | 34 | }); |
28 | }); \ No newline at end of file | 35 | }); \ No newline at end of file |