diff options
-rw-r--r-- | webapp/components/admin_console/ldap_test_button.jsx | 40 | ||||
-rw-r--r-- | webapp/components/pdf_preview.jsx | 9 | ||||
-rw-r--r-- | webapp/i18n/en.json | 2 | ||||
-rw-r--r-- | webapp/sass/components/_files.scss | 3 | ||||
-rw-r--r-- | webapp/sass/responsive/_mobile.scss | 12 | ||||
-rw-r--r-- | webapp/sass/routes/_admin-console.scss | 6 |
6 files changed, 49 insertions, 23 deletions
diff --git a/webapp/components/admin_console/ldap_test_button.jsx b/webapp/components/admin_console/ldap_test_button.jsx index fbe348158..082c13b1b 100644 --- a/webapp/components/admin_console/ldap_test_button.jsx +++ b/webapp/components/admin_console/ldap_test_button.jsx @@ -66,28 +66,32 @@ export default class LdapTestButton extends React.Component { let message = null; if (this.state.fail) { message = ( - <div className='alert alert-warning'> - <i className='fa fa-warning'/> - <FormattedMessage - id='admin.ldap.testFailure' - defaultMessage='LDAP Test Failure: {error}' - values={{ - error: this.state.fail - }} - /> + <div> + <div className='alert alert-warning'> + <i className='fa fa-warning'/> + <FormattedMessage + id='admin.ldap.testFailure' + defaultMessage='LDAP Test Failure: {error}' + values={{ + error: this.state.fail + }} + /> + </div> </div> ); } else if (this.state.success) { message = ( - <div className='alert alert-success'> - <i className='fa fa-success'/> - <FormattedMessage - id='admin.ldap.testSuccess' - defaultMessage='LDAP Test Successful' - values={{ - error: this.state.fail - }} - /> + <div> + <div className='alert alert-success'> + <i className='fa fa-success'/> + <FormattedMessage + id='admin.ldap.testSuccess' + defaultMessage='LDAP Test Successful' + values={{ + error: this.state.fail + }} + /> + </div> </div> ); } diff --git a/webapp/components/pdf_preview.jsx b/webapp/components/pdf_preview.jsx index fd1ca7758..7f0f06c03 100644 --- a/webapp/components/pdf_preview.jsx +++ b/webapp/components/pdf_preview.jsx @@ -164,12 +164,15 @@ export default class PDFPreview extends React.Component { if (this.state.pdf.numPages > MAX_PDF_PAGES) { pdfCanvases.push( - <div className='pdf-max-pages'> + <a + href={this.props.fileUrl} + className='pdf-max-pages' + > <FormattedMessage id='pdf_preview.max_pages' - defaultMessage='PDF previews only show the first five pages.' + defaultMessage='Download to read more pages' /> - </div> + </a> ); } diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json index 009e84de9..a3b777acc 100644 --- a/webapp/i18n/en.json +++ b/webapp/i18n/en.json @@ -1496,7 +1496,7 @@ "password_send.link": "<p>A password reset link has been sent to <b>{email}</b></p>", "password_send.reset": "Reset my password", "password_send.title": "Password Reset", - "pdf_preview.max_pages": "PDF previews only show the first five pages.", + "pdf_preview.max_pages": "Download to read more pages", "pending_post_actions.cancel": "Cancel", "pending_post_actions.retry": "Retry", "permalink.error.access": "Permalink belongs to a deleted message or to a channel to which you do not have access.", diff --git a/webapp/sass/components/_files.scss b/webapp/sass/components/_files.scss index 2239bdd1b..7b7588087 100644 --- a/webapp/sass/components/_files.scss +++ b/webapp/sass/components/_files.scss @@ -139,8 +139,9 @@ } .pdf-max-pages { - bottom: 0; background: $white; + bottom: 0; + display: block; left: 0; position: relative; width: 100%; diff --git a/webapp/sass/responsive/_mobile.scss b/webapp/sass/responsive/_mobile.scss index 5505aa353..32f3206a3 100644 --- a/webapp/sass/responsive/_mobile.scss +++ b/webapp/sass/responsive/_mobile.scss @@ -138,6 +138,10 @@ display: none; visibility: visible; + .sidebar--right & { + display: inline-block; + } + &.icon--show { display: inline-block; } @@ -1159,6 +1163,14 @@ } @media screen and (max-width: 320px) { + .tutorial-steps__container { + .tutorial__content { + .tutorial__steps { + padding: 0 20px; + width: 100%; + } + } + } .tip-overlay { &.tip-overlay--sidebar { min-height: 440px; diff --git a/webapp/sass/routes/_admin-console.scss b/webapp/sass/routes/_admin-console.scss index 09040cc78..cbed38a8b 100644 --- a/webapp/sass/routes/_admin-console.scss +++ b/webapp/sass/routes/_admin-console.scss @@ -52,6 +52,12 @@ } } + .btn { + &.btn-spacing--right { + margin-right: 10px; + } + } + .log__panel { background-color: white; border: 1px solid #ddd; |