Explorar el Código

Lighter placeholder, grid backdrop fix #1012

version-14
Anand Doshi hace 10 años
padre
commit
3940e4df2d
Se han modificado 3 ficheros con 14 adiciones y 10 borrados
  1. +4
    -3
      frappe/public/css/bootstrap.css
  2. +9
    -6
      frappe/public/js/frappe/dom.js
  3. +1
    -1
      frappe/public/js/frappe/form/grid.js

+ 4
- 3
frappe/public/css/bootstrap.css Ver fichero

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

+ 9
- 6
frappe/public/js/frappe/dom.js Ver fichero

@@ -71,22 +71,25 @@ frappe.dom = {
}) })
.appendTo("#body_div"); .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); setTimeout(function() { freeze.addClass("in") }, 1);

} else {
$("#freeze").addClass("in");
} }


frappe.dom.freeze_count++; frappe.dom.freeze_count++;
}, },
unfreeze: function() { unfreeze: function() {
if(!frappe.dom.freeze_count)return; // anything open?
if(!frappe.dom.freeze_count) return; // anything open?
frappe.dom.freeze_count--; frappe.dom.freeze_count--;
if(!frappe.dom.freeze_count) { if(!frappe.dom.freeze_count) {
var freeze = $('#freeze').removeClass("in"); var freeze = $('#freeze').removeClass("in");
setTimeout(function() { freeze.remove(); }, 150);
setTimeout(function() {
if(!frappe.dom.freeze_count) { freeze.remove(); }
}, 150);
} }
}, },
save_selection: function() { save_selection: function() {


+ 1
- 1
frappe/public/js/frappe/form/grid.js Ver fichero

@@ -397,7 +397,7 @@ frappe.ui.form.GridRow = Class.extend({
if (show===undefined) show = !!!open_row; if (show===undefined) show = !!!open_row;


// call blur // call blur
document.activeElement && document.activeElement.blur()
document.activeElement && document.activeElement.blur();


if(show && open_row) { if(show && open_row) {
if(open_row==this) { if(open_row==this) {


Cargando…
Cancelar
Guardar