Merge branch '1.3' into 1.4

silverstripe · Aug 2, 2019 · f0aa1ae · f0aa1ae
2 parents 2b2091a + 8f71df6
commit f0aa1ae
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 15 deletions.
diff --git a/client/dist/js/TinyMCE_sslink.js b/client/dist/js/TinyMCE_sslink.js
diff --git a/client/dist/js/vendor.js b/client/dist/js/vendor.js
diff --git a/client/dist/styles/bundle.css b/client/dist/styles/bundle.css
diff --git a/client/src/components/TinymceInlineToolbar/TinymceInlineToolbar.js b/client/src/components/TinymceInlineToolbar/TinymceInlineToolbar.js
@@ -123,7 +123,7 @@ class TinymceInlineToolbar {
       top = selection.bottom + iframeRect.top + scrollY + topOffset;
     }
 
-    if (typeof top === 'undefined') {
+    if (top === 0) {
       top = scrollY + blockedTop + buffer;
     }
 

diff --git a/client/src/styles/legacy/_tree.scss b/client/src/styles/legacy/_tree.scss
@@ -356,21 +356,14 @@
       background: #FFF;
       border: 1px solid silver;
       box-shadow: 0 0 10px #CCC;
-      &.col-2{
-        width:180px * 2; // 2x the size of the original ul
-        li {
-          width:50%;
-        }
+      &.vakata-col-2{
+        column-count: 2;
       }
-      &.col-3{
-        width:180px * 3; // 3x the size of the original ul
-        li {
-          width:33%;
-        }
+      &.vakata-col-3{
+        column-count: 3;
       }
       li {
         min-width:180px;
-        float:left;
         a {
           @include hide-text-overflow;
         }

diff --git a/lang/en.yml b/lang/en.yml
@@ -97,3 +97,5 @@ en:
     MemberListCaution: 'Caution: Removing members from this list will remove them from all groups and the database'
     TABROLES: Roles
     Users: Users
+  SilverStripe\CMS\Controllers\CMSMain:
+    SAVE: Save