mirror of
https://github.com/flarum/framework.git
synced 2025-01-19 07:42:48 +08:00
Use icon instead of "Discussions" text, fix bugs
- Fix admin page crash - Only show invisible pin button on desktop; hide it completely on ≤ tablet
This commit is contained in:
parent
25932cf7c4
commit
96b85f1330
|
@ -31,6 +31,7 @@ export default function boot(app) {
|
|||
app.alerts = m.mount(document.getElementById('alerts'), AlertManager.component());
|
||||
app.history = {
|
||||
canGoBack: () => true,
|
||||
getPrevious: () => {},
|
||||
backUrl: () => app.forum.attribute('baseUrl'),
|
||||
back: function() {
|
||||
window.location = this.backUrl();
|
||||
|
|
|
@ -2,6 +2,7 @@ import { extend } from 'flarum/extend';
|
|||
import Page from 'flarum/components/Page';
|
||||
import ItemList from 'flarum/utils/ItemList';
|
||||
import listItems from 'flarum/helpers/listItems';
|
||||
import icon from 'flarum/helpers/icon';
|
||||
import DiscussionList from 'flarum/components/DiscussionList';
|
||||
import WelcomeHero from 'flarum/components/WelcomeHero';
|
||||
import DiscussionComposer from 'flarum/components/DiscussionComposer';
|
||||
|
@ -54,7 +55,7 @@ export default class IndexPage extends Page {
|
|||
app.cache.discussionList = new DiscussionList({params});
|
||||
}
|
||||
|
||||
app.history.push('index', app.translator.trans('core.forum.header.discussions_button'));
|
||||
app.history.push('index', icon('bars'));
|
||||
|
||||
this.bodyClass = 'App--index';
|
||||
}
|
||||
|
|
|
@ -70,7 +70,6 @@
|
|||
@media @tablet-up {
|
||||
.DiscussionPage-list {
|
||||
left: -@pane-width - 6px;
|
||||
width: 100%;
|
||||
position: absolute;
|
||||
z-index: @zindex-pane;
|
||||
overflow: auto;
|
||||
|
|
|
@ -5,8 +5,14 @@
|
|||
max-width: 150px;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
padding-left: 8px;
|
||||
|
||||
.icon {
|
||||
font-size: 14px;
|
||||
}
|
||||
}
|
||||
.Navigation-pin {
|
||||
display: none;
|
||||
opacity: 0;
|
||||
margin-left: -5px !important;
|
||||
border-radius: 0 @border-radius @border-radius 0;
|
||||
|
@ -18,6 +24,9 @@
|
|||
}
|
||||
|
||||
@media @desktop-hd {
|
||||
.Navigation-pin {
|
||||
display: block;
|
||||
}
|
||||
.hasPane.panePinned, .hasPane.paneShowing {
|
||||
.Navigation-back {
|
||||
border-radius: @border-radius 0 0 @border-radius !important;
|
||||
|
|
Loading…
Reference in New Issue
Block a user