@concretecms/bedrock 1.0.0 → 1.1.0

package/assets/cms/js/edit-mode/style-customizer/typography.js

@@ -46,12 +46,19 @@ function ConcreteTypographySelector($element, options) {
     })
 
     my.$colorpicker = my.$widget.find('input[data-style-customizer-field=color]')
+    const i18n = window.ccmi18n_styleCustomizer || null
     my.$colorpicker.spectrum({
         preferredFormat: 'rgb',
         showAlpha: true,
         className: 'ccm-widget-colorpicker',
         showInitial: true,
-        showInput: true
+        showInput: true,
+        cancelText: i18n && i18n.cancel ? i18n.cancel : 'Cancel',
+        chooseText: i18n && i18n.choose ? i18n.choose : 'Choose',
+        clearText: i18n && i18n.clearColorSelection ? i18n.clearColorSelection : 'Clear Color Selection',
+        noColorSelectedText: i18n && i18n.noColorSelected ? i18n.noColorSelected : 'No Color Selected',
+        togglePaletteMoreText: i18n && i18n.togglePaletteMore ? i18n.togglePaletteMore : 'More',
+        togglePaletteLessText: i18n && i18n.togglePaletteLess ? i18n.togglePaletteLess : 'Less'
     })
 
     my.$fontMenu.on('change', function() {

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

@@ -1,182 +1,7 @@
-.ccm-inline-toolbar {
-  border-radius: 3px;
-  box-shadow: 0 0 6px rgba(200, 200, 200, 0.5);
-  display: table;
-  font-family: Helvetica, Arial, Verdana, Tahoma, sans-serif !important;
-  height: 31px;
-  line-height: 0;
-  list-style: none;
-  margin: 0 !important;
-  opacity: 0;
-  padding: 0 !important;
-  position: relative;
-  z-index: $index-level-inline-toolbar;
-
-  /* stylelint-disable selector-class-pattern */
-  &.redactor_toolbar {
-    background: transparent;
-  }
-
-  /* stylelint-enable selector-class-pattern */
-
-  > li {
-    background: #fff;
-    border-bottom: 1px solid #c4c4c4;
-    border-right: 1px solid #e1e1e1;
-    border-top: 1px solid #c4c4c4;
-    display: table-cell;
-    font-size: $font-size-base !important;
-    list-style: none;
-    outline: none;
-    padding: 3px 8px;
-    vertical-align: middle;
-
-    label {
-      display: inline;
-      font-size: $font-size-sm;
-      margin: 0 0 8px;
-    }
-
-    &.ccm-inline-toolbar-inverse-cell {
-      background-color: #555;
-
-      a {
-        color: #fff;
-      }
-    }
-
-
-  }
-
-  > li:first-child {
-    border-bottom-left-radius: 3px;
-    border-left: 1px solid #c4c4c4;
-    border-top-left-radius: 3px;
-  }
-
-  > li:last-child {
-    border-bottom-right-radius: 3px;
-    border-right: 0;
-    border-top-right-radius: 3px;
-  }
-
-  > li.ccm-inline-toolbar-icon-cell {
-    @include gradient-y(#fff, #f1f1f1);
-    padding: 0;
-    position: relative;
-    text-align: center;
-    width: 30px;
-  }
-
-  > li.ccm-inline-toolbar-icon-cell > a {
-    color: #333;
-    cursor: pointer;
-    display: block;
-    height: 100%;
-    opacity: 0.7;
-    text-decoration: none;
-
-    i {
-      display: inline-block;
-      font-size: $font-size-sm;
-      line-height: 33px;
-    }
-  }
-
-  > li.ccm-inline-toolbar-icon-cell.ccm-inline-toolbar-icon-selected {
-    @include gradient-y(#e1e1e1, #cbcbcb);
-    border-right: 1px solid #c5c5c5;
-  }
-
-  > li.ccm-inline-toolbar-icon-cell.ccm-inline-toolbar-icon-selected > a {
-    opacity: 1;
-  }
-
-  > li.ccm-inline-toolbar-icon-cell > a:hover {
-    opacity: 1;
-  }
-
-  > li.ccm-inline-toolbar-button {
-    background: transparent;
-
-    padding: 0;
-
-    button {
-      background: #f3f3f3;
-      border: 0;
-      border-radius: 0;
-      color: #333;
-      display: inline-block;
-      font-size: $font-size-sm;
-      height: 33px;
-      padding: 0 20px;
-      text-align: center;
-      width: 100%;
-    }
-  }
-
-  > li.ccm-inline-toolbar-select {
-    select {
-      background-position: right 5px top 5px;
-      border: 0;
-      height: 27px;
-      padding: 2px 28px 2px 2px;
-    }
-  }
-
-  > li.ccm-inline-toolbar-button-cancel button {
-    @include gradient-y(#f3f3f3, #eaeaea);
-  }
-
-  > li.ccm-inline-toolbar-button-cancel button:hover {
-    background-color: #fff;
-    background-image: none;
-  }
-
-  > li.ccm-inline-toolbar-button-save {
-    border: 1px solid #007cce !important;
-  }
-
-  > li.ccm-inline-toolbar-button-save button {
-    @include gradient-y(#09f, #0094f6);
-    background: #09f;
-    color: #fff;
-  }
-
-  > li.ccm-inline-toolbar-button-save button:hover {
-    background-color: #007cce;
-    background-image: none;
-  }
-
-  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);
-      display: block;
-      margin-top: 1px;
-      position: absolute;
-    }
-  }
-}
-
 #ccm-inline-toolbar-container {
   box-sizing: border-box;
   left: 0;
   opacity: 0;
-  padding: 10px 20px 0;
   position: absolute;
   top: 0;
   transition: opacity 0.3s ease-in;
@@ -186,10 +11,15 @@
 
 #ccm-inline-toolbar-container.ccm-inline-toolbar-affixed {
   background-color: rgba(0, 0, 0, 0.4);
+  padding: 10px 0;
   position: fixed;
   top: 0 !important;
 }
 
+/*
+ old customizer. delete.
+ */
+/*
 .ccm-panel-left {
   .sp-container {
     background-color: rgba(0, 0, 0, 0.95);
@@ -310,6 +140,7 @@
   }
 
 }
+ */
 
 .ccm-ui {
   div.dropdown-menu.ccm-inline-design-dropdown-menu,
@@ -471,16 +302,13 @@
 }
 
 /* new styles for new the area and block style customizer toolbar */
-.ccm-style-customizer-toolbar {
-  border-radius: 3px;
-  box-shadow: 0 0 6px rgba(200, 200, 200, 0.5);
+.ccm-inline-toolbar {
+  border-radius: 2px;
   display: table;
-  font-family: Helvetica, Arial, Verdana, Tahoma, sans-serif !important;
   height: 31px;
   line-height: 0;
   list-style: none;
   margin: 0 !important;
-  min-width: 600px;
   padding: 0 !important;
   position: relative;
   z-index: $index-level-inline-toolbar;
@@ -582,6 +410,7 @@
     display: table-cell;
     font-size: $font-size-base !important;
     list-style: none;
+    margin: 0;
     outline: none;
     padding: 3px 8px;
     vertical-align: middle;

package/assets/cms/scss/panels/_shared.scss

@@ -14,12 +14,12 @@ html.ccm-panel-detail-open {
 div.ccm-panel {
   background-color: $panel-background-color;
   height: 100%;
-  /* overflow: hidden; */ /* This causes problems with floating palettes inside the panels. So let's only apply this during transitions */
   position: fixed;
   top: 0;
   user-select: none;
   width: 320px;
   z-index: $index-level-panel; // has to come above the detail actions wrapper
+  /* overflow: hidden; */ /* This causes problems with floating palettes inside the panels. So let's only apply this during transitions */
   div.ccm-panel-close {
     position: absolute;
     right: 17px;

package/assets/desktop/js/frontend/draft-list.js

@@ -1,5 +1,4 @@
 /* eslint-disable no-new, no-unused-vars, camelcase */
-/* global ConcreteEvent */
 
 ;(function(global, $) {
     'use strict'
@@ -11,22 +10,6 @@
         my.$element = $element
         my.options = options
 
-        ConcreteEvent.unsubscribe('SitemapDeleteRequestComplete')
-        ConcreteEvent.subscribe('SitemapDeleteRequestComplete', function (e) {
-            my.hideLoader()
-            $.concreteAjax({
-                dataType: 'html',
-                url: my.options.reloadUrl,
-                method: 'get',
-                success: function (r) {
-                    my.$element.replaceWith(r)
-                },
-                complete: function() {
-                    my.hideLoader()
-                }
-            })
-        })
-
         my.$element.on('click', 'div.ccm-pagination-wrapper a', function(e) {
             e.preventDefault()
             my.showLoader()

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@concretecms/bedrock",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "description": "The asset framework and dependencies for Concrete CMS.",
   "scripts": {
     "lint": "standardx \"**/*.{js,vue}\" && stylelint assets/**/*.{scss,vue}",
@@ -20,7 +20,7 @@
     "bootbox": "^5.5.1",
     "bootstrap": "^5.0.1",
     "bootstrap-select": "^1.14.0-beta2",
-    "bootstrap-tourist": "https://github.com/concrete5/bootstrap-tourist.git",
+    "bootstrap-tourist": "git+https://git@github.com/concrete5/bootstrap-tourist.git",
     "ckeditor4": "^4.16.2",
     "ckeditor4-vue": "^1.3.2",
     "dropzone": "^5.7.2",

package/.idea/bedrock.iml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="WEB_MODULE" version="4">
-  <component name="NewModuleRootManager">
-    <content url="file://$MODULE_DIR$" />
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>

package/.idea/codeStyles/Project.xml

@@ -1,15 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <code_scheme name="Project" version="173">
-    <codeStyleSettings language="JavaScript">
-      <option name="INDENT_CASE_FROM_SWITCH" value="false" />
-      <option name="ALIGN_MULTILINE_PARAMETERS" value="false" />
-      <option name="ALIGN_MULTILINE_FOR" value="false" />
-    </codeStyleSettings>
-    <codeStyleSettings language="Vue">
-      <indentOptions>
-        <option name="INDENT_SIZE" value="4" />
-        <option name="TAB_SIZE" value="4" />
-      </indentOptions>
-    </codeStyleSettings>
-  </code_scheme>
-</component>

package/.idea/codeStyles/codeStyleConfig.xml

@@ -1,5 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <state>
-    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
-  </state>
-</component>

package/.idea/dataSources.local.xml

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="dataSourceStorageLocal" created-in="PS-211.7142.44" />
-</project>

package/.idea/misc.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="JavaScriptSettings">
-    <option name="languageLevel" value="ES6" />
-  </component>
-</project>

package/.idea/modules.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/bedrock.iml" filepath="$PROJECT_DIR$/.idea/bedrock.iml" />
-    </modules>
-  </component>
-</project>

package/.idea/vcs.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
-  </component>
-</project>