github-mirror/framework
2
0
Fork 0
mirror of https://github.com/flarum/framework.git synced 2025-06-06 07:54:32 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Change the way composer is aligned

Browse Source 
Also ensure that the correct body class is applied on the user page
This commit is contained in:
Toby Zerner
2015-08-04 10:49:33 +09:30
parent ecb1023c66
commit 00e5f94bce
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
js/forum/src/components/ActivityPage.js
View File

@ -89,7 +89,9 @@ export default class ActivityPage extends UserPage {
this.loading = true; this.loading = true;
this.activity = []; this.activity = [];
m.redraw(); // Redraw, but only if we're not in the middle of a route change.
m.startComputation();
m.endComputation();
this.loadResults().then(this.parseResults.bind(this)); this.loadResults().then(this.parseResults.bind(this));
} }

9
less/forum/Composer.less
View File

@ -209,6 +209,7 @@
right: 0; right: 0;
margin: 0; margin: 0;
height: auto; height: auto;
border-radius: 0;
} }
} }
.Composer-controls { .Composer-controls {
@ -271,12 +272,12 @@
@media @desktop-up { @media @desktop-up {
.Composer:not(.fullScreen) { .Composer:not(.fullScreen) {
margin-left: -20px;
margin-right: 180px;
.App--index & {
margin-left: 205px; margin-left: 205px;
margin-right: -20px; margin-right: -20px;
.App--discussion & {
margin-left: -20px;
margin-right: 180px;
} }
} }
} }