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/documents/Documents.ts | |
| parent | 6b61bc19641b3c10658aba00b9cc2cddb6254049 (diff) | |
| parent | 3ff149e05a76fa0a0ace32a1b0c9876c4850aa2a (diff) | |
fixed merge conflicts
Diffstat (limited to 'src/client/documents/Documents.ts')
| -rw-r--r-- | src/client/documents/Documents.ts | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/client/documents/Documents.ts b/src/client/documents/Documents.ts index 15ecfbfe6..9770e5cdc 100644 --- a/src/client/documents/Documents.ts +++ b/src/client/documents/Documents.ts @@ -130,13 +130,13 @@ export namespace Documents { <div style="position:relative; margin:auto; height:85%;" >` + ImageBox.LayoutString() + `</div> - <div style="position:relative; overflow:auto; height:15%; text-align:center; ">` + <div style="position:relative; height:15%; text-align:center; ">` + FormattedTextBox.LayoutString("CaptionKey") + `</div> </div>` }; function FixedCaption() { return `<div style="position:absolute; height:30px; bottom:0; width:100%"> - <div style="position:absolute; width:100%; height:100%; overflow:auto;text-align:center;bottom:0;">` + <div style="position:absolute; width:100%; height:100%; text-align:center;bottom:0;">` + FormattedTextBox.LayoutString("CaptionKey") + `</div> </div>` }; |