Parcourir la source

[fix] grid textarea height

version-14
Rushabh Mehta il y a 9 ans
Parent
révision
56857c4b7f
4 fichiers modifiés avec 7 ajouts et 7 suppressions
  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 Voir le fichier

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


+ 2
- 2
frappe/public/js/frappe/form/grid.js Voir le fichier

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


if(this.row.width() < 400) { 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 Voir le fichier

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


+ 1
- 1
frappe/public/less/form_grid.less Voir le fichier

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


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


.field-area { .field-area {


Chargement…
Annuler
Enregistrer