github-mirror/framework
2
0
Fork 0
mirror of https://github.com/flarum/framework.git synced 2024-12-11 21:43:38 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Always show composer header. closes flarum/core#112

Browse Source
This commit is contained in:
Toby Zerner 2015-06-26 12:18:13 +09:30
parent 5c3e3abf70
commit 9a04603587
3 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
framework/core/js/forum/src/components/composer-body.js
View File

@ -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' : '')})

13
framework/core/js/forum/src/components/reply-composer.js
View File

@ -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;
}

4
framework/core/less/forum/composer.less
View File

@ -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;