github-mirror/framework
2
0
Fork 0
mirror of https://github.com/flarum/framework.git synced 2025-02-01 23:01:44 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use a slightly different icon for suggesting upload functionality

Browse Source 
Refs #249.
This commit is contained in:
Franz Liedke 2016-04-17 22:24:09 +09:00
parent b4480acbfa
commit 3e7aaf0641
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
framework/core/js/forum/dist/app.js vendored
View File

@ -18998,7 +18998,7 @@ System.register('flarum/components/AvatarEditor', ['flarum/Component', 'flarum/h
{ className: user.avatarUrl() ? "Dropdown-toggle" : "Dropdown-toggle AvatarEditor--noAvatar", { className: user.avatarUrl() ? "Dropdown-toggle" : "Dropdown-toggle AvatarEditor--noAvatar",
'data-toggle': 'dropdown', 'data-toggle': 'dropdown',
onclick: this.quickUpload.bind(this) }, onclick: this.quickUpload.bind(this) },
this.loading ? LoadingIndicator.component() : user.avatarUrl() ? icon('pencil') : icon('upload') this.loading ? LoadingIndicator.component() : user.avatarUrl() ? icon('pencil') : icon('plus-circle')
), ),
m( m(
'ul', 'ul',

6
framework/core/js/forum/src/components/AvatarEditor.js
View File

@ -38,9 +38,9 @@ export default class AvatarEditor extends Component {
<div className={'AvatarEditor Dropdown ' + this.props.className + (this.loading ? ' loading' : '')}> <div className={'AvatarEditor Dropdown ' + this.props.className + (this.loading ? ' loading' : '')}>
{avatar(user)} {avatar(user)}
<a className={ user.avatarUrl() ? "Dropdown-toggle" : "Dropdown-toggle AvatarEditor--noAvatar" } <a className={ user.avatarUrl() ? "Dropdown-toggle" : "Dropdown-toggle AvatarEditor--noAvatar" }
data-toggle="dropdown" data-toggle="dropdown"
onclick={this.quickUpload.bind(this)}> onclick={this.quickUpload.bind(this)}>
{this.loading ? LoadingIndicator.component() : (user.avatarUrl() ? icon('pencil') : icon('upload'))} {this.loading ? LoadingIndicator.component() : (user.avatarUrl() ? icon('pencil') : icon('plus-circle'))}
</a> </a>
<ul className="Dropdown-menu Menu"> <ul className="Dropdown-menu Menu">
{listItems(this.controlItems().toArray())} {listItems(this.controlItems().toArray())}