orga0063
/
BootstrapAdmin
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'dev-animation' into dev

This commit is contained in:
Argo Zhang 2019-10-05 22:55:11 +08:00
parent 5399f00f5a 5d6b2d531d
commit e7525b617d
No known key found for this signature in database
GPG Key ID: 152E398953DDF19F
3 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/admin/Bootstrap.Admin/Views/Shared/_Layout.cshtml
View File

@ -14,7 +14,7 @@
<link href="../css/IE8.css" rel="stylesheet" /> <link href="../css/IE8.css" rel="stylesheet" />
<![endif]--> <![endif]-->
</head> </head>
<body> <body class="trans-mute">
<!--[if lt IE 10 ]> <!--[if lt IE 10 ]>
<div id="ieAlert" class="alert alert-danger alert-dismissible"> <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> <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>

4
src/admin/Bootstrap.Admin/wwwroot/css/site.css
View File

@ -1,4 +1,8 @@
/*Title*/ /*Title*/
body.trans-mute * {
transition: none !important;
}
.header { .header {
border-bottom: 1px solid #ddd; border-bottom: 1px solid #ddd;
padding: 0 15px; padding: 0 15px;

3
src/admin/Bootstrap.Admin/wwwroot/js/common-scripts.js
View File

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