diff options
| author | Fawn <fangrui_tong@brown.edu> | 2019-04-22 17:19:41 -0400 |
|---|---|---|
| committer | Fawn <fangrui_tong@brown.edu> | 2019-04-22 17:19:41 -0400 |
| commit | 227e8443a9fc9ca0c3f2e02e85dbd80b26a8b7b2 (patch) | |
| tree | 285f3387205bc083d4414c5c653df76903edb359 /src/client/views/DocumentDecorations.scss | |
| parent | b4e3302949a1997633e55bee5b0ab58757d5a2b0 (diff) | |
merge
Diffstat (limited to 'src/client/views/DocumentDecorations.scss')
| -rw-r--r-- | src/client/views/DocumentDecorations.scss | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/client/views/DocumentDecorations.scss b/src/client/views/DocumentDecorations.scss index 7bd50b716..4709cbab3 100644 --- a/src/client/views/DocumentDecorations.scss +++ b/src/client/views/DocumentDecorations.scss @@ -3,13 +3,9 @@ .documentDecorations { position: absolute; } -<<<<<<< HEAD -#documentDecorations-container { -======= .documentDecorations-container { z-index: $docDecorations-zindex; ->>>>>>> b63bcb791013766d5d16e4f38964499268f904c4 position: absolute; top: 0; left: 0; |