Skip to content

Commit

Permalink
Merge pull request #1254 from slidewiki/fix-markdown-alignment
Browse files Browse the repository at this point in the history
Fix wrong alignment of unsaved Markdown slides
  • Loading branch information
aoelen authored Apr 17, 2020
2 parents 2a5260e + 6c6c926 commit 1e90795
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -350,7 +350,7 @@ class MarkdownEditor extends React.Component {
</div>
<div className="column" style={{boxShadow: 'rgba(0, 0, 0, 0.25) 0px 0px 12px', padding:0, margin: '0 20px'}}>
<SlideContentView content={this.props.title === this.state.title ? this.state.htmlContent: this.props.content}
speakernotes='' hideSpeakerNotes={true} theme={deckTheme} hideBorder={true}/>
speakernotes='' hideSpeakerNotes={true} theme={deckTheme} hideBorder={true} markdownEditorView={true} />
</div>
</div>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ class SlideContentView extends React.Component {
// for markdown slides, vertically align the content
const markdown = this.props.SlideEditStore.markdown;

if (markdown && markdown.length !== 0 && markdown.trim()) {
if (this.props.markdownEditorView || (markdown && markdown.length !== 0 && markdown.trim())) {
slideHTMLContent = '<div class="pptx2html" style="width: 960px; height:720px; position: relative; flex-direction: column; padding-left: 66px; flex-wrap: nowrap; align-items: stretch; display: flex; justify-content: center; line-height: 1.1">' + slideHTMLContent + '</div>';
} else {
// for legacy slides without a pptx2html element
Expand Down

0 comments on commit 1e90795

Please sign in to comment.