Skip to content

Commit 9204dad

Browse files
committed
correctiong layouts for new model
1 parent a283d7b commit 9204dad

9 files changed

+43
-18
lines changed

src/components-layout/VerticalLayout.tsx

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -33,20 +33,22 @@ export class VerticalLayout extends React.Component<LayoutProps, {}> {
3333
const { commands, mdeEditorState } = this.props;
3434

3535
return (
36-
<div className="vertical-layout">
36+
<div className="react-mde-vertical-layout">
3737
<MdeToolbar
3838
commands={commands}
3939
onCommand={this.handleCommand}
4040
/>
41-
<MdeEditor
42-
editorRef={(c) => this.editorRef = c}
43-
onChange={this.handleMdeStateChange}
44-
editorState={mdeEditorState}
45-
/>
46-
<MdePreview
47-
previewRef={(c) => this.previewRef = c}
48-
html={mdeEditorState ? mdeEditorState.html : ""}
49-
/>
41+
<div className="react-mde-content">
42+
<MdeEditor
43+
editorRef={(c) => this.editorRef = c}
44+
onChange={this.handleMdeStateChange}
45+
editorState={mdeEditorState}
46+
/>
47+
<MdePreview
48+
previewRef={(c) => this.previewRef = c}
49+
html={mdeEditorState ? mdeEditorState.html : ""}
50+
/>
51+
</div>
5052
</div>
5153
);
5254
}

src/styles/react-mde-all.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,5 @@
33
@import "react-mde-editor";
44
@import "react-mde-preview";
55
@import "react-mde";
6+
@import "react-mde-vertical-layout";
67
@import "react-mde-no-preview-layout";

src/styles/react-mde-editor.scss

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,8 @@
11
@import "variables";
22

33
.mde-text {
4-
border-width: 1px 0 1px 0;
5-
border-style: solid;
6-
border-color: $mde-border-color;
74

85
.public-DraftEditor-content {
9-
box-sizing: border-box;
106
width: 100%;
117
min-height: $mde-editor-min-height;
128
padding: $mde-editor-padding;

src/styles/react-mde-no-preview-layout-all.scss

Whitespace-only changes.

src/styles/react-mde-no-preview-layout.scss

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,5 @@
77

88
.mde-text {
99
overflow-y: auto;
10-
border-bottom: none;
1110
}
1211
}

src/styles/react-mde-vertical-layout-all.scss

Whitespace-only changes.
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,27 @@
1+
@import "variables";
2+
13
.react-mde-vertical-layout {
4+
height: 100%;
5+
display: flex;
6+
flex-direction: column;
7+
8+
.mde-header {
9+
border-bottom: 1px solid $mde-border-color;
10+
}
11+
12+
.react-mde-content {
13+
display: flex;
14+
flex-direction: column;
15+
16+
.mde-text {
17+
overflow-y: auto;
18+
height: 50%;
19+
}
220

21+
.mde-preview {
22+
overflow-y: auto;
23+
height: 50%;
24+
border-top: 1px solid $mde-border-color;
25+
}
26+
}
327
}

src/styles/react-mde.scss

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
@import "variables";
22

3+
* {
4+
box-sizing: border-box;
5+
}
6+
37
.react-mde {
4-
border: 1px solid $mde-border-color;
5-
border-radius: $mde-border-radius
8+
border: 1px solid $mde-border-color;
9+
border-radius: $mde-border-radius;
610
}

src/styles/variables.scss

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ $mde-border-color: #c8ccd0 !default;
33
$mde-button-color: #242729 !default;
44
$mde-toolbar-padding: 10px !default;
55
$mde-editor-min-height: 200px !default;
6-
$mde-editor-max-height: 200px !default;
76
$mde-editor-padding: 10px !default;
87
$mde-preview-horizontal-padding: 10px !default;
98
$mde-preview-padding: 10px 10px 20px 10px !default;

0 commit comments

Comments
 (0)