@concretecms/bedrock 1.5.0 → 1.5.1

package/assets/cms/js/tree.js

@@ -140,8 +140,8 @@ ConcreteTree.prototype = {
                 if (options.chooseNodeInForm) {
                     const keys = my.getSelectedNodeKeys(data.tree.getRootNode(), ajaxData.treeNodeSelectedIDs)
                     if (keys.length) {
-                    options.onSelect(keys)
-                }
+                        options.onSelect(keys)
+                    }
                 }
             },
 
@@ -310,8 +310,14 @@ ConcreteTree.prototype = {
     getSelectedNodeKeys: function (node, selected) {
         var my = this
 
-        // Initialize selected and deselected arrays
+        // Initialize selected array
         selected = selected || []
+
+        // Remove keys that are not in the tree anymore
+        selected = selected.filter(function (key) {
+            return $.ui.fancytree.getTree(my.$element).getNodeByKey(parseInt(key)) !== null
+        })
+
         // Walk through all child nodes
         if (node.hasChildren()) {
             node.getChildren().forEach(function (child) {

package/assets/cms/scss/_hud.scss

@@ -131,6 +131,11 @@ div#ccm-popup-alert-message {
   right: 30px;
   width: 380px;
   z-index: $index-level-page-alert;
+  @media only screen and (max-width: 768px) {
+    left: 0;
+    right: 0;
+    width: 100vw;
+  }
 }
 
 .ccm-notifications-box-header {

package/assets/cms/scss/_toolbar.scss

@@ -7,6 +7,9 @@ div#ccm-toolbar {
   position: fixed;
   top: 0;
   width: 100%;
+  @media only screen and (max-width: 768px) {
+    width: 100vw;
+  }
   z-index: $index-level-main-bar; /* over the top of the highlighter, which is 1000 */
 
   .ccm-toolbar-accessibility-title {
@@ -373,6 +376,22 @@ ul.ccm-mobile-menu {
   }
 }
 
+.ccm-toolbar-mobile-add-pages-button {
+  border-left: 1px solid $gray-200;
+  cursor: pointer;
+  height: 47px;
+  padding: 14px 18px;
+
+  svg {
+    fill: $gray-600;
+    height: 16px;
+    margin: 0 auto;
+    transition: fill 0.25s ease-in-out;
+    vertical-align: baseline;
+    width: 16px;
+  }
+}
+
 .ccm-mobile-toolbar-menu {
   display: none;
 

package/assets/cms/scss/jquery-ui/_overrides.scss

@@ -9,9 +9,15 @@ html.ccm-toolbar-visible {
 
   .ui-dialog {
     box-shadow: $modal-content-box-shadow-sm-up;
+    max-width: 100vw;
     padding: 0;
-
     z-index: $index-level-dialog;
+    @media only screen and (max-width: 768px) {
+      display: flex;
+      flex-direction: column;
+      max-height: 100vh;
+    }
+
     /* hide section titles for panels when those panels are shown in dialogs */
     section {
       header {
@@ -144,6 +150,5 @@ html.ccm-toolbar-visible {
     button {
       margin: $modal-footer-margin-between / 2;
     }
-
   }
 }

package/assets/cms/scss/panels/pages/_attributes.scss

@@ -99,6 +99,10 @@
   display: block;
   float: left;
   width: 100%;
+  @media only screen and (max-width: 768px) {
+    display: flex;
+    flex-direction: column-reverse;
+  }
 }
 
 #ccm-dialog-attributes-menu {
@@ -107,6 +111,9 @@
   margin: 0;
   padding: 0;
   width: 30%;
+  @media only screen and (max-width: 768px) {
+    width: auto;
+  }
 }
 
 #ccm-dialog-attributes-detail {
@@ -115,6 +122,10 @@
   margin: 0 0 0 65px;
   padding: 0;
   width: calc(70% - 65px);
+  @media only screen and (max-width: 768px) {
+    margin: 0;
+    width: auto;
+  }
 }
 
 /**

package/package.json

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