diff options
| author | ab <abdullah_ahmed@brown.edu> | 2019-03-09 16:07:24 -0500 |
|---|---|---|
| committer | ab <abdullah_ahmed@brown.edu> | 2019-03-09 16:07:24 -0500 |
| commit | d2745992e5a4df1c92c8cb2edfb9829b7a1cc420 (patch) | |
| tree | 7eedc1103d4200b79a83e601cf4a468668315bde | |
| parent | a2b90031fe06701b0ecc7c6fa3b48c933e4d37b8 (diff) | |
idk
| -rw-r--r-- | src/client/views/ContextMenu.scss | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/src/client/views/ContextMenu.scss b/src/client/views/ContextMenu.scss index 89351c76c..a83572279 100644 --- a/src/client/views/ContextMenu.scss +++ b/src/client/views/ContextMenu.scss @@ -7,15 +7,9 @@ } .contextMenu-item { -<<<<<<< HEAD width: 10vw; //10vw height: auto; //4vh background: #DDDDDD; -======= - width: auto; - height: auto; - background: #F0F8FF; ->>>>>>> 09928503be98d605052fba65dcd2f91f9b056f23 display: flex; justify-content: left; align-items: center; |