Browse Source

[fix] grid textarea height

version-14
Rushabh Mehta 9 years ago
parent
commit
56857c4b7f
4 changed files with 7 additions and 7 deletions
  1. +1
    -1
      frappe/public/css/form_grid.css
  2. +2
    -2
      frappe/public/js/frappe/form/grid.js
  3. +3
    -3
      frappe/public/js/frappe/form/templates/grid_form.html
  4. +1
    -1
      frappe/public/less/form_grid.less

+ 1
- 1
frappe/public/css/form_grid.css View File

@@ -86,7 +86,7 @@
text-align: center;
}
.grid-body .editable-row textarea {
height: none;
height: 38px !important;
}
.grid-body .editable-row .field-area {
margin-right: -11px;


+ 2
- 2
frappe/public/js/frappe/form/grid.js View File

@@ -613,12 +613,12 @@ frappe.ui.form.GridRow = Class.extend({
// remove row
if(!this.remove_row) {
this.remove_row = $('<a class="close pull-right btn-open-row">\
<span class="octicon octicon-chevron-down"></span></a>')
<span class="octicon octicon-triangle-down"></span></a>')
.appendTo(this.row)
.on('click', function() { me.toggle_view(); return false; });

if(this.row.width() < 400) {
this.remove_row.css({'padding-right': '3px'});
this.remove_row.css({'padding-right': '1px'});
}
}
}


+ 3
- 3
frappe/public/js/frappe/form/templates/grid_form.html View File

@@ -2,16 +2,16 @@
<div class="toolbar">
<span class="panel-title">
{%= __("Editing Row") %} #<span class="grid-form-row-index"></span></span>
<button class="btn btn-success btn-xs pull-right" style="margin-left: 7px;">
<button class="btn btn-default btn-xs pull-right" style="margin-left: 7px;">
<i class="octicon octicon-check visible-xs" style="padding-bottom: 2px;"></i>
<span class="hidden-xs">{%= __("Done") %}</span></button>
<span class="hidden-xs octicon octicon-triangle-up"></span></button>
<button class="btn btn-default btn-xs pull-right grid-insert-row"
style="margin-left: 7px;">
{%= __("Insert Above") %}</button>
<button class="btn btn-danger btn-xs pull-right grid-delete-row">
<i class="octicon octicon-trashcan visible-xs"
style="padding-bottom: 2px; margin-top: 1px;"></i>
<span class="hidden-xs">{%= __("Remove") %}</span></button>
<span class="hidden-xs octicon octicon-x"></span></button>
</div>
</div>
<div class="grid-form-body">


+ 1
- 1
frappe/public/less/form_grid.less View File

@@ -107,7 +107,7 @@
}

textarea {
height: none;
height: 38px !important;
}

.field-area {


Loading…
Cancel
Save