@concretecms/bedrock 1.1.10 → 1.1.13

package/assets/cms/js/base.js

@@ -7,7 +7,7 @@ import PNotify from './pnotify'
 import 'json5'
 import 'jquery.cookie'
 import 'jquery-form'
-import 'bootstrap-select'
+import 'bootstrap-select/js/bootstrap-select'
 import './modifiable-bootstrap-select'
 import 'ajax-bootstrap-select'
 import './modifiable-ajax-bootstrap-select'

package/assets/cms/js/in-context-menu.js

@@ -203,7 +203,11 @@
             var hshift = mwidth / 2 - 5
             var vshift = mheight / 2 - 5
 
-            var available = ['bottom', 'top', 'right', 'left']; var all = available.slice(0)
+            // The right and left positions do weird things, and are especially weird without the arrow
+            // Which has been removed for better appearance. Let's limit this to something that's less
+            // jumpy and support just bottom and top.
+            var available = ['bottom', 'top']; var all = available.slice(0)
+            // var available = ['bottom', 'top', 'right', 'left']; var all = available.slice(0)
 
             if (clientX < mwidth + 30) {
                 available = _(available).without('left')
@@ -229,10 +233,14 @@
             }
 
             var placement = available.shift()
+            if (!placement) {
+                // we have to have a valid placement
+                placement = 'bottom'
+            }
             $menu.removeClass(all).addClass('bs-popover-' + placement)
 
-            pageX -= 2
-            pageY -= 2
+            pageX += 5
+            pageY += 5
             switch (placement) {
             case 'left':
                 pageX = pageX - mwidth

package/assets/cms/scss/_panels.scss

@@ -1,6 +1,7 @@
 @import 'panels/shared';
 @import 'panels/help';
 @import 'panels/sitemap';
+@import 'panels/page-relations';
 @import 'panels/pages/attributes';
 @import 'panels/pages/seo';
 @import 'panels/add/blocks';

package/assets/cms/scss/_sitemap.scss

@@ -20,6 +20,14 @@
   div.ccm-sitemap-tree {
     background-color: $sitemap-container-background-color;
     border: 0;
+
+    .ccm-page-home {
+      img {
+        // Locales
+        margin-right: 5px;
+        margin-top: 9px;
+      }
+    }
   }
 
   ul.ui-fancytree {

package/assets/cms/scss/_variables.scss

@@ -121,6 +121,7 @@ $dropdown-box-shadow: 0 1px 1px 0 rgba(65, 69, 73, 0.3), 0 1px 3px 1px rgba(65,
 $popover-border-color: transparent;
 $popover-border-radius: 5px;
 $popover-inner-border-radius: 5px;
+$popover-border-width: 0;
 $popover-box-shadow: 0 1px 1px 0 rgba(65, 69, 73, 0.3), 0 1px 3px 1px rgba(65, 69, 73, 0.15);
 $popover-arrow-width: 0;
 $popover-arrow-height: 0;

package/assets/cms/scss/panels/_page-relations.scss

@@ -0,0 +1,28 @@
+div#ccm-panel-page_relations {
+  ul.item-select-list {
+    li {
+      border-bottom: 0;
+    }
+
+    a.ccm-panel-multilingual-menu-hover,
+    a.ccm-menu-item-active {
+      @include item-select-list-hover();
+    }
+
+    a.ccm-panel-multilingual-section-no-mappings {
+      color: #999;
+    }
+  }
+}
+
+div#ccm-popover-menu-container.ccm-panel-multilingual-menu-container,
+div#ccm-popover-menu-container.ccm-panel-multilingual-menu-container div.popover {
+  z-index: $index-level-menu-panel-and-dialog;
+}
+
+div#ccm-menu-click-proxy {
+  &.ccm-panel-multilingual-menu-hover {
+    z-index: $index-level-menu-panel-and-dialog;
+  }
+}
+

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@concretecms/bedrock",
-  "version": "1.1.10",
+  "version": "1.1.13",
   "description": "The asset framework and dependencies for Concrete CMS.",
   "scripts": {
     "lint": "standardx \"**/*.{js,vue}\" && stylelint assets/**/*.{scss,vue}",
@@ -19,7 +19,7 @@
     "blueimp-file-upload": "^10.31.0",
     "bootbox": "^5.5.1",
     "bootstrap": "^5.0.1",
-    "bootstrap-select": "^1.14.0-beta2",
+    "bootstrap-select": "github:snapappointments/bootstrap-select",
     "bootstrap-tourist": "git+https://git@github.com/concrete5/bootstrap-tourist.git",
     "ckeditor4": "^4.17.1",
     "ckeditor4-vue": "^1.3.2",