diff options
| author | Scott Bell <scott@traclabs.com> | 2022-08-03 23:58:04 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-03 23:58:04 +0300 |
| commit | 2428bd8bc51d156849a9acc16faf93e15f20015d (patch) | |
| tree | 7a21093f771612132ad76bcdce75593be23c828f | |
| parent | 9cd4bdb535c7fdfca26387427fc01b51591b7f2f (diff) | |
| parent | 25de5653e888386a7339af2eab40520ab8cc0b83 (diff) | |
Merge branch 'release/2.0.7' into 5572-search-should-indicate-in-progress-and-no-results-states5572-search-should-indicate-in-progress-and-no-results-states
| -rw-r--r-- | package.json | 2 | ||||
| -rw-r--r-- | src/styles/_controls.scss | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/package.json b/package.json index 4ae90aafb..39d2f759d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "openmct", - "version": "2.1.0-SNAPSHOT", + "version": "2.0.7", "description": "The Open MCT core platform", "devDependencies": { "@babel/eslint-parser": "7.18.9", diff --git a/src/styles/_controls.scss b/src/styles/_controls.scss index 3e356036d..c98692578 100644 --- a/src/styles/_controls.scss +++ b/src/styles/_controls.scss @@ -25,13 +25,14 @@ /******************************************************** CONTROL-SPECIFIC MIXINS */ @mixin menuOuter() { border-radius: $basicCr; - box-shadow: $shdwMenuInner, $shdwMenu; + box-shadow: $shdwMenu; + @if $shdwMenuInner != none { + box-shadow: $shdwMenuInner, $shdwMenu; + } background: $colorMenuBg; color: $colorMenuFg; - //filter: $filterMenu; // 2022: causing all kinds of weird visual bugs in Chrome text-shadow: $shdwMenuText; padding: $interiorMarginSm; - //box-shadow: $shdwMenu; display: flex; flex-direction: column; position: absolute; @@ -60,14 +61,13 @@ cursor: pointer; display: flex; padding: nth($menuItemPad, 1) nth($menuItemPad, 2); - transition: $transIn; white-space: nowrap; @include hover { background: $colorMenuHovBg; color: $colorMenuHovFg; &:before { - color: $colorMenuHovIc; + color: $colorMenuHovIc !important; } } |