aboutsummaryrefslogtreecommitdiff
path: root/src/client/views/DocumentDecorations.scss
diff options
context:
space:
mode:
authorFawn <fangrui_tong@brown.edu>2019-04-22 00:09:25 -0400
committerFawn <fangrui_tong@brown.edu>2019-04-22 00:09:25 -0400
commit97dcec0e5ac07deb9af9acb16948cc6678778cba (patch)
tree74dd3d2bd938a5ab5b3bb082a8fc2846eefa5999 /src/client/views/DocumentDecorations.scss
parente794b4b38e8ab2f4e7a79f223f9488cc845c724f (diff)
parentb63bcb791013766d5d16e4f38964499268f904c4 (diff)
merge
Diffstat (limited to 'src/client/views/DocumentDecorations.scss')
-rw-r--r--src/client/views/DocumentDecorations.scss13
1 files changed, 11 insertions, 2 deletions
diff --git a/src/client/views/DocumentDecorations.scss b/src/client/views/DocumentDecorations.scss
index 14f3359ca..7bd50b716 100644
--- a/src/client/views/DocumentDecorations.scss
+++ b/src/client/views/DocumentDecorations.scss
@@ -3,15 +3,19 @@
.documentDecorations {
position: absolute;
}
+<<<<<<< HEAD
#documentDecorations-container {
+=======
+.documentDecorations-container {
+ z-index: $docDecorations-zindex;
+>>>>>>> b63bcb791013766d5d16e4f38964499268f904c4
position: absolute;
top: 0;
left: 0;
display: grid;
- z-index: $docDecorations-zindex;
grid-template-rows: 20px 8px 1fr 8px;
- grid-template-columns: 8px 8px 1fr 8px 8px;
+ grid-template-columns: 8px 16px 1fr 8px 8px;
pointer-events: none;
#documentDecorations-centerCont {
@@ -91,6 +95,11 @@
pointer-events: all;
text-align: center;
cursor: pointer;
+ position: absolute;
+ left: 0px;
+ top: 0px;
+ width: $MINIMIZED_ICON_SIZE;
+ height: $MINIMIZED_ICON_SIZE;
}
.documentDecorations-background {