From 56857c4b7fe9c85a600a829647c0c937dd7b79cd Mon Sep 17 00:00:00 2001
From: Rushabh Mehta <rmehta@gmail.com>
Date: Fri, 8 Jul 2016 14:57:45 +0530
Subject: [PATCH] [fix] grid textarea height

---
 frappe/public/css/form_grid.css                       | 2 +-
 frappe/public/js/frappe/form/grid.js                  | 4 ++--
 frappe/public/js/frappe/form/templates/grid_form.html | 6 +++---
 frappe/public/less/form_grid.less                     | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/frappe/public/css/form_grid.css b/frappe/public/css/form_grid.css
index c296fe0cce..bf2f372760 100644
--- a/frappe/public/css/form_grid.css
+++ b/frappe/public/css/form_grid.css
@@ -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;
diff --git a/frappe/public/js/frappe/form/grid.js b/frappe/public/js/frappe/form/grid.js
index 4fa6958b6e..5891caf8aa 100644
--- a/frappe/public/js/frappe/form/grid.js
+++ b/frappe/public/js/frappe/form/grid.js
@@ -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'});
 					}
 				}
 			}
diff --git a/frappe/public/js/frappe/form/templates/grid_form.html b/frappe/public/js/frappe/form/templates/grid_form.html
index 0cc8d4a370..648990eee7 100644
--- a/frappe/public/js/frappe/form/templates/grid_form.html
+++ b/frappe/public/js/frappe/form/templates/grid_form.html
@@ -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">
diff --git a/frappe/public/less/form_grid.less b/frappe/public/less/form_grid.less
index dff94b84e1..2f398b15a8 100644
--- a/frappe/public/less/form_grid.less
+++ b/frappe/public/less/form_grid.less
@@ -107,7 +107,7 @@
 		}
 
 		textarea {
-			height: none;
+			height: 38px !important;
 		}
 
 		.field-area {