@concretecms/bedrock 1.4.0 → 1.4.2

package/assets/cms/components/Announcement/Broadcast.vue

@@ -13,7 +13,7 @@
     </div>
 </template>
 <script>
-/* global bootstrap */
+/* global bootstrap ConcreteModal */
 import ConcreteAnnouncementModal from './Modal/Modal'
 
 export default {
@@ -58,6 +58,8 @@ export default {
         if (modal) {
             modal.show()
         }
+        ConcreteModal.fixBackdrop()
+        $('#concrete-announcement-modal').appendTo('#ccm-tooltip-holder')
     }
 }
 </script>

package/assets/cms/js/modal.js

@@ -20,6 +20,10 @@ class ConcreteModal {
         })
     }
 
+    static fixBackdrop(element = '#ccm-tooltip-holder') {
+        $('.modal-backdrop').appendTo(element)
+    }
+
     show(options) {
         options = $.extend(options, {
             className: 'ccm-ui',
@@ -57,17 +61,12 @@ class ConcreteModal {
         // dialog._config.backdrop = 'static'
         dialog.show()
 
+        ConcreteModal.fixBackdrop(options.container)
+
         if (options.backdrop === 'static') {
             dialog._config.backdrop = 'static'
         }
-
-        element.addEventListener('hide.bs.modal', function() {
-            ConcreteModal.totalOpen--
-        })
-        ConcreteModal.totalOpen++
     }
 }
 
-ConcreteModal.totalOpen = 0
-
 global.ConcreteModal = ConcreteModal

package/assets/cms/scss/_page-areas.scss

@@ -427,6 +427,13 @@ div.ccm-form-block-design {
   }
 }
 
+// If the popover is inline in the page it adds unintentional height after the title notches and area tabs
+// Let's fix this by making them absolutely positioned.
+div.ccm-edit-mode-title-notch-wrapper > .popover,
+div.ccm-area-footer > .popover {
+  position: absolute;
+}
+
 /**
  * Edit mode in-page controls for dragging, moving blocks around
  */

package/assets/cms/scss/_transitions.scss

@@ -37,4 +37,13 @@
   opacity: 0;
 }
 
-
+/**
+ * Fix for https://github.com/concretecms/concretecms/issues/11306
+ * Old Bootstrap 3 themes will cause this. BS3 used to set .fade {opacity: 0} right within
+ * the global namespace. Bootstrap 4/5 fix this by setting that to .fade(not(.show)), but unless
+ * the BS3 root fade is reverted then it will override our updates and bootstrap modals will not work
+ * on the frontend. This should fix that.
+ */
+.fade {
+  opacity: revert;
+}

package/assets/staging/scss/frontend/_frontend.scss

@@ -1,3 +1,5 @@
+@import 'variables';
+
 div.ccm-production-notice-staging {
   background-color: black;
   bottom: 0;
@@ -8,5 +10,5 @@ div.ccm-production-notice-staging {
   position: fixed;
   text-align: center;
   width: 100%;
-  z-index: 1000;
+  z-index: $index-level-stage-notice;
 }

package/assets/staging/scss/frontend/_variables.scss

@@ -0,0 +1 @@
+$index-level-stage-notice: 820 !default;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@concretecms/bedrock",
-  "version": "1.4.0",
+  "version": "1.4.2",
   "description": "The asset framework and dependencies for Concrete CMS.",
   "scripts": {
     "lint": "standardx \"**/*.{js,vue}\" && stylelint assets/**/*.{scss,vue}",