Skip to content

Commit 2baf3f8

Browse files
authored
Merge pull request nasa#1733 from nasa/create-menu-1729
Review and integrate super-menu fixes and enhancements
2 parents 374c363 + 138cb19 commit 2baf3f8

File tree

11 files changed

+237
-189
lines changed

11 files changed

+237
-189
lines changed

platform/commonUI/edit/res/templates/create/create-button.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<div class="s-menu-button major create-button" ng-click="createController.toggle()">
2424
<span class="title-label">Create</span>
2525
</div>
26-
<div class="menu super-menu" ng-show="createController.isActive()">
26+
<div class="menu super-menu l-create-menu" ng-show="createController.isActive()">
2727
<mct-representation mct-object="domainObject" key="'create-menu'">
2828
</mct-representation>
2929
</div>

platform/commonUI/edit/res/templates/create/create-menu.html

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
this source code distribution or the Licensing information page available
2020
at runtime from the About dialog for additional information.
2121
-->
22-
<div class="contents" ng-controller="CreateMenuController">
23-
<div class="pane left menu-items">
22+
<div class="w-menu" ng-controller="CreateMenuController">
23+
<div class="col menu-items">
2424
<ul>
2525
<li ng-repeat="createAction in createActions" ng-click="createAction.perform()">
2626
<a ng-mouseover="representation.activeMetadata = createAction.getMetadata()"
@@ -31,13 +31,15 @@
3131
</li>
3232
</ul>
3333
</div>
34-
<div class="pane right menu-item-description">
34+
<div class="col menu-item-description">
3535
<div class="desc-area icon {{ representation.activeMetadata.cssClass }}"></div>
36-
<div class="desc-area title">
37-
{{representation.activeMetadata.name}}
38-
</div>
39-
<div class="desc-area description">
40-
{{representation.activeMetadata.description}}
36+
<div class="w-title-desc">
37+
<div class="desc-area title">
38+
{{representation.activeMetadata.name}}
39+
</div>
40+
<div class="desc-area description">
41+
{{representation.activeMetadata.description}}
42+
</div>
4143
</div>
4244
</div>
4345
</div>

platform/commonUI/general/res/sass/controls/_controls.scss

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -753,11 +753,15 @@ body.desktop {
753753
}
754754

755755
.overlay ::-webkit-scrollbar-thumb {
756-
$lr: 15%;
757756
background: $scrollbarThumbColorOverlay;
758757
&:hover { background: $scrollbarThumbColorOverlayHov; }
759758
}
760759

760+
.menu ::-webkit-scrollbar-thumb {
761+
background: $scrollbarThumbColorMenu;
762+
&:hover { background: $scrollbarThumbColorMenuHov; }
763+
}
764+
761765
::-webkit-scrollbar-corner {
762766
background: $scrollbarTrackColorBg;
763767
}

0 commit comments

Comments
 (0)