diff options
| author | Christopher Speller <crspeller@gmail.com> | 2015-07-02 17:21:15 -0400 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2015-07-02 17:21:15 -0400 |
| commit | 681d4d3b78f06f669f7943cb13b5774e7656c740 (patch) | |
| tree | 703f46a94d9614867679f75c504bba6dc2a15e49 /web | |
| parent | 6e1d766d1dff23bfd917bcdfaca3830d4d848c76 (diff) | |
| parent | a3d521298a3b65dd3870deffecc8b95efa6cfabe (diff) | |
| download | chat-681d4d3b78f06f669f7943cb13b5774e7656c740.tar.gz chat-681d4d3b78f06f669f7943cb13b5774e7656c740.tar.bz2 chat-681d4d3b78f06f669f7943cb13b5774e7656c740.zip | |
Merge pull request #125 from asaadmahmoodspin/master
MM-1319 - Copy link and background change
Diffstat (limited to 'web')
| -rw-r--r-- | web/react/components/get_link_modal.jsx | 2 | ||||
| -rw-r--r-- | web/sass-files/sass/partials/_headers.scss | 2 | ||||
| -rw-r--r-- | web/sass-files/sass/partials/_responsive.scss | 2 |
3 files changed, 2 insertions, 4 deletions
diff --git a/web/react/components/get_link_modal.jsx b/web/react/components/get_link_modal.jsx index 334591ee3..69e565185 100644 --- a/web/react/components/get_link_modal.jsx +++ b/web/react/components/get_link_modal.jsx @@ -42,7 +42,7 @@ module.exports = React.createClass({ </div> <div className="modal-footer"> <button type="button" className="btn btn-default" data-dismiss="modal">Close</button> - <button data-copy-btn type="button" className="btn btn-primary" data-clipboard-text={this.state.value}>Copy Link</button> + <button data-copy-btn type="button" className="btn btn-primary pull-left" data-clipboard-text={this.state.value}>Copy Link</button> </div> </div> </div> diff --git a/web/sass-files/sass/partials/_headers.scss b/web/sass-files/sass/partials/_headers.scss index e240d5151..1ec1109a5 100644 --- a/web/sass-files/sass/partials/_headers.scss +++ b/web/sass-files/sass/partials/_headers.scss @@ -88,7 +88,7 @@ } .dropdown-menu { li a { - padding: 3 20px; + padding: 3px 20px; color: #555; } } diff --git a/web/sass-files/sass/partials/_responsive.scss b/web/sass-files/sass/partials/_responsive.scss index a34bbe8d8..0037879cf 100644 --- a/web/sass-files/sass/partials/_responsive.scss +++ b/web/sass-files/sass/partials/_responsive.scss @@ -6,7 +6,6 @@ &.other--root { .post-comment { margin-left: -7px; - background: #e8e8e8; } } } @@ -84,7 +83,6 @@ &.other--root { .post-comment { margin-left: -7px; - background: #e8e8e8; } } } |