Merge pull request #294 from asaadmahmoodspin/master

Improving smoothness of RHS search

7 files changed, 18 insertions, 11 deletions

diff --git a/web/react/components/delete_channel_modal.jsx b/web/react/components/delete_channel_modal.jsx
index e23a37740..64ceec450 100644
--- a/web/react/components/delete_channel_modal.jsx
+++ b/web/react/components/delete_channel_modal.jsx
@@ -47,7 +47,7 @@ module.exports = React.createClass({
                     </p>
                   </div>
                   <div className="modal-footer">
-                    <button type="button" className="btn btn-default" data-dismiss="modal">Close</button>
+                    <button type="button" className="btn btn-default" data-dismiss="modal">Cancel</button>
                     <button type="button" className="btn btn-danger" data-dismiss="modal" onClick={this.handleDelete}>Delete</button>
                   </div>
                 </div>
diff --git a/web/react/components/edit_channel_modal.jsx b/web/react/components/edit_channel_modal.jsx
index a35a531b5..1b0cc185f 100644
--- a/web/react/components/edit_channel_modal.jsx
+++ b/web/react/components/edit_channel_modal.jsx
@@ -63,7 +63,7 @@ module.exports = React.createClass({
                     { server_error }
                   </div>
                   <div className="modal-footer">
-                    <button type="button" className="btn btn-default" data-dismiss="modal">Close</button>
+                    <button type="button" className="btn btn-default" data-dismiss="modal">Cancel</button>
                     <button type="button" className="btn btn-primary" onClick={this.handleEdit}>Save</button>
                   </div>
                 </div>
diff --git a/web/react/components/invite_member_modal.jsx b/web/react/components/invite_member_modal.jsx
index 94be2acd6..fed96b50a 100644
--- a/web/react/components/invite_member_modal.jsx
+++ b/web/react/components/invite_member_modal.jsx
@@ -212,7 +212,7 @@ module.exports = React.createClass({
                                 <span>People invited automatically join Town Square channel.</span>
                             </div>
                             <div className="modal-footer">
-                              <button type="button" className="btn btn-default" data-dismiss="modal">Close</button>
+                              <button type="button" className="btn btn-default" data-dismiss="modal">Cancel</button>
                               <button onClick={this.handleSubmit} type="button" className="btn btn-primary">Send Invitations</button>
                             </div>
                           </div>
diff --git a/web/react/components/rename_channel_modal.jsx b/web/react/components/rename_channel_modal.jsx
index d67ab3afe..26593b7fa 100644
--- a/web/react/components/rename_channel_modal.jsx
+++ b/web/react/components/rename_channel_modal.jsx
@@ -139,7 +139,7 @@ module.exports = React.createClass({
                             </form>
                         </div>
                         <div className="modal-footer">
-                            <button type="button" className="btn btn-default" data-dismiss="modal">Close</button>
+                            <button type="button" className="btn btn-default" data-dismiss="modal">Cancel</button>
                             <button onClick={this.handleSubmit} type="button" className="btn btn-primary">Save</button>
                         </div>
                     </div>
diff --git a/web/react/components/rename_team_modal.jsx b/web/react/components/rename_team_modal.jsx
index dfd775a3b..bebdd6662 100644
--- a/web/react/components/rename_team_modal.jsx
+++ b/web/react/components/rename_team_modal.jsx
@@ -83,7 +83,7 @@ module.exports = React.createClass({
                             </form>
                         </div>
                         <div className="modal-footer">
-                            <button type="button" className="btn btn-default" data-dismiss="modal">Close</button>
+                            <button type="button" className="btn btn-default" data-dismiss="modal">Cancel</button>
                             <button onClick={this.handleSubmit} type="button" className="btn btn-primary">Save</button>
                         </div>
                     </div>
diff --git a/web/sass-files/sass/partials/_responsive.scss b/web/sass-files/sass/partials/_responsive.scss
index 81b94ab5a..e3f140413 100644
--- a/web/sass-files/sass/partials/_responsive.scss
+++ b/web/sass-files/sass/partials/_responsive.scss
@@ -427,9 +427,9 @@
     body {
         &.white {
             .inner__wrap {
-            >.row.content {
-                margin-bottom: -185px;
-            }
+                >.row.content {
+                    margin-bottom: -185px;
+                }
             }
         }
     }
@@ -447,6 +447,9 @@
             }
         }
     }
+    .search__clear {
+        display: block;
+    }
     .search-bar__container {
         padding: 0;
         height: 45px;
@@ -457,15 +460,17 @@
                 @include translateX(-45px);
             }
             .search__form {
-                padding-left: 10px;
-                padding-right: 67px;
+                @include translateX(-45px);
+                padding-left: 55px;
+                padding-right: 24px;
             }
             .search__clear {
-                display: block;
+                @include translateX(0px);
             }
         }
         .search__form {
             border: none;
+            @include translateX(0px);
             padding: 7px 20px 0 49px;
             height: 45px;
             position: relative;
diff --git a/web/sass-files/sass/partials/_search.scss b/web/sass-files/sass/partials/_search.scss
index e2168ef75..9ae41ebb0 100644
--- a/web/sass-files/sass/partials/_search.scss
+++ b/web/sass-files/sass/partials/_search.scss
@@ -7,6 +7,8 @@
 	right: 0;
 	line-height: 45px;
 	margin-right: 13px;
+	@include single-transition(all, 0.2s, linear);
+	@include translateX(60px);
 	z-index: 5;
 	cursor: pointer;
 }