From a13c0bacfb58970b3316c75b18582ad24cf8bee4 Mon Sep 17 00:00:00 2001 From: ab Date: Sat, 9 Mar 2019 15:58:58 -0500 Subject: merge --- src/client/views/ContextMenu.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/client/views/ContextMenu.scss') diff --git a/src/client/views/ContextMenu.scss b/src/client/views/ContextMenu.scss index 2ac5d3b52..47a4e38ab 100644 --- a/src/client/views/ContextMenu.scss +++ b/src/client/views/ContextMenu.scss @@ -7,8 +7,8 @@ } .contextMenu-item { - width: 10vw; - height: 4vh; + width: 10vw; //10vw + height: auto; //4vh background: #DDDDDD; display: flex; justify-content: center; -- cgit v1.2.3-70-g09d2 From d2745992e5a4df1c92c8cb2edfb9829b7a1cc420 Mon Sep 17 00:00:00 2001 From: ab Date: Sat, 9 Mar 2019 16:07:24 -0500 Subject: idk --- src/client/views/ContextMenu.scss | 6 ------ 1 file changed, 6 deletions(-) (limited to 'src/client/views/ContextMenu.scss') 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; -- cgit v1.2.3-70-g09d2