uhhhh

1 files changed, 53 insertions, 0 deletions

diff --git a/src/client/views/DocumentDecorations.scss b/src/client/views/DocumentDecorations.scss
index 722980019..f39f31c3b 100644
--- a/src/client/views/DocumentDecorations.scss
+++ b/src/client/views/DocumentDecorations.scss
@@ -1,5 +1,6 @@
 @import "global_variables";
 #documentDecorations-container {
+<<<<<<< HEAD
   position: absolute;
   display: grid;
   z-index: 1000;
@@ -31,3 +32,55 @@
     cursor: ew-resize;
   }
 }
+=======
+    position: absolute;
+    display: grid;
+    z-index: 1000;
+    grid-template-rows: 20px 1fr 20px 0px;
+    grid-template-columns: 20px 1fr 20px;
+    pointer-events: none;
+    #documentDecorations-centerCont {
+        background: none;
+    }
+    .documentDecorations-resizer {
+        pointer-events: auto;
+        background: lightblue;
+        opacity: 0.4;
+    }
+    #documentDecorations-topLeftResizer,
+    #documentDecorations-bottomRightResizer {
+        cursor: nwse-resize;
+    }
+    #documentDecorations-topRightResizer,
+    #documentDecorations-bottomLeftResizer {
+        cursor: nesw-resize;
+    }
+    #documentDecorations-topResizer,
+    #documentDecorations-bottomResizer {
+        cursor: ns-resize;
+    }
+    #documentDecorations-leftResizer,
+    #documentDecorations-rightResizer {
+        cursor: ew-resize;
+    }
+    
+}
+.linkButton-empty {
+    height: 20px;
+    width: 20px;
+    margin-top: 10px;
+    border-radius: 50%;
+    opacity: 0.6;
+    pointer-events: auto;
+    background-color: #2B6091;
+}
+.linkButton-nonempty {
+    height: 20px;
+    width: 20px;
+    margin-top: 10px;
+    border-radius: 50%;
+    opacity: 0.6;
+    pointer-events: auto;
+    background-color: rgb(35, 165, 42);
+}
+>>>>>>> 618e66a5a070f1aac9224bd3f44b76a5ac314bfa