* PLT-4061 - Updating pdf preview pages message

* PLT-4063 - Fixing spacing for LDAP button

* PLT-3837 - Showing reply button on mobile in the RHS

* PLT-4046 - Cantering tutorial on older mobile versions
Этот коммит содержится в:
Asaad Mahmood
2016-09-06 22:38:54 +05:00
коммит произвёл Joram Wilander
родитель af0df81a97
Коммит 9a9ae3dcd1
6 изменённых файлов: 49 добавлений и 23 удалений

Просмотреть файл

@@ -66,28 +66,32 @@ export default class LdapTestButton extends React.Component {
let message = null; let message = null;
if (this.state.fail) { if (this.state.fail) {
message = ( message = (
<div className='alert alert-warning'> <div>
<i className='fa fa-warning'/> <div className='alert alert-warning'>
<FormattedMessage <i className='fa fa-warning'/>
id='admin.ldap.testFailure' <FormattedMessage
defaultMessage='LDAP Test Failure: {error}' id='admin.ldap.testFailure'
values={{ defaultMessage='LDAP Test Failure: {error}'
error: this.state.fail values={{
}} error: this.state.fail
/> }}
/>
</div>
</div> </div>
); );
} else if (this.state.success) { } else if (this.state.success) {
message = ( message = (
<div className='alert alert-success'> <div>
<i className='fa fa-success'/> <div className='alert alert-success'>
<FormattedMessage <i className='fa fa-success'/>
id='admin.ldap.testSuccess' <FormattedMessage
defaultMessage='LDAP Test Successful' id='admin.ldap.testSuccess'
values={{ defaultMessage='LDAP Test Successful'
error: this.state.fail values={{
}} error: this.state.fail
/> }}
/>
</div>
</div> </div>
); );
} }

Просмотреть файл

@@ -164,12 +164,15 @@ export default class PDFPreview extends React.Component {
if (this.state.pdf.numPages > MAX_PDF_PAGES) { if (this.state.pdf.numPages > MAX_PDF_PAGES) {
pdfCanvases.push( pdfCanvases.push(
<div className='pdf-max-pages'> <a
href={this.props.fileUrl}
className='pdf-max-pages'
>
<FormattedMessage <FormattedMessage
id='pdf_preview.max_pages' id='pdf_preview.max_pages'
defaultMessage='PDF previews only show the first five pages.' defaultMessage='Download to read more pages'
/> />
</div> </a>
); );
} }

Просмотреть файл

@@ -1496,7 +1496,7 @@
"password_send.link": "<p>A password reset link has been sent to <b>{email}</b></p>", "password_send.link": "<p>A password reset link has been sent to <b>{email}</b></p>",
"password_send.reset": "Reset my password", "password_send.reset": "Reset my password",
"password_send.title": "Password Reset", "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.cancel": "Cancel",
"pending_post_actions.retry": "Retry", "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.", "permalink.error.access": "Permalink belongs to a deleted message or to a channel to which you do not have access.",

Просмотреть файл

@@ -139,8 +139,9 @@
} }
.pdf-max-pages { .pdf-max-pages {
bottom: 0;
background: $white; background: $white;
bottom: 0;
display: block;
left: 0; left: 0;
position: relative; position: relative;
width: 100%; width: 100%;

Просмотреть файл

@@ -138,6 +138,10 @@
display: none; display: none;
visibility: visible; visibility: visible;
.sidebar--right & {
display: inline-block;
}
&.icon--show { &.icon--show {
display: inline-block; display: inline-block;
} }
@@ -1159,6 +1163,14 @@
} }
@media screen and (max-width: 320px) { @media screen and (max-width: 320px) {
.tutorial-steps__container {
.tutorial__content {
.tutorial__steps {
padding: 0 20px;
width: 100%;
}
}
}
.tip-overlay { .tip-overlay {
&.tip-overlay--sidebar { &.tip-overlay--sidebar {
min-height: 440px; min-height: 440px;

Просмотреть файл

@@ -52,6 +52,12 @@
} }
} }
.btn {
&.btn-spacing--right {
margin-right: 10px;
}
}
.log__panel { .log__panel {
background-color: white; background-color: white;
border: 1px solid #ddd; border: 1px solid #ddd;