diff options
| author | madelinegr <laura_wilson@brown.edu> | 2019-02-26 16:25:33 -0500 |
|---|---|---|
| committer | madelinegr <laura_wilson@brown.edu> | 2019-02-26 16:25:33 -0500 |
| commit | aa87aa5c549661d825f2b53fae0cdc549d454c60 (patch) | |
| tree | ee02811202e3849ac9d2ca484cb5c489fec9907a /src/client/views/nodes/FormattedTextBox.scss | |
| parent | 6b61bc19641b3c10658aba00b9cc2cddb6254049 (diff) | |
| parent | 3ff149e05a76fa0a0ace32a1b0c9876c4850aa2a (diff) | |
fixed merge conflicts
Diffstat (limited to 'src/client/views/nodes/FormattedTextBox.scss')
| -rw-r--r-- | src/client/views/nodes/FormattedTextBox.scss | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/client/views/nodes/FormattedTextBox.scss b/src/client/views/nodes/FormattedTextBox.scss index 0389a3f85..f06fdae24 100644 --- a/src/client/views/nodes/FormattedTextBox.scss +++ b/src/client/views/nodes/FormattedTextBox.scss @@ -9,8 +9,10 @@ } .formattedTextBox-cont { - background: beige; - padding: 0; + background: rgb(218, 215, 215); + padding: 1; + border: black; + border-width: 10; overflow-y: scroll; overflow-x: hidden; color: initial; |