From 45cb8ef381e8bdec7c226293e48cbc170a736e7d Mon Sep 17 00:00:00 2001 From: laurier <14360417+laurieryayoi@users.noreply.github.com> Date: Thu, 8 Nov 2018 11:17:12 +0800 Subject: [PATCH] =?UTF-8?q?=E8=8A=82=E7=82=B9=E5=88=97=E8=A1=A8=E6=B8=90?= =?UTF-8?q?=E5=85=A5=E6=B8=90=E5=87=BA=E6=95=88=E6=9E=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/theme/material/css/base.min.css | 5 ++--- resources/views/material/user/node.tpl | 22 ++++++++++++++++------ 2 files changed, 18 insertions(+), 9 deletions(-) diff --git a/public/theme/material/css/base.min.css b/public/theme/material/css/base.min.css index 578dbea1..a0faa0e0 100755 --- a/public/theme/material/css/base.min.css +++ b/public/theme/material/css/base.min.css @@ -6463,7 +6463,7 @@ code.form-control { } .card-row,.node-table,.node-fade { - transition-duration: 1s; + transition-duration: .2s; transition-property: all; } @@ -6477,7 +6477,7 @@ code.form-control { border-radius: 10px; box-shadow: 2px 2px 7px 1px rgb(189, 189, 189); margin-top: 1em; - transition-duration: .1s; + transition-duration: .2s; transition-property: all; justify-content: space-between; padding: 0 1em; @@ -6485,7 +6485,6 @@ code.form-control { } .node-table { opacity: 1; - transition-delay: 1s; } .node-card:hover { transition-duration: .1s; diff --git a/resources/views/material/user/node.tpl b/resources/views/material/user/node.tpl index 9f1e5cb1..ad5c0c45 100755 --- a/resources/views/material/user/node.tpl +++ b/resources/views/material/user/node.tpl @@ -158,9 +158,10 @@
-
+
+ {$class=-1} {foreach $nodes as $node} - + {if $node['class']!=$class} {$class=$node['class']} @@ -418,14 +419,23 @@ }); {literal} $("#switch-cards").click(function (){ - $(".card-row").removeClass("node-fade"); - $(".node-table").addClass("node-fade"); - + $(".node-table").addClass("node-fade"); + setTimeout(function(){ + $(".card-row").css("display","grid"); + $(".node-table").css("display","none"); + },200); + setTimeout(function(){ + $(".card-row").removeClass("node-fade"); + },220); }); $("#switch-table").click(function (){ + $(".node-table").css("display","flex"); $(".card-row").addClass("node-fade"); - $(".node-table").removeClass("node-fade"); + setTimeout(function(){ + $(".card-row").css("display","none"); + $(".node-table").removeClass("node-fade"); + },200); });