diff options
| author | Hannah Chow <hannah_chow@brown.edu> | 2019-03-11 23:50:04 -0400 |
|---|---|---|
| committer | Hannah Chow <hannah_chow@brown.edu> | 2019-03-11 23:50:04 -0400 |
| commit | 888dd6f51befd156b24a3c60d56d8e5823e621ad (patch) | |
| tree | b6082a04695306357c379c0dcbffd0241e18d649 /src/client/views/ContextMenu.scss | |
| parent | e5c0eab1b3896cf28b6f54f5893d2998b70ef9af (diff) | |
| parent | a680579f74380eb016f0ffd61b3818d0850984b5 (diff) | |
origin merged
Diffstat (limited to 'src/client/views/ContextMenu.scss')
| -rw-r--r-- | src/client/views/ContextMenu.scss | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/src/client/views/ContextMenu.scss b/src/client/views/ContextMenu.scss index f6830d9cd..20db5f3eb 100644 --- a/src/client/views/ContextMenu.scss +++ b/src/client/views/ContextMenu.scss @@ -22,6 +22,7 @@ } .contextMenu-item { +<<<<<<< HEAD width: auto; height: auto; background: $light-color-secondary; @@ -42,6 +43,29 @@ 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 { @@ -50,6 +74,13 @@ } .contextMenu-description { +<<<<<<< HEAD text-align: left; width: 8vw; } +======= + // font-size: 1.5vw; + text-align: left; + // width: 8vw; +} +>>>>>>> a680579f74380eb016f0ffd61b3818d0850984b5 |