Lighter placeholder, grid backdrop fix #1012

This commit is contained in:
Anand Doshi 2015-02-17 16:46:40 +05:30
parent d66352db62
commit 3940e4df2d
3 changed files with 14 additions and 10 deletions

View file

@ -2558,14 +2558,14 @@ output {
box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 3px rgba(206, 213, 219, .6);
}
.form-control::-moz-placeholder {
color: #999;
color: #d1d8dd;
opacity: 1;
}
.form-control:-ms-input-placeholder {
color: #999;
color: #d1d8dd;
}
.form-control::-webkit-input-placeholder {
color: #999;
color: #d1d8dd;
}
.form-control[disabled],
.form-control[readonly],
@ -6609,3 +6609,4 @@ h4.modal-title {
.navbar-search-icon {
color: #b8c2cb;
}
/*# sourceMappingURL=bootstrap.css.map */

View file

@ -71,22 +71,25 @@ frappe.dom = {
})
.appendTo("#body_div");
if (msg) {
freeze.html(repl('<div class="freeze-message-container"><div class="freeze-message">%(msg)s</div></div>',
{msg: msg}));
}
freeze.html(repl('<div class="freeze-message-container"><div class="freeze-message">%(msg)s</div></div>',
{msg: msg || ""}));
setTimeout(function() { freeze.addClass("in") }, 1);
} else {
$("#freeze").addClass("in");
}
frappe.dom.freeze_count++;
},
unfreeze: function() {
if(!frappe.dom.freeze_count)return; // anything open?
if(!frappe.dom.freeze_count) return; // anything open?
frappe.dom.freeze_count--;
if(!frappe.dom.freeze_count) {
var freeze = $('#freeze').removeClass("in");
setTimeout(function() { freeze.remove(); }, 150);
setTimeout(function() {
if(!frappe.dom.freeze_count) { freeze.remove(); }
}, 150);
}
},
save_selection: function() {

View file

@ -397,7 +397,7 @@ frappe.ui.form.GridRow = Class.extend({
if (show===undefined) show = !!!open_row;
// call blur
document.activeElement && document.activeElement.blur()
document.activeElement && document.activeElement.blur();
if(show && open_row) {
if(open_row==this) {