Merge branch 'dev-animation' into dev

2019-10-05 22:55:11 +08:00 · 2019-10-05 22:55:11 +08:00 · e7525b617d
parent 5399f00f5a 5d6b2d531d
commit e7525b617d
3 changed files with 8 additions and 1 deletions
--- a/src/admin/Bootstrap.Admin/Views/Shared/_Layout.cshtml
+++ b/src/admin/Bootstrap.Admin/Views/Shared/_Layout.cshtml
@ -14,7 +14,7 @@
        <link href="../css/IE8.css" rel="stylesheet" />
    <![endif]-->
 </head>
-<body>
+<body class="trans-mute">
    <!--[if lt IE 10 ]>
    <div id="ieAlert" class="alert alert-danger alert-dismissible">
        <div>当前浏览器版本太低，不支持本系统，请升级到至少IE10 <a href="../browser/IE10.exe" target="_blank">本地下载</a> <a href="https://support.microsoft.com/zh-cn/help/17621/internet-explorer-downloads" target="_blank">微软下载</a>，或者使用Chrome浏览器 <a href="../browser/ChromeSetup.exe" target="_blank">本地下载</a></div>
--- a/src/admin/Bootstrap.Admin/wwwroot/css/site.css
+++ b/src/admin/Bootstrap.Admin/wwwroot/css/site.css
@ -1,4 +1,8 @@
 /*Title*/
+body.trans-mute * {
+    transition: none !important;
+}
+
 .header {
    border-bottom: 1px solid #ddd;
    padding: 0 15px;
--- a/src/admin/Bootstrap.Admin/wwwroot/js/common-scripts.js
+++ b/src/admin/Bootstrap.Admin/wwwroot/js/common-scripts.js
@ -167,6 +167,9 @@
 })(jQuery);

 $(function () {
+    // enable animoation effect
+    $('body').removeClass('trans-mute');
+
    // 自动锁屏功能
    var mousePosition = { screenX: 0, screenY: 0 };
    var count = 1;