REFACTOR: composer to use flexbox

app/assets/javascripts/discourse/templates/components/composer-editor.hbs

@@ -13,28 +13,6 @@
            forcePreview=forcePreview
            composerEvents=true}}
 
-<div class="composer-bottom-right">
-  {{#if site.mobileView}}
+{{#if site.mobileView}}
     <input type="file" id="mobile-uploader" multiple />
-    <a class="mobile-file-upload {{if isUploading 'hidden'}}">{{i18n 'upload'}}</a>
-
-    {{#if showPreview}}
-      {{d-button action='togglePreview' class='hide-preview' label='composer.hide_preview'}}
-    {{/if}}
-  {{else}}
-    <a href {{action "togglePreview"}} class='toggle-preview'>{{{toggleText}}}</a>
-  {{/if}}
-
-  {{#if isUploading}}
-    <div id="file-uploading">
-      {{loading-spinner size="small"}} {{i18n 'upload_selector.uploading'}}
-      {{uploadProgress}}%
-      {{#if isCancellable}}
-        <a href id="cancel-file-upload" {{action "cancelUpload"}}>{{d-icon "times"}}</a>
-      {{/if}}
-    </div>
-  {{/if}}
-  <div id='draft-status' class="{{if isUploading 'hidden'}}">
-    {{draftStatus}}
-  </div>
-</div>
+{{/if}}

app/assets/javascripts/discourse/templates/components/d-editor.hbs

@@ -1,4 +1,5 @@
 <div class='d-editor-overlay hidden'></div>
+
 <div class='d-editor-modals'>
   {{#d-editor-modal class="insert-link" hidden=insertLinkHidden okAction="insertLink"}}
     <h3>{{i18n "composer.link_dialog_title"}}</h3>
@@ -8,19 +9,18 @@
 </div>
 
 <div class='d-editor-container'>
-  <div class='d-editor-button-bar'>
-    {{#each toolbar.groups as |group|}}
-      {{#each group.buttons as |b|}}
-        {{d-button action=b.action actionParam=b translatedTitle=b.title label=b.label icon=b.icon class=b.className}}
-      {{/each}}
-      {{#unless group.lastGroup}}
-        <div class='d-editor-spacer'></div>
-      {{/unless}}
-    {{/each}}
-  </div>
-  <div class='d-editor-preview-header'></div>
-
   <div class="d-editor-textarea-wrapper">
+    <div class='d-editor-button-bar'>
+      {{#each toolbar.groups as |group|}}
+        {{#each group.buttons as |b|}}
+          {{d-button action=b.action actionParam=b translatedTitle=b.title label=b.label icon=b.icon class=b.className}}
+        {{/each}}
+        {{#unless group.lastGroup}}
+          <div class='d-editor-spacer'></div>
+        {{/unless}}
+      {{/each}}
+    </div>
+
     {{conditional-loading-spinner condition=loading}}
     {{textarea tabindex=tabindex value=value class="d-editor-input" placeholder=placeholderTranslated}}
     {{popup-input-tip validation=validation}}
@@ -30,7 +30,7 @@
     <div class="d-editor-preview">
       {{{preview}}}
     </div>
-    {{plugin-outlet name="editor-preview"}}
+      {{plugin-outlet name="editor-preview" classNames="d-editor-plugin"}}
   </div>
 </div>