IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2026-08-26 21:27:40 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #294 from asaadmahmoodspin/master

Browse Source 
Improving smoothness of RHS search
This commit is contained in:
Joram Wilander
2015-07-31 08:50:05 -04:00
parent 8265e5ed82 eae619e170
commit 0ecc1dba81
7 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
web/react/components/delete_channel_modal.jsx
+1 -1
View File
@@ -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>
web/react/components/edit_channel_modal.jsx
+1 -1
View File
@@ -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>
web/react/components/invite_member_modal.jsx
+1 -1
View File
@@ -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>
web/react/components/rename_channel_modal.jsx
+1 -1
View File
@@ -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>
web/react/components/rename_team_modal.jsx
+1 -1
View File
@@ -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>
web/sass-files/sass/partials/_responsive.scss
+11 -6
View File
@@ -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;
web/sass-files/sass/partials/_search.scss
+2
View File
@@ -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;
}