From 9a04603587a9b7010b1f51eea10c55f740f993e3 Mon Sep 17 00:00:00 2001
From: Toby Zerner <toby.zerner@gmail.com>
Date: Fri, 26 Jun 2015 12:18:13 +0930
Subject: [PATCH] Always show composer header. closes flarum/core#112

---
 .../core/js/forum/src/components/composer-body.js   |  4 +---
 .../core/js/forum/src/components/reply-composer.js  | 13 ++++---------
 framework/core/less/forum/composer.less             |  4 +++-
 3 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/framework/core/js/forum/src/components/composer-body.js b/framework/core/js/forum/src/components/composer-body.js
index 631548222..e279d6753 100644
--- a/framework/core/js/forum/src/components/composer-body.js
+++ b/framework/core/js/forum/src/components/composer-body.js
@@ -25,12 +25,10 @@ export default class ComposerBody extends Component {
   view(className) {
     this.editor.props.disabled = this.loading() || !this.ready();
 
-    var headerItems = this.headerItems().toArray();
-
     return m('div', {className, config: this.onload.bind(this)}, [
       avatar(this.props.user, {className: 'composer-avatar'}),
       m('div.composer-body', [
-        headerItems.length ? m('ul.composer-header', listItems(headerItems)) : '',
+        m('ul.composer-header', listItems(this.headerItems().toArray())),
         m('div.composer-editor', this.editor.view())
       ]),
       LoadingIndicator.component({className: 'composer-loading'+(this.loading() ? ' active' : '')})
diff --git a/framework/core/js/forum/src/components/reply-composer.js b/framework/core/js/forum/src/components/reply-composer.js
index 195c9c2a5..b3b5025a2 100644
--- a/framework/core/js/forum/src/components/reply-composer.js
+++ b/framework/core/js/forum/src/components/reply-composer.js
@@ -21,15 +21,10 @@ export default class ReplyComposer extends ComposerBody {
   headerItems() {
     var items = new ItemList();
 
-    if (app.composer.position() === Composer.PositionEnum.MINIMIZED ||
-      // https://github.com/babel/babel/issues/1150
-      !app.current.discussion ||
-      app.current.discussion() !== this.props.discussion) {
-      items.add('title', m('h3', [
-        icon('reply'), ' ',
-        m('a', {href: app.route.discussion(this.props.discussion), config: m.route}, this.props.discussion.title())
-      ]));
-    }
+    items.add('title', m('h3', [
+      icon('reply'), ' ',
+      m('a', {href: app.route.discussion(this.props.discussion), config: m.route}, this.props.discussion.title())
+    ]));
 
     return items;
   }
diff --git a/framework/core/less/forum/composer.less b/framework/core/less/forum/composer.less
index 352705b5f..da54894f5 100644
--- a/framework/core/less/forum/composer.less
+++ b/framework/core/less/forum/composer.less
@@ -41,10 +41,12 @@
 
     &, & input, & a {
       color: @fl-secondary-color;
-      font-size: 16px;
+      font-size: 14px;
       font-weight: normal;
     }
     & input {
+      font-size: 16px;
+
       &, &[disabled], &:focus {
         background: none;
         border: 0;