diff options
| author | Asaad Mahmood <asaadmahmood@users.noreply.github.com> | 2017-03-09 20:05:11 +0500 |
|---|---|---|
| committer | George Goldberg <george@gberg.me> | 2017-03-09 15:05:11 +0000 |
| commit | 6ff46f30509819d518799561f66358dcd1ec4230 (patch) | |
| tree | 15c2d352c0275bf82b98f2c0e5179317180ff080 | |
| parent | cbead2d973fb70bf4dc644dd6a8b8c34b49ff6aa (diff) | |
| download | chat-6ff46f30509819d518799561f66358dcd1ec4230.tar.gz chat-6ff46f30509819d518799561f66358dcd1ec4230.tar.bz2 chat-6ff46f30509819d518799561f66358dcd1ec4230.zip | |
Multiple bug fixes (#5699)
* Multiple bug fixes
* Fixing modal on mobile
| -rw-r--r-- | webapp/components/access_history_modal.jsx | 1 | ||||
| -rw-r--r-- | webapp/components/activity_log_modal.jsx | 1 | ||||
| -rw-r--r-- | webapp/sass/layout/_markdown.scss | 7 | ||||
| -rw-r--r-- | webapp/sass/responsive/_mobile.scss | 7 | ||||
| -rw-r--r-- | webapp/sass/routes/_signup.scss | 3 |
5 files changed, 15 insertions, 4 deletions
diff --git a/webapp/components/access_history_modal.jsx b/webapp/components/access_history_modal.jsx index 28a2b6b8f..4e1e69e3e 100644 --- a/webapp/components/access_history_modal.jsx +++ b/webapp/components/access_history_modal.jsx @@ -79,6 +79,7 @@ export default class AccessHistoryModal extends React.Component { return ( <Modal + dialogClassName='modal--scroll' show={this.state.show} onHide={this.onHide} onExited={this.props.onHide} diff --git a/webapp/components/activity_log_modal.jsx b/webapp/components/activity_log_modal.jsx index cd369f742..aeebb56ae 100644 --- a/webapp/components/activity_log_modal.jsx +++ b/webapp/components/activity_log_modal.jsx @@ -275,6 +275,7 @@ export default class ActivityLogModal extends React.Component { return ( <Modal + dialogClassName='modal--scroll' show={this.state.show} onHide={this.onHide} onExited={this.props.onHide} diff --git a/webapp/sass/layout/_markdown.scss b/webapp/sass/layout/_markdown.scss index e6ab35f8a..1f8ea041e 100644 --- a/webapp/sass/layout/_markdown.scss +++ b/webapp/sass/layout/_markdown.scss @@ -51,6 +51,7 @@ .hljs { position: relative; + visibility: visible; } } @@ -163,11 +164,11 @@ code { } .hljs { + background: #f8f8f8; + color: #333; display: block; overflow-x: auto; padding: 0.5em; - color: #333; - background: #f8f8f8; } .container { @@ -175,7 +176,7 @@ code { } .links { - margin-top: 30px; font-size: 1.2em; + margin-top: 30px; } }
\ No newline at end of file diff --git a/webapp/sass/responsive/_mobile.scss b/webapp/sass/responsive/_mobile.scss index f31b325f6..891b0ed48 100644 --- a/webapp/sass/responsive/_mobile.scss +++ b/webapp/sass/responsive/_mobile.scss @@ -550,6 +550,13 @@ } .modal { + .modal--scroll { + .modal-body { + max-height: calc(100vh - 62px); + overflow: auto; + } + } + .nav-pills { > li { &.active { diff --git a/webapp/sass/routes/_signup.scss b/webapp/sass/routes/_signup.scss index c73c32656..13ee95e76 100644 --- a/webapp/sass/routes/_signup.scss +++ b/webapp/sass/routes/_signup.scss @@ -450,6 +450,7 @@ .signup-team-dir { background: #fafafa; border-top: 1px solid #d5d5d5; + overflow: hidden; &:first-child { border: none; @@ -458,7 +459,7 @@ .icon { cursor: pointer; float: left; - margin: 18px 7px 0 15px; + margin: 16px 7px 0 15px; opacity: .45; svg { |