diff options
| author | Bob Zeleznik <zzzman@gmail.com> | 2019-03-14 00:23:39 -0400 |
|---|---|---|
| committer | Bob Zeleznik <zzzman@gmail.com> | 2019-03-14 00:23:39 -0400 |
| commit | 100156a0cb778694455a04c8e254054b79f6a06f (patch) | |
| tree | 6418bcc043ace5400c1ce0c1e372c89fc596b215 /src/client/views/ContextMenu.scss | |
| parent | a7952cb33a695d7dd1dc89f5ffe0a98a2e0dfeff (diff) | |
| parent | 41f458fb4f383bfbf8d5b651189c2f4731262ff8 (diff) | |
Merge branch 'master' into ui_improvements
Diffstat (limited to 'src/client/views/ContextMenu.scss')
| -rw-r--r-- | src/client/views/ContextMenu.scss | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/src/client/views/ContextMenu.scss b/src/client/views/ContextMenu.scss index 20db5f3eb..f6830d9cd 100644 --- a/src/client/views/ContextMenu.scss +++ b/src/client/views/ContextMenu.scss @@ -22,7 +22,6 @@ } .contextMenu-item { -<<<<<<< HEAD width: auto; height: auto; background: $light-color-secondary; @@ -43,29 +42,6 @@ padding: 10px; white-space: nowrap; font-size: 13px; -======= - width: auto; - height: auto; - background: #F0F8FF; - display: flex; - justify-content: left; - align-items: center; - -webkit-touch-callout: none; - -webkit-user-select: none; - -khtml-user-select: none; - -moz-user-select: none; - -ms-user-select: none; - user-select: none; - transition: all .1s; - border-width: .11px; - border-style: none; - border-color: rgb(187, 186, 186); - border-bottom-style: solid; - padding: 10px; - white-space: nowrap; - // font-size: 1.5vw; - font-size: 12px; ->>>>>>> a680579f74380eb016f0ffd61b3818d0850984b5 } .contextMenu-item:hover { @@ -74,13 +50,6 @@ } .contextMenu-description { -<<<<<<< HEAD text-align: left; width: 8vw; } -======= - // font-size: 1.5vw; - text-align: left; - // width: 8vw; -} ->>>>>>> a680579f74380eb016f0ffd61b3818d0850984b5 |