@concretecms/bedrock 1.1.11 → 1.1.14

package/assets/cms/components/page/PageList.vue

@@ -8,7 +8,7 @@
                 <thead>
                 <tr>
                     <th><span>Type</span></th>
-                    <th :class="orderBy === 'cv.cvName' ? 'ccm-results-list-active-sort-' + orderByDirection : ''"><a href="#" @click="sortResults('cv.cvName', 'asc', $event)">{{ i118n.name }}</a></th>
+                    <th :class="orderBy === 'cv.cvName' ? 'ccm-results-list-active-sort-' + orderByDirection : ''"><a href="#" @click="sortResults('cv.cvName', 'asc', $event)">{{ i18n.name }}</a></th>
                     <th :class="orderBy === 'cv.cvDatePublic' ? 'ccm-results-list-active-sort-' + orderByDirection : ''"><a href="#" @click="sortResults('cv.cvDatePublic', 'asc', $event)">{{ i18n.date }}</a></th>
                     <th :class="orderBy === 'c.cDateModified' ? 'ccm-results-list-active-sort-' + orderByDirection : ''"><a href="#" @click="sortResults('c.cDateModified', 'desc', $event)">{{ i18n.lastModified }}</a></th>
                     <th><span>Author</span></th>

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/_buttons.scss

@@ -1,13 +1,8 @@
-div.ccm-ui {
+.ccm-ui {
   .btn {
     letter-spacing: 0.03rem;
   }
 
-  /*
-  .btn-secondary {
-    @include button-variant($gray-700, $gray-700, $secondary, $secondary, #fff, $secondary);
-  }*/
-
   .btn-secondary {
     @include button-variant(#fff, $gray-200, $hover-background: $secondary, $hover-border: $secondary, $hover-color: #fff, $active-background: $gray-700, $active-border: $gray-700);
   }

package/assets/cms/scss/_inline-toolbar.scss

@@ -145,32 +145,30 @@
 .ccm-ui {
   div.dropdown-menu.ccm-inline-design-dropdown-menu,
   div.ccm-dropdown-menu {
-    background-color: #0f0f0f;
-    color: #7f8d90;
-
+    @include border-radius($dropdown-border-radius);
+    background-color: $dropdown-bg;
+    border: $dropdown-border-width solid $dropdown-border-color;
     line-height: $line-height-base;
     min-width: 265px;
     padding: 20px;
-
     text-align: left;
 
     &.ccm-inline-design-dropdown-menu-doubled {
       min-width: 522px;
     }
 
-    .ccm-file-selector {
-      margin-bottom: 15px;
-      margin-top: 5px;
+    .ui-widget-content {
+      border: 0 !important;
     }
 
-    .ccm-inline-style-slider-heading {
-      display: block;
-      margin-bottom: 5px;
+    .form-label {
+      font-size: $font-size-sm;
+      font-weight: bold;
+      height: 30px;
+      line-height: 30px;
+      margin: 0;
     }
 
-    .ui-widget-content {
-      border: 0 !important;
-    }
 
     .ccm-inline-style-slider-display-value {
       display: inline-block;
@@ -180,23 +178,18 @@
       width: 25%;
 
       input[type='text'] {
-        background: #444;
-        border: 0;
-        color: #ccc;
         height: 25.1875px;
         margin-bottom: 0;
         margin-top: 0;
         outline: none;
         padding: 0 10px;
         text-align: center;
-        text-align: center;
         width: 100%;
 
         &.ccm-slider-value-unit-appended {
           width: 80%;
         }
       }
-
     }
 
     .ccm-inline-style-sliders {
@@ -222,42 +215,20 @@
     }
 
     .ui-slider-horizontal {
-      background: #444;
+      background: #eee;
       border-radius: 4px;
       margin-bottom: 5px;
       margin-top: 5px;
     }
 
-    button.btn-default {
-      @include button-variant(#ccc, #666, #333);
-
-      opacity: 0.5;
-
-      &.active {
-        opacity: 1;
-      }
-    }
-
     input[type='text'] {
       border-radius: 3px;
       font-size: $font-size-sm;
-      font-weight: 200;
       margin-bottom: 15px;
       margin-top: 5px;
       padding: 5px 10px;
     }
 
-    select {
-      &.form-control,
-      &.form-select {
-        background: #aaa;
-        color: #4c4c4d;
-        margin-bottom: 15px;
-        margin-top: 5px;
-        padding-right: 30px;
-      }
-    }
-
     .ccm-inline-select-container {
       position: relative;
     }
@@ -287,14 +258,13 @@
     }
 
     h3 {
-      color: #fff;
-      font-size: $font-size-sm;
+      font-size: $font-size-base;
       font-weight: bold;
       margin: 0 0 20px;
     }
 
     hr {
-      border-color: #666;
+      border-color: #ccc;
       margin-bottom: 14px;
       margin-top: 14px;
     }
@@ -303,6 +273,7 @@
 
 /* new styles for new the area and block style customizer toolbar */
 .ccm-inline-toolbar {
+  background-color: #f7f7f7;
   border-radius: 2px;
   display: table;
   height: 31px;
@@ -326,25 +297,6 @@
       margin-bottom: 5px !important;
     }
 
-    .btn-group {
-      .btn {
-        padding: 10px 20px;
-      }
-    }
-
-    .ccm-item-selector-choose .btn {
-      background-color: #fafafe;
-      color: #2c2c2c;
-      width: 100%;
-    }
-
-    .ccm-inline-style-slider-heading {
-      color: #7f8d90;
-      font-size: $font-size-sm;
-      font-weight: normal;
-      margin-bottom: 5px;
-    }
-
     .clearfix {
       clear: both;
     }
@@ -353,15 +305,6 @@
       margin-bottom: 0;
       padding-left: 0 !important;
 
-      label {
-        color: #7f8d90;
-        font-size: $font-size-sm;
-        font-weight: normal;
-        height: 30px;
-        line-height: 30px;
-        margin: 0;
-      }
-
       .ccm-widget-colorpicker {
         float: right;
       }
@@ -380,7 +323,7 @@
       width: calc(95% - 65px);
 
       .ui-slider-handle {
-        background-color: #fff !important;
+        background-color: #ccc !important;
         border-color: #fff;
         margin-top: 2px;
         outline: none !important;
@@ -403,7 +346,6 @@
   }
 
   > li {
-    background: #fff;
     border-bottom: 1px solid #c4c4c4;
     border-right: 1px solid #e1e1e1;
     border-top: 1px solid #c4c4c4;
@@ -430,7 +372,6 @@
   }
 
   > li.ccm-inline-toolbar-icon-cell {
-    @include gradient-y(#fff, #f1f1f1);
     padding: 0;
     position: relative;
     text-align: center;
@@ -438,12 +379,12 @@
   }
 
   > li.ccm-inline-toolbar-icon-cell > a {
-    color: #333;
+    color: $gray-600;
     cursor: pointer;
     display: block;
     height: 100%;
-    opacity: 0.7;
     text-decoration: none;
+    transition: background-color 0.25s ease-in-out;
 
     i {
       display: inline-block;
@@ -452,10 +393,19 @@
     }
   }
 
-  > li.ccm-inline-toolbar-icon-cell.ccm-inline-toolbar-icon-selected > a,
   li.ccm-inline-toolbar-icon-cell > a:hover {
-    @include gradient-y(#f3f3f3, #d2d2d2);
-    box-shadow: inset 1px 1px 5px -1px rgba(0, 0, 0, 0.35) !important;
+    background-color: $gray-200;
+  }
+
+  li.ccm-inline-toolbar-icon-selected {
+    a,
+    a:hover {
+      background-color: $blue;
+
+      i {
+        color: white;
+      }
+    }
   }
 
   > li.ccm-inline-toolbar-button {
@@ -559,20 +509,8 @@
   li.ccm-inline-toolbar-icon-cell > div.ccm-dropdown-menu {
     display: none;
 
-    &::before {
-      border-color: transparent transparent #000;
-      border-style: solid;
-      border-width: 0 5px 5px;
-      content: ' ';
-      height: 0;
-      left: 11px;
-      position: absolute;
-      top: -5px;
-      width: 0;
-    }
-
     &.active {
-      box-shadow: 2px 2px 5px 0 rgba(0, 0, 0, 0.43);
+      box-shadow: $dropdown-box-shadow;
       display: block;
       margin-top: 1px;
       position: absolute;

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/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.11",
+  "version": "1.1.14",
   "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",