SAK-40068 - Update featherlight in PA system to one used in library

thinhld80 · Jun 1, 2018 · 33b3e75 · 33b3e75
1 parent 7cab999
commit 33b3e75
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 13 deletions.
diff --git a/pasystem/pasystem-impl/impl/src/resources/templates/shared_footer.hbs b/pasystem/pasystem-impl/impl/src/resources/templates/shared_footer.hbs
@@ -17,7 +17,7 @@ function paSystemJQueryOK() {
 
 if (paSystemJQueryOK()) {
   document.write('\x3Cscript src="/pasystem-tool/scripts/pasystem.js{{portalCDNQuery}}">\x3C/script>');
-  document.write('\x3Cscript type="text/javascript" src="/pasystem-tool/scripts/featherlight.min.js{{portalCDNQuery}}">\x3C/script>');
+  document.write('\x3Cscript>includeWebjarLibrary(\'featherlight\')\x3C/script>');
 
   var pasystem = pasystem || {'loaded': true};
 } else {

diff --git a/pasystem/pasystem-tool/tool/src/webapp/scripts/featherlight.min.js b/pasystem/pasystem-tool/tool/src/webapp/scripts/featherlight.min.js
diff --git a/pasystem/pasystem-tool/tool/src/webapp/stylesheets/pasystem.css b/pasystem/pasystem-tool/tool/src/webapp/stylesheets/pasystem.css
@@ -142,9 +142,6 @@
   }
 }
 
-/* Popup screen */
-@media all{.featherlight{display:none;position:fixed;top:0;right:0;bottom:0;left:0;z-index:2;text-align:center;white-space:nowrap;cursor:pointer;background:#333;background:rgba(0,0,0,0)}.featherlight:last-of-type{background:rgba(0,0,0,.8)}.featherlight:before{content:'';display:inline-block;height:100%;vertical-align:middle;margin-right:-.25em}.featherlight .featherlight-content{position:relative;text-align:left;vertical-align:middle;display:inline-block;overflow:auto;padding:25px 25px 0;border-bottom:25px solid transparent;min-width:30%;margin-left:5%;margin-right:5%;max-height:95%;background:#fff;cursor:auto;white-space:normal}.featherlight .featherlight-inner{display:block}.featherlight .featherlight-close-icon{position:absolute;z-index:9999;top:0;right:0;line-height:25px;width:25px;cursor:pointer;text-align:center;font:Arial,sans-serif;background:#fff;background:rgba(255,255,255,.3);color:#000}.featherlight .featherlight-image{width:100%}.featherlight-iframe .featherlight-content{border-bottom:0;padding:0}.featherlight iframe{border:0}}@media only screen and (max-width:1024px){.featherlight .featherlight-content{margin-left:10px;margin-right:10px;max-height:98%;padding:10px 10px 0;border-bottom:10px solid transparent}}
-
 .featherlight .featherlight-content {
     min-width: 450px;
     max-width: 782px;
@@ -158,7 +155,6 @@
     top: 5px;
 }
 
-
 .popup-container-footer {
   display: block;
   padding: 8px 0;