Skip to content

Commit

Permalink
Merge branch 'sap/release/4.7.11'
Browse files Browse the repository at this point in the history
  • Loading branch information
albertnahas committed Aug 23, 2021
2 parents cf5b0e6 + 6f364e0 commit e9796fb
Show file tree
Hide file tree
Showing 17 changed files with 39 additions and 32 deletions.
7 changes: 4 additions & 3 deletions webapp/config.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
(function() {
var version = "4.7.7";
var version = "4.7.10";
var sNamespace = "shortpoint-widget-beta";

var versionBuster = version.replace(/\./g, "00");
Expand Down Expand Up @@ -50,7 +50,7 @@

var root = prefix + "/~" + versionBuster + "~/" + webapp;
jQuery.sap.registerModulePath("shortpoint-root", root);
jQuery.sap.registerModulePath("shortpoint-libs", "https://d2zzvnmppezkx.cloudfront.net/sap/4.7.7" + "/libs");
jQuery.sap.registerModulePath("shortpoint-libs", "https://d2zzvnmppezkx.cloudfront.net/sap/4.7.10" + "/libs");

sap.ui.define(["./connections"], function (connections) {
"use strict";
Expand Down Expand Up @@ -92,7 +92,8 @@
scrollWrapperSelector: ".shortpoint-scroll-container",
platform: "sap",
version: version,
connectionTypes: oConnectionTypes
connectionTypes: oConnectionTypes,
rerenderOnThemeChange: false,
};

window.shortpoint_pre_config = oShortpointPreConfig; // eslint-disable-line camelcase
Expand Down
2 changes: 1 addition & 1 deletion webapp/controller/EditMode.controller.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion webapp/controller/RenderMode.controller.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

19 changes: 12 additions & 7 deletions webapp/css/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -116,17 +116,17 @@
}

/* making editor fixed */
.shortpoint-editor .fr-toolbar {
/* .shortpoint-editor .fr-toolbar {
position: fixed;
top: 15px;
left: 16px;
}
} */

/* Make SAP ShortPoint editor toolbar full width
30px from the right to account for the scroll bar */
.sp-platform-sap .shortpoint-editor .fr-toolbar {
width: auto !important;
right: 30px;
/* right: 30px; */
}

/* Make SAP ShortPoint editor toolbar account for the height of
Expand All @@ -136,7 +136,11 @@
}

.shortpoint-editor .fr-wrapper {
padding-top: 78px;
/* padding-top: 78px; */
}

.fr-toolbar.fr-top {
top: 0 !important;
}

/* disable fixed positioning on IE / Edge */
Expand Down Expand Up @@ -315,7 +319,8 @@

/* Support 5500 */
/* Hide preloaders until we figure out what is causing them to sometimes not go away */
.shortpoint-sk-root {
display: none !important;
}
.shortpoint-sk-root, .shortpoint-sk-wrap, .shrotpoint-sk-circle {
display: none !important;
}


8 changes: 4 additions & 4 deletions webapp/libs/css/shortpoint-engine-ltr.min.css

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions webapp/libs/css/shortpoint-engine-rtl.min.css

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions webapp/libs/css/shortpoint.inserter-ltr.min.css

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions webapp/libs/css/shortpoint.inserter-rtl.min.css

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions webapp/libs/js/RenderMode.controller.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit e9796fb

Please sign in to comment.