From 7102530defe146a11ffccb776da088c11f33a57a Mon Sep 17 00:00:00 2001
From: Reed Garmsen <rgarmsen2295@gmail.com>
Date: Tue, 7 Jul 2015 11:56:55 -0700
Subject: Prevent text areas from being resizeable

---
 web/sass-files/sass/partials/_base.scss | 1 +
 1 file changed, 1 insertion(+)

diff --git a/web/sass-files/sass/partials/_base.scss b/web/sass-files/sass/partials/_base.scss
index cf28e44e8..c3dcebbf5 100644
--- a/web/sass-files/sass/partials/_base.scss
+++ b/web/sass-files/sass/partials/_base.scss
@@ -53,6 +53,7 @@ div.theme {
 
 .form-control {
   @include border-radius(2px);
+  resize: none;
 }
 
 .form-group {
-- 
cgit v1.2.3-1-g7c22


From daaf331eb58062f2c97739d7c75f38e9a6e6b188 Mon Sep 17 00:00:00 2001
From: Reed Garmsen <rgarmsen2295@gmail.com>
Date: Tue, 7 Jul 2015 12:04:36 -0700
Subject: Changed textarea resizeability from being a blanket statement to
 everything to only the ones with issues

---
 web/react/components/edit_channel_modal.jsx | 2 +-
 web/react/components/get_link_modal.jsx     | 2 +-
 web/react/components/new_channel.jsx        | 2 +-
 web/sass-files/sass/partials/_base.scss     | 1 -
 4 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/web/react/components/edit_channel_modal.jsx b/web/react/components/edit_channel_modal.jsx
index f1f4eca40..255654fd5 100644
--- a/web/react/components/edit_channel_modal.jsx
+++ b/web/react/components/edit_channel_modal.jsx
@@ -43,7 +43,7 @@ module.exports = React.createClass({
                     <h4 className="modal-title" ref="title">Edit {this.state.title} Description</h4>
                   </div>
                   <div className="modal-body">
-                    <textarea className="form-control" rows="6" ref="channelDesc" maxLength="1024" value={this.state.description} onChange={this.handleUserInput}></textarea>
+                    <textarea className="form-control" style={{resize: "none"}} rows="6" ref="channelDesc" maxLength="1024" value={this.state.description} onChange={this.handleUserInput}></textarea>
                   </div>
                   <div className="modal-footer">
                     <button type="button" className="btn btn-default" data-dismiss="modal">Close</button>
diff --git a/web/react/components/get_link_modal.jsx b/web/react/components/get_link_modal.jsx
index 69e565185..bbfdce63a 100644
--- a/web/react/components/get_link_modal.jsx
+++ b/web/react/components/get_link_modal.jsx
@@ -38,7 +38,7 @@ module.exports = React.createClass({
                         <div className="modal-body">
                           <p>{"The link below is used for open " + strings.TeamPlural + " or if you allowed your " + strings.Team + " members to sign up using their " + strings.Company + " email addresses."}
                           </p>
-                          <textarea className="form-control" readOnly="true" value={this.state.value}></textarea>
+                          <textarea className="form-control" style={{resize: "none"}} readOnly="true" value={this.state.value}></textarea>
                         </div>
                         <div className="modal-footer">
                           <button type="button" className="btn btn-default" data-dismiss="modal">Close</button>
diff --git a/web/react/components/new_channel.jsx b/web/react/components/new_channel.jsx
index 13fa5b2cc..160241c1c 100644
--- a/web/react/components/new_channel.jsx
+++ b/web/react/components/new_channel.jsx
@@ -122,7 +122,7 @@ module.exports = React.createClass({
                                 </div>
                                 <div className="form-group">
                                     <label className='control-label'>Description</label>
-                                    <textarea className="form-control" ref="channel_desc" rows="3" placeholder="Description" maxLength="1024"></textarea>
+                                    <textarea className="form-control" style={{resize: "none"}} ref="channel_desc" rows="3" placeholder="Description" maxLength="1024"></textarea>
                                 </div>
                                 { server_error }
                             </form>
diff --git a/web/sass-files/sass/partials/_base.scss b/web/sass-files/sass/partials/_base.scss
index c3dcebbf5..cf28e44e8 100644
--- a/web/sass-files/sass/partials/_base.scss
+++ b/web/sass-files/sass/partials/_base.scss
@@ -53,7 +53,6 @@ div.theme {
 
 .form-control {
   @include border-radius(2px);
-  resize: none;
 }
 
 .form-group {
-- 
cgit v1.2.3-1-g7c22