Merge pull request silverstripe#81 from open-sausages/pulls/4.0/1773_…

…tinymce_width Extended width of TinyMCE area, with max width align with other fields
unclecheese · May 22, 2017 · d74e213 · d74e213
2 parents 08c25e3 + 958540c
commit d74e213
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 0 deletions.
diff --git a/client/dist/styles/bundle.css b/client/dist/styles/bundle.css
@@ -16229,6 +16229,13 @@ input.checkbox,input.radio,input[type=checkbox],input[type=radio]{
             flex:0 0 83.33333%;
   }
 
+  .cms-edit-form:not(.AssetAdmin) .form-group.htmleditor .form__field-holder,.form--inline .form-group.htmleditor .form__field-holder,.ss-insert-link .form__fieldgroup .form-group.htmleditor .form__field-holder{
+    -webkit-box-flex:0;
+        -ms-flex:0 0 100%;
+            flex:0 0 100%;
+    max-width:calc(895px + 16.66667%);
+  }
+
   .cms-edit-form:not(.AssetAdmin) .form__field-extra-label,.form--inline .form__field-extra-label,.ss-insert-link .form__fieldgroup .form__field-extra-label{
     -webkit-box-flex:0;
         -ms-flex:0 0 16.66667%;

diff --git a/client/src/components/Form/Form.scss b/client/src/components/Form/Form.scss
@@ -312,6 +312,13 @@ input.radio {
       @include make-col-span(10);
     }
 
+    // HTML editor to expand to maximise to the space
+    // Max-width to visually match other stacked fields + label
+    .form-group.htmleditor .form__field-holder {
+      @include make-col-span(12);
+      max-width: calc(#{$input-max-width} + 16.66667%);
+    }
+
     .form__field-extra-label {
       @include make-col-span(2);
       @include make-col-offset(0);