This is an automated email from the ASF dual-hosted git repository.
jeb pushed a commit to branch SLING-7858
in repository
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-app-cms.git
The following commit(s) were added to refs/heads/SLING-7858 by this push:
new 5eaf05c cleaning up editor
5eaf05c is described below
commit 5eaf05c184719c9495db5bf33e5a6ef2f2c5a1ef
Author: Jason E Bailey <[email protected]>
AuthorDate: Wed Aug 29 13:06:16 2018 -0400
cleaning up editor
increased zindex of outer frame modal and worked on separating out a
component edit mode css
---
ui/src/main/frontend/package.json | 3 +--
ui/src/main/frontend/src/js/scripts.js | 4 ++--
ui/src/main/frontend/src/scss/bulma.scss | 1 +
.../libs/sling-cms/components/editor/scripts/finalize.jsp | 8 +++++---
4 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/ui/src/main/frontend/package.json
b/ui/src/main/frontend/package.json
index 27190df..57e6ec3 100644
--- a/ui/src/main/frontend/package.json
+++ b/ui/src/main/frontend/package.json
@@ -26,8 +26,7 @@
"streamqueue": "^1.1.2",
"uglify-save-license": "^0.4.1",
"bulma": "^0.7.1",
- "datatables-bulma": "^1.0.1",
- "node-sass": "^4.9.2"
+ "datatables-bulma": "^1.0.1"
},
"license": "Apache-2.0"
}
\ No newline at end of file
diff --git a/ui/src/main/frontend/src/js/scripts.js
b/ui/src/main/frontend/src/js/scripts.js
index 2c381b9..f3fc15a 100644
--- a/ui/src/main/frontend/src/js/scripts.js
+++ b/ui/src/main/frontend/src/js/scripts.js
@@ -47,10 +47,10 @@ Sling.CMS = {
window.scrollTo(0, 0);
},
confirmMessage: function(title, message, cb){
- var $modal = $('<div class="modal"><div
class="modal-background"></div><div class="modal-card"><div
class="modal-card-head Draggable">'+title+'</div><div
class="modal-card-body">'+message+'</div><div class="Modal-Footer"><button
type="button" class="modal-close">OK</button></div></div>');
+ var $modal = $('<div class="modal"><div
class="modal-background"></div><div class="modal-card"><div
class="modal-card-head Draggable">'+title+'</div><div
class="modal-card-body">'+message+'</div><div class="modal-card-foot"><button
type="button" class="close-modal button is-primary">OK</button></div></div>');
$('body').append($modal);
$modal.addClass('is-active');
- $modal.find('.modal-close').click(function(){
+ $modal.find('.close-modal').click(function(){
$modal.css('display','none').remove();
cb();
});
diff --git a/ui/src/main/frontend/src/scss/bulma.scss
b/ui/src/main/frontend/src/scss/bulma.scss
index 945acb8..89d68a9 100644
--- a/ui/src/main/frontend/src/scss/bulma.scss
+++ b/ui/src/main/frontend/src/scss/bulma.scss
@@ -17,6 +17,7 @@
@charset "utf-8";
$navbar-height: 5rem;
$navbar-item-img-max-height: 4rem;
+$modal-z: 2000;
@import "../../node_modules/bulma/bulma.sass";
@import "../../node_modules/datatables-bulma/css/dataTables.bulma.css";
\ No newline at end of file
diff --git
a/ui/src/main/resources/jcr_root/libs/sling-cms/components/editor/scripts/finalize.jsp
b/ui/src/main/resources/jcr_root/libs/sling-cms/components/editor/scripts/finalize.jsp
index b26a9cc..388b67b 100644
---
a/ui/src/main/resources/jcr_root/libs/sling-cms/components/editor/scripts/finalize.jsp
+++
b/ui/src/main/resources/jcr_root/libs/sling-cms/components/editor/scripts/finalize.jsp
@@ -19,13 +19,15 @@
<%@include file="/libs/sling-cms/global.jsp"%>
<c:if test="${cmsEditEnabled == 'true'}">
<script src="/static/clientlibs/sling-cms-editor/editor.js"></script>
- <div class="Sling-CMS__modal-background">
+ <div class="Sling-CMS__modal-background modal">
<div class="Sling-CMS__modal-box">
- <div class="Sling-CMS__modal-frame-header">
+ <div class="modal-card">
+ <div class="Sling-CMS__modal-frame-header
modal-card-head">
<span
class="Sling-CMS__modal-frame-title"></span>
<button class="Sling-CMS__modal-close
Sling-CMS__edit-button">x</button>
</div>
- <div class="Sling-CMS__modal-frame-container">
+ <div class="Sling-CMS__modal-frame-container
model-card-body">
+ </div>
</div>
</div>
</div>
