@concretecms/bedrock 1.1.7 → 1.1.10

package/assets/accordions/js/frontend.js

@@ -0,0 +1 @@
+import 'bootstrap/js/dist/collapse'

package/assets/accordions/scss/frontend/_frontend.scss

@@ -0,0 +1,11 @@
+@import 'bootstrap/scss/functions';
+@import 'bootstrap/scss/variables';
+@import 'bootstrap/scss/mixins';
+
+// Base styling
+@import 'bootstrap/scss/accordion';
+
+// Reset header top margins because if this is used on old bootstrap sometimes a margin is present.
+.accordion-header {
+  margin-top: 0;
+}

package/assets/accordions/scss/frontend.scss

@@ -0,0 +1,4 @@
+// This is an entry point so it just includes the partial that includes everything else.
+// That way if we want to include full support in our theme we just include the partial (rather
+// than including the entry point because I think it's bad practice.)
+@import 'frontend/frontend';

package/assets/cms/js/edit-mode/editmode.js

@@ -330,7 +330,7 @@
                 var areas = my.getAreas()
                 var contenders
 
-                if (block instanceof Concrete.Layout) {
+                if (block instanceof Concrete.Layout || block instanceof Concrete.ContainerBlock) {
                     areas = [_(areas).find(function (a) {
                         return block.getArea() === a
                     })]

package/assets/cms/js/jquery-awesome-rating.js

@@ -16,9 +16,9 @@
         var toggleStarEl
         toggleStarEl = function($star, state) {
             if (state) {
-                return $star.removeClass('fa-star-o').addClass('fa-star')
+                return $star.removeClass('far').addClass('fas')
             } else {
-                return $star.removeClass('fa-star').addClass('fa-star-o')
+                return $star.removeClass('fas').addClass('far')
             }
         }
         return $.fn.awesomeStarRating = function(options) {
@@ -39,7 +39,7 @@
             stars = []
             _results = []
             for (i = _i = 1; _i <= 5; i = ++_i) {
-                $star = $('<i class="fa"></i>')
+                $star = $('<i class="fa-star"></i>')
                 toggleStarEl($star, i <= ratingScore)
                 $ratingContainer.append($star)
                 stars[i] = $star

package/assets/cms/scss/_dropdown.scss

@@ -17,5 +17,6 @@
       justify-content: center;
       width: 45px;
     }
+
   }
 }

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

@@ -379,6 +379,19 @@ ul.ccm-edit-mode-inline-commands:hover {
     margin: 0 !important;
     padding: 0;
     position: static;
+
+    .dropdown-item:first-child {
+      border-top-left-radius: $dropdown-border-radius;
+      border-top-right-radius: $dropdown-border-radius;
+    }
+
+    .dropdown-item:last-child {
+      border-bottom-left-radius: $dropdown-border-radius;
+      border-bottom-right-radius: $dropdown-border-radius;
+    }
+
+
+
   }
 
 }
@@ -428,7 +441,7 @@ div.ccm-area[data-total-blocks='0'] {
   div.ccm-area-drag-area {
     color: #bbb;
     padding: 24px;
-    text-align: center;
+    text-align: center !important; /* https://github.com/concrete5/concrete5/issues/10249 */
     text-indent: 0;
   }
 }

package/assets/cms/scss/_variables.scss

@@ -111,15 +111,19 @@ $dropdown-item-padding-y: 0.625rem;
 $dropdown-item-padding-x: 10px;
 $dropdown-link-active-color: #fff;
 $dropdown-border-color: transparent;
-$dropdown-border-radius: 2px;
-$dropdown-border-width: 2px;
+$dropdown-border-radius: 5px;
+$dropdown-border-width: 0;
 $dropdown-min-width: 175px;
-$dropdown-box-shadow: 0 2px 4px 1px rgba(0, 0, 0, 0.15);
+$dropdown-padding-y: 10px;
+$dropdown-box-shadow: 0 1px 1px 0 rgba(65, 69, 73, 0.3), 0 1px 3px 1px rgba(65, 69, 73, 0.15);
 
 /* popovers - these are used for in page menus, help menus */
-$popover-border-color: $gray-300;
-$popover-border-radius: 2px;
-$popover-box-shadow: 0 2px 4px 1px rgba(0, 0, 0, 0.1);
+$popover-border-color: transparent;
+$popover-border-radius: 5px;
+$popover-inner-border-radius: 5px;
+$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;
 
 /* Links */
 $link-decoration: none;

package/assets/desktop/scss/frontend/_waiting-for-me.scss

@@ -1,23 +1,9 @@
 div.ccm-block-desktop-waiting-for-me {
-  background-color: #fff;
-  border: 1px solid #dddfdf;
-  margin-bottom: 3rem;
-  padding: 20px;
-
-  h3 {
-    border-bottom: 1px solid #d6d6d8;
-    font-weight: normal;
-    margin-bottom: 20px;
-    margin-top: 0;
-    padding-bottom: 5px;
-    position: relative;
-  }
-
   i.ccm-block-desktop-waiting-for-me-loader {
     display: none;
     position: absolute;
-    right: 0;
-    top: 5px;
+    right: 20px;
+    top: 18px;
   }
 
   div.ccm-block-desktop-waiting-for-me-loading {

package/assets/navigation/scss/frontend/_frontend.scss

@@ -1,5 +1,6 @@
 // Core block types
 @import 'page-list';
 @import 'rss-displayer';
+@import 'top-navigation-bar';
 @import 'date-navigation';
 @import 'responsive-navigation';

package/assets/navigation/scss/frontend/_top-navigation-bar.scss

@@ -0,0 +1,39 @@
+@import 'bootstrap/scss/functions';
+@import 'bootstrap/scss/variables';
+@import 'bootstrap/scss/mixins';
+
+// Navigation bar styling
+div.ccm-block-top-navigation-bar {
+
+  @import 'bootstrap/scss/navbar';
+  @import 'bootstrap/scss/forms/input-group';
+
+  .navbar {
+    .navbar-nav {
+      order: 0;
+    }
+  }
+
+  // Logo/brand
+  .navbar-brand {
+    // If this is being included in a BS4 theme we need to reset some parameters
+    float: none;
+    height: auto;
+
+    img {
+      max-height: 38px;
+    }
+  }
+
+  // Search
+  form {
+    display: flex;
+    margin-left: auto;
+    order: 1;
+
+    .btn {
+      background: none;
+      padding: $btn-padding-x-sm $btn-padding-y-sm;
+    }
+  }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@concretecms/bedrock",
-  "version": "1.1.7",
+  "version": "1.1.10",
   "description": "The asset framework and dependencies for Concrete CMS.",
   "scripts": {
     "lint": "standardx \"**/*.{js,vue}\" && stylelint assets/**/*.{scss,vue}",
@@ -46,7 +46,7 @@
     "selectize-bootstrap4-theme": "^2.0.2",
     "spectrum-colorpicker": "^1.8.1",
     "tristate": "^1.2.0",
-    "underscore": "^1.11.0",
+    "underscore": "^1.13",
     "v-calendar": "^1.0.8",
     "vue": "^2.6.12",
     "vue-js-toggle-button": "^1.3.3",