Authored by 陈轩

fix

... ... @@ -11,7 +11,7 @@ var express = require('express'),
var app = express();
// set view engin
var doraemon = path.join(__dirname, '../../doraemon/views'); //parent view root
var doraemon = path.join(__dirname, '../../doraemon/views'); // parent view root
app.on('mount', function(parent) {
delete parent.locals.settings; // 不继承父 App 的设置
... ...
/**
* router of sub app home
* router of sub app home
* @author: shenzm<zhimin.shen@yoho.cn>
* @date: 2016/07/18
*/
... ... @@ -11,4 +11,4 @@ const cRoot = './controllers';
// Your controller here
module.exports = router;
\ No newline at end of file
module.exports = router;
... ...
... ... @@ -27,7 +27,7 @@ function tip(param) {
}
const tipView = `<div class="tip-box"><div class="tip">${viewData.txt}</div></div>`;
const $oldTip = $('.tip');
const $oldTip = $('.tip-box');
if ($oldTip.length) {
timer = $oldTip.data('timer');
... ... @@ -38,7 +38,7 @@ function tip(param) {
const $tip = $(tipView).appendTo(document.body);
$tip.data('timer', setTimeout(function() {
$tip.remove();
// $tip.remove();
}, viewData.delay));
}
... ...
.badge {
min-width: 16px;
padding: 3px 7px;
margin-left: 10px;
margin-right: 10px;
border-radius: 9999px;
font-size: 14px;
line-height: 1;
... ... @@ -16,4 +18,5 @@
position: absolute;
top: -5px;
right: -11px;
margin: 0;
}
... ...
... ... @@ -78,10 +78,10 @@
display: none;
&:checked ~ label {
border: 2px solid #4bd865;
box-shadow: inset 0 0 0 calc(19px) #4bd865;
box-shadow: inset 0 0 0 calc(20px) #4bd865;
}
&:checked ~ label:after {
left: calc(54px - 34px);
left: calc(80px - 40px);
box-shadow: 0 5px 5px -1px rgba(0, 0, 0, 0.2), 0 0 0 2px #4bd865;
}
... ... @@ -96,8 +96,8 @@
label {
position: relative;
display: inline-block;
width: 54px;
height: 34px;
width: 80px;
height: 44px;
background-color: $white;
border: 2px solid #ddd;
border-radius: 99999px;
... ... @@ -107,13 +107,13 @@
content: "";
position: absolute;
left: 0;
width: 30px;
height: 30px;
width: 40px;
height: 40px;
border: none;
border-radius: 50%;
background-color: $white;
box-shadow: 0 5px 5px -1px rgba(0, 0, 0, 0.2), 0 0 0 2px #ddd;
transition: 0.3s;
transition: 0.4s;
}
}
}
... ...