diff options
| author | laurawilsonri <laura_wilson@brown.edu> | 2019-02-24 14:37:07 -0500 |
|---|---|---|
| committer | laurawilsonri <laura_wilson@brown.edu> | 2019-02-24 14:37:07 -0500 |
| commit | f7b46167a7fd5d7ecf560dbd72e7d3295ba6c0c9 (patch) | |
| tree | cc96c12c49e6c03c98b0f0e6f642e0902948283b /src/client/views/nodes/FormattedTextBox.scss | |
| parent | 3ad38f0445178bdfe025e4f6da60f68f03876f56 (diff) | |
| parent | d9d55e422826da1fe87aa7973c92e54bc0c99f02 (diff) | |
Merge branch 'master' of https://github.com/browngraphicslab/Dash-Web into improveText
Diffstat (limited to 'src/client/views/nodes/FormattedTextBox.scss')
| -rw-r--r-- | src/client/views/nodes/FormattedTextBox.scss | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/client/views/nodes/FormattedTextBox.scss b/src/client/views/nodes/FormattedTextBox.scss index 492367fce..12604f843 100644 --- a/src/client/views/nodes/FormattedTextBox.scss +++ b/src/client/views/nodes/FormattedTextBox.scss @@ -1,7 +1,7 @@ .ProseMirror { - margin-top: -1em; width: 100%; - height: 100%; + height: auto; + min-height: 100% } .ProseMirror:focus { @@ -9,6 +9,11 @@ } .formattedTextBox-cont { +<<<<<<< HEAD background: white; padding: 1vw; +======= + background: beige; + padding: 0; +>>>>>>> d9d55e422826da1fe87aa7973c92e54bc0c99f02 }
\ No newline at end of file |