Compare commits

..

No commits in common. "30c803f76113b28cd7ca0723c00c4add3981e1df" and "fad4731136dd6ed926ad48c3af346db3a01efc0d" have entirely different histories.

3 changed files with 6 additions and 19 deletions

View File

@ -714,8 +714,6 @@ a:focus {
.sidebar-menu li > a > .pull-right-container { .sidebar-menu li > a > .pull-right-container {
position: absolute; position: absolute;
right: 10px; right: 10px;
}
.sidebar-collapse .sidebar-menu li > a > .pull-right-container {
top: 50%; top: 50%;
margin-top: -7px; margin-top: -7px;
} }
@ -1426,7 +1424,7 @@ select.form-control {
.input-lg + .form-control-feedback.fa, .input-lg + .form-control-feedback.fa,
.input-group-lg + .form-control-feedback.fa, .input-group-lg + .form-control-feedback.fa,
.form-group-lg .form-control + .form-control-feedback.fa { .form-group-lg .form-control + .form-control-feedback.fa {
line-height: 44px; line-height: 45px;
} }
.input-sm + .form-control-feedback.fa, .input-sm + .form-control-feedback.fa,
.input-group-sm + .form-control-feedback.fa, .input-group-sm + .form-control-feedback.fa,

View File

@ -134,13 +134,9 @@ define(['jquery', 'bootstrap', 'upload', 'validator', 'validator-lang'], functio
$(form).on("reset", function () { $(form).on("reset", function () {
setTimeout(function () { setTimeout(function () {
$(".selectpage", form).each(function () { $(".selectpage", form).each(function () {
if($(this).val()){ var selectpage = $(this).data("selectPageObject");
var selectpage = $(this).data("selectPageObject"); selectpage.elem.hidden.val($(this).val());
selectpage.elem.hidden.val($(this).val()); $(this).selectPageRefresh();
$(this).selectPageRefresh();
}else{
$(this).selectPageClear();
}
}); });
}, 1); }, 1);
}); });

View File

@ -164,15 +164,8 @@
> .pull-right-container { > .pull-right-container {
position: absolute; position: absolute;
right: 10px; right: 10px;
top: 50%;
margin-top: -7px;
} }
} }
.sidebar-collapse {
.sidebar-menu li > a {
> .pull-right-container {
top: 50%;
margin-top: -7px;
}
}
}