mirror of
https://github.com/flarum/framework.git
synced 2025-02-19 07:13:24 +08:00
fix: visual bugs
This commit is contained in:
parent
21da7758af
commit
97e56af2cd
|
@ -28,7 +28,13 @@ export default class SessionDropdown<CustomAttrs extends ISessionDropdownAttrs =
|
|||
getButtonContent() {
|
||||
const user = app.session.user;
|
||||
|
||||
return [<Avatar user={user} />, ' ', <span className="Button-label">{username(user)}</span>];
|
||||
return [
|
||||
<Avatar user={user} />,
|
||||
' ',
|
||||
<span className="Button-label">
|
||||
<span className="Button-labelText">{username(user)}</span>
|
||||
</span>,
|
||||
];
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
@ -50,7 +50,9 @@ export default class SelectDropdown<CustomAttrs extends ISelectDropdownAttrs = I
|
|||
let label = (activeChild && typeof activeChild === 'object' && 'children' in activeChild && activeChild.children) || this.attrs.defaultLabel;
|
||||
|
||||
return [
|
||||
<span className="Button-label">{label}</span>,
|
||||
<span className="Button-label">
|
||||
<span className="Button-labelText">{label}</span>
|
||||
</span>,
|
||||
this.attrs.caretIcon ? <Icon name={this.attrs.caretIcon} className="Button-caret" /> : null,
|
||||
];
|
||||
}
|
||||
|
|
|
@ -44,7 +44,9 @@ export default abstract class HeaderDropdown<CustomAttrs extends IHeaderDropdown
|
|||
return [
|
||||
this.attrs.icon ? <Icon name={this.attrs.icon} className="Button-icon" /> : null,
|
||||
unread !== 0 && <span className="Bubble HeaderDropdownBubble">{unread}</span>,
|
||||
<span className="Button-label">{this.attrs.label}</span>,
|
||||
<span className="Button-label">
|
||||
<span className="Button-labelText">{this.attrs.label}</span>
|
||||
</span>,
|
||||
];
|
||||
}
|
||||
|
||||
|
|
|
@ -33,7 +33,13 @@ export default class SessionDropdown<CustomAttrs extends ISessionDropdownAttrs =
|
|||
getButtonContent() {
|
||||
const user = app.session.user;
|
||||
|
||||
return [<Avatar user={user} />, ' ', <span className="Button-label">{username(user)}</span>];
|
||||
return [
|
||||
<Avatar user={user} />,
|
||||
' ',
|
||||
<span className="Button-label">
|
||||
<span className="Button-labelText">{username(user)}</span>
|
||||
</span>,
|
||||
];
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
@ -211,7 +211,7 @@
|
|||
}
|
||||
.FormControl, .ButtonGroup, .Button {
|
||||
width: 100%;
|
||||
text-align: left;
|
||||
justify-content: start;
|
||||
}
|
||||
.Dropdown-menu {
|
||||
.ButtonGroup, .Button {
|
||||
|
|
|
@ -36,6 +36,10 @@
|
|||
}
|
||||
.DiscussionListItem-author-avatar {
|
||||
display: block;
|
||||
|
||||
+ .tooltip {
|
||||
width: max-content;
|
||||
}
|
||||
}
|
||||
.DiscussionListItem-badges {
|
||||
margin-top: 10px;
|
||||
|
|
Loading…
Reference in New Issue
Block a user