diff options
| author | Hannah Chow <hannah_chow@brown.edu> | 2019-03-11 23:50:04 -0400 |
|---|---|---|
| committer | Hannah Chow <hannah_chow@brown.edu> | 2019-03-11 23:50:04 -0400 |
| commit | 888dd6f51befd156b24a3c60d56d8e5823e621ad (patch) | |
| tree | b6082a04695306357c379c0dcbffd0241e18d649 /src/client/views/collections/CollectionFreeFormView.scss | |
| parent | e5c0eab1b3896cf28b6f54f5893d2998b70ef9af (diff) | |
| parent | a680579f74380eb016f0ffd61b3818d0850984b5 (diff) | |
origin merged
Diffstat (limited to 'src/client/views/collections/CollectionFreeFormView.scss')
| -rw-r--r-- | src/client/views/collections/CollectionFreeFormView.scss | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/src/client/views/collections/CollectionFreeFormView.scss b/src/client/views/collections/CollectionFreeFormView.scss index ffd440310..2756874bf 100644 --- a/src/client/views/collections/CollectionFreeFormView.scss +++ b/src/client/views/collections/CollectionFreeFormView.scss @@ -48,6 +48,7 @@ background: $light-color-secondary; } +<<<<<<< HEAD border: 0px solid transparent; border-radius: $border-radius; box-sizing: border-box; @@ -58,6 +59,18 @@ height: 100%; overflow: hidden; .collectionfreeformview { +======= + .collectionfreeformview > .jsx-parser{ + position:absolute; + height: 100%; + } + .formattedTextBox-cont { + background:yellow; + } + + border-style: solid; + box-sizing: content-box; +>>>>>>> a680579f74380eb016f0ffd61b3818d0850984b5 position: absolute; top: 0; left: 0; |