Skip to content

Commit

Permalink
Fixed #3005 (#3006)
Browse files Browse the repository at this point in the history
  • Loading branch information
@StanZGenchev
StanZGenchev authored Nov 20, 2023
1 parent 0d3dc78 commit 30c346a
Show file tree
Hide file tree
Showing 2 changed files with 79 additions and 35 deletions.
26 changes: 26 additions & 0 deletions components/ide/ide-ui-schema/src/main/resources/META-INF/dirigible/ide-schema/css/styles.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,12 @@
padding: 0.438rem 0.875rem;
color: var(--sapButton_Lite_TextColor);
}

.mx-sidebar-icon:hover {
cursor: pointer;
background-color: var(--sapButton_Lite_Hover_Background #ebf5fe);
}

.outlineContainer {
background: var(--sapBackgroundColor, #f7f7f7);
box-sizing: border-box;
Expand All @@ -15,6 +17,11 @@
border-top: none;
border-right: none;
}

.editorContainer {
height: calc(100% - var(--fdToolbar_Height, 2.75rem));
}

div.mxPopupMenu {
background-color: var(--sapList_Background, #fff) !important;
font-size: var(--sapFontSize, 0.875rem);
Expand All @@ -36,29 +43,35 @@ div.mxPopupMenu {
border-radius: var(--sapElement_BorderCornerRadius, 0.25rem);
opacity: 1;
}

table.mxPopupMenu {
margin-top: 3px;
margin-bottom: 3px;
}

tr.mxPopupMenuItem {
color: var(--sapTextColor, #32363a) !important;
}

tr.mxPopupMenuItemHover {
color: var(--sapTextColor, #32363a) !important;
background-color: var(--sapList_Hover_Background, #f5f5f5);
}

td.mxPopupMenuItem {
padding: 0.625rem 0.625rem 0.625rem 0px;
white-space: nowrap;
font-family: var(--sapFontFamily, "72", "72full", Arial, Helvetica);
font-weight: 400;
font-size: var(--sapFontSize, 0.875rem);
}

td.mxPopupMenuIcon {
padding: 0.625rem !important;
color: var(--sapTextColor, #32363a);
background: transparent;
}

.dsm-table-icon {
color: var(--sapTextColor, #32363a);
margin-right: 0.125rem;
Expand All @@ -68,9 +81,22 @@ td.mxPopupMenuIcon {
width: 1rem;
height: 1rem;
}

.dsm-table-spacer {
display: inline-block;
width: 1rem;
height: 1px;
margin-right: 0.125rem;
}

@media only screen and (min-width: 853px) {
.dsmSmallScreen {
display: none;
}
}

@media only screen and (max-width: 852px) {
.dsmBigScreen {
display: none;
}
}
88 changes: 53 additions & 35 deletions components/ide/ide-ui-schema/src/main/resources/META-INF/dirigible/ide-schema/modeler.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,22 +41,26 @@
{{state.busyText}}
</fd-busy-indicator-extended>
<fd-toolbar id="toolbarContainer" ng-show="!state.error && !state.isBusy">
<fd-toolbar-spacer></fd-toolbar-spacer>
<fd-button dg-type="transparent" glyph="sap-icon--save" aria-label="Save" title="Save" ng-click="save()">
<fd-button dg-type="transparent" glyph="sap-icon--undo" aria-label="Undo" title="Undo" ng-click="undo()">
</fd-button>
<fd-button dg-type="transparent" glyph="sap-icon--list" aria-label="Properties" title="Properties"
ng-click="properties()">
<fd-button dg-type="transparent" glyph="sap-icon--redo" aria-label="Redo" title="Redo" ng-click="redo()">
</fd-button>
<fd-toolbar-separator></fd-toolbar-separator>
<fd-button dg-type="transparent" glyph="sap-icon--save" aria-label="Save" title="Save" ng-click="save()">
</fd-button>
<fd-toolbar-separator></fd-toolbar-separator>
<fd-button dg-type="transparent" glyph="sap-icon--copy" aria-label="Copy" title="Copy" ng-click="copy()">
</fd-button>
<fd-button dg-type="transparent" glyph="sap-icon--paste" aria-label="Paste" title="Paste"
ng-click="paste()">
</fd-button>
<fd-toolbar-separator></fd-toolbar-separator>
<fd-button dg-type="transparent" glyph="sap-icon--undo" aria-label="Undo" title="Undo" ng-click="undo()">
<fd-toolbar-spacer></fd-toolbar-spacer>
<fd-button dg-type="transparent" glyph="sap-icon--list" aria-label="Properties" title="Properties"
ng-click="properties()">
</fd-button>
<fd-button dg-type="transparent" glyph="sap-icon--redo" aria-label="Redo" title="Redo" ng-click="redo()">
<fd-toolbar-separator></fd-toolbar-separator>
<fd-button dg-type="transparent" glyph="sap-icon--tree" aria-label="Navigation" title="Navigation"
ng-click="navigation()">
</fd-button>
<fd-toolbar-separator></fd-toolbar-separator>
<fd-button dg-type="transparent" glyph="sap-icon--delete" aria-label="Delete" title="Delete"
Expand All @@ -69,38 +73,52 @@
ng-click="print()">
</fd-button>
<fd-toolbar-separator></fd-toolbar-separator>
<fd-button dg-type="transparent" glyph="sap-icon--database" aria-label="Show SQL" title="Show SQL"
ng-click="showSql()">
</fd-button>
<fd-button class="dsmBigScreen" dg-type="transparent" glyph="sap-icon--collapse" aria-label="Collapse all"
title="Collapse all" ng-click="collapseAll()">
</fd-button>
<fd-button class="dsmBigScreen" dg-type="transparent" glyph="sap-icon--expand" aria-label="Expand all"
title="Expand all" ng-click="expandAll()">
</fd-button>
<fd-toolbar-separator class="dsmBigScreen"></fd-toolbar-separator>
<fd-button class="dsmBigScreen" dg-type="transparent" glyph="sap-icon--zoom-in" aria-label="Zoom in"
title="Zoom in" ng-click="zoomIn()">
</fd-button>
<fd-button class="dsmBigScreen" dg-type="transparent" glyph="sap-icon--zoom-out" aria-label="Zoom out"
title="Zoom out" ng-click="zoomOut()">
</fd-button>
<fd-button class="dsmBigScreen" dg-type="transparent" glyph="sap-icon--search" aria-label="Actual size"
title="Actual size" ng-click="actualSize()">
</fd-button>
<fd-button class="dsmBigScreen" dg-type="transparent" glyph="sap-icon--exitfullscreen"
aria-label="Fit to screen" title="Fit" ng-click="fit()">
</fd-button>
<fd-toolbar-overflow class="dsmSmallScreen">
<fd-button dg-type="transparent" dg-label="Collapse all" glyph="sap-icon--collapse" is-overflow="true"
ng-click="collapseAll()">
</fd-button>
<fd-button dg-type="transparent" dg-label="Expand all" glyph="sap-icon--expand" is-overflow="true"
ng-click="expandAll()">
</fd-button>
<fd-toolbar-separator></fd-toolbar-separator>
<fd-button dg-type="transparent" dg-label="Zoom in" glyph="sap-icon--zoom-in" is-overflow="true"
ng-click="zoomIn()">
</fd-button>
<fd-button dg-type="transparent" dg-label="Zoom out" glyph="sap-icon--zoom-out" is-overflow="true"
ng-click="zoomOut()">
</fd-button>
<fd-button dg-type="transparent" dg-label="Actual size" glyph="sap-icon--search" is-overflow="true"
ng-click="actualSize()">
</fd-button>
<fd-button dg-type="transparent" dg-label="Fit to screen" glyph="sap-icon--exitfullscreen"
is-overflow="true" ng-click="fit()">
</fd-button>
</fd-toolbar-overflow>
</fd-toolbar>
<div class="dg-full-height dg-hbox" ng-show="!state.error && !state.isBusy">
<div class="dg-hbox editorContainer" ng-show="!state.error && !state.isBusy">
<div id="sidebarContainer" class="dg-vbox dg-border-right"></div>
<div id="graphContainer" class="dg-full-width"></div>
<div id="graphContainer" fd-scrollbar class="dg-full-width"></div>
</div>
<div id="outlineContainer" class="outlineContainer" ng-show="!state.error && !state.isBusy"></div>
<fd-toolbar id="statusContainer" class="dg-border-top" no-bottom-border="true"
ng-show="!state.error && !state.isBusy">
<fd-toolbar-spacer></fd-toolbar-spacer>
<fd-button dg-type="transparent" glyph="sap-icon--collapse" aria-label="Collapse all" title="Collapse all"
ng-click="collapseAll()">
</fd-button>
<fd-button dg-type="transparent" glyph="sap-icon--expand" aria-label="Expand all" title="Expand all"
ng-click="expandAll()">
</fd-button>
<fd-toolbar-separator></fd-toolbar-separator>
<fd-button dg-type="transparent" glyph="sap-icon--zoom-in" aria-label="Zoom in" title="Zoom in"
ng-click="zoomIn()">
</fd-button>
<fd-button dg-type="transparent" glyph="sap-icon--zoom-out" aria-label="Zoom out" title="Zoom out"
ng-click="zoomOut()">
</fd-button>
<fd-button dg-type="transparent" glyph="sap-icon--search" aria-label="Actual size" title="Actual size"
ng-click="actualSize()">
</fd-button>
<fd-button dg-type="transparent" glyph="sap-icon--exitfullscreen" aria-label="Fit to screen" title="Fit"
ng-click="fit()">
</fd-button>
</fd-toolbar>
<fd-message-page glyph="sap-icon--error" ng-if="state.error">
<fd-message-page-title>Editor encounterd an error!</fd-message-page-title>
<fd-message-page-subtitle>{{errorMessage}}</fd-message-page-subtitle>
Expand Down

0 comments on commit 30c346a

Please sign in to comment.