Skip to content
This repository has been archived by the owner on Dec 11, 2019. It is now read-only.

Fix overflowing notification buttons #3939

Merged
merged 1 commit into from
Sep 13, 2016
Merged

Fix overflowing notification buttons #3939

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 13 additions & 13 deletions js/components/notificationBar.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,19 +35,6 @@ class NotificationItem extends ImmutableComponent {
const options = this.props.detail.get('options')
const greeting = this.props.detail.get('greeting')
return <div className={'notificationItem ' + (options.get('style') || '')}>
{
greeting
? <span className='greeting'>{greeting}</span>
: null
}
<span className='message'>{this.props.detail.get('message')}</span>
<span className='notificationAdvanced'>
{
options.get('advancedText') && options.get('advancedLink')
? <span onClick={this.openAdvanced.bind(this)}>{options.get('advancedText')}</span>
: null
}
</span>
<span className='options'>
{
options.get('persist')
Expand All @@ -66,6 +53,19 @@ class NotificationItem extends ImmutableComponent {
)
}
</span>
{
greeting
? <span className='greeting'>{greeting}</span>
: null
}
<span className='message'>{this.props.detail.get('message')}</span>
<span className='notificationAdvanced'>
{
options.get('advancedText') && options.get('advancedLink')
? <span onClick={this.openAdvanced.bind(this)}>{options.get('advancedText')}</span>
: null
}
</span>
</div>
}
}
Expand Down
32 changes: 16 additions & 16 deletions js/components/updateBar.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,10 +79,6 @@ class UpdateLog extends ImmutableComponent {
class UpdateAvailable extends ImmutableComponent {
render () {
return <div>
<UpdateHello updateStatus={this.props.updateStatus} l10nId='updateHello' />
<span className='message' data-l10n-id='updateAvail' />
<span className='message secondary' data-l10n-id='updateRequiresRelaunch' />
<span className='spacer' />
<span className='options'>
{
this.props.metadata && this.props.metadata.get('notes')
Expand All @@ -98,61 +94,65 @@ class UpdateAvailable extends ImmutableComponent {
l10nId='updateNow'
onClick={appActions.setUpdateStatus.bind(null, UpdateStatus.UPDATE_APPLYING_RESTART, false, undefined)} />
</span>
<UpdateHello updateStatus={this.props.updateStatus} l10nId='updateHello' />
<span className='message' data-l10n-id='updateAvail' />
<span className='message secondary' data-l10n-id='updateRequiresRelaunch' />
<span className='spacer' />
</div>
}
}

class UpdateChecking extends ImmutableComponent {
render () {
return <div>
<UpdateHello updateStatus={this.props.updateStatus} />
<span className='message' data-l10n-id='updateChecking' />
<span className='spacer' />
<span className='options'>
<UpdateLog />
<UpdateHide />
</span>
<UpdateHello updateStatus={this.props.updateStatus} />
<span className='message' data-l10n-id='updateChecking' />
<span className='spacer' />
</div>
}
}

class UpdateDownloading extends ImmutableComponent {
render () {
return <div>
<UpdateHello updateStatus={this.props.updateStatus} />
<span className='message' data-l10n-id='updateDownloading' />
<span className='spacer' />
<span className='options'>
<UpdateLog />
<UpdateHide />
</span>
<UpdateHello updateStatus={this.props.updateStatus} />
<span className='message' data-l10n-id='updateDownloading' />
<span className='spacer' />
</div>
}
}

class UpdateError extends ImmutableComponent {
render () {
return <div>
<UpdateHello updateStatus={this.props.updateStatus} l10nId='updateOops' />
<span className='message' data-l10n-id='updateError' />
<span className='spacer' />
<span className='options'>
<UpdateLog />
<UpdateHide reset />
</span>
<UpdateHello updateStatus={this.props.updateStatus} l10nId='updateOops' />
<span className='message' data-l10n-id='updateError' />
<span className='spacer' />
</div>
}
}

class UpdateNotAvailable extends ImmutableComponent {
render () {
return <div>
<UpdateHello updateStatus={this.props.updateStatus} l10nId='updateNotYet' />
<span className='message' data-l10n-id='updateNotAvail' />
<span className='spacer' />
<span className='options'>
<UpdateHide reset />
</span>
<UpdateHello updateStatus={this.props.updateStatus} l10nId='updateNotYet' />
<span className='message' data-l10n-id='updateNotAvail' />
<span className='spacer' />
</div>
}
}
Expand Down