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

Polish notification button #9239

Merged
merged 3 commits into from
Jun 9, 2017
Merged

Polish notification button #9239

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
664af88
Increase notification buttons height with px
Jun 3, 2017
1cc467e
Polish buttons on about:styles
Jun 3, 2017
bdb27c7
Add groupedItem to notification buttons
Jun 3, 2017
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
7 changes: 2 additions & 5 deletions app/renderer/components/common/browserButton.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,9 +88,9 @@ const styles = StyleSheet.create({
boxShadow: globalStyles.button.default.boxShadow,
cursor: 'pointer',
width: 'auto',
height: 'auto',

// TODO: #9223
height: '32px', // 32px == 1rem * 2
fontSize: globalStyles.spacing.defaultFontSize,
lineHeight: 1.25,

Expand Down Expand Up @@ -163,11 +163,8 @@ const styles = StyleSheet.create({
},

browserButton_notificationItem: {
fontSize: '13px',
marginRight: '10px',
padding: '2px 15px',
textTransform: 'capitalize',
width: 'auto'
height: '28px'
},

browserButton_subtleItem: {
Expand Down
2 changes: 1 addition & 1 deletion app/renderer/components/main/notificationBar.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ class NotificationItem extends ImmutableComponent {
}
{
this.props.detail.get('buttons').map((button) =>
<BrowserButton notificationItem secondaryColor
<BrowserButton secondaryColor notificationItem groupedItem
iconClass={button.get('className')}
testId='notificationButton'
label={button.get('text')}
Expand Down
31 changes: 20 additions & 11 deletions js/about/styles.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,23 +270,27 @@ class AboutStyle extends ImmutableComponent {

<BrowserButton primaryColor l10nId='primaryColor' onClick={this.onRemoveBookmark} />
<Pre><Code>
&lt;BrowserButton l10nId='cancel' onClick={'{this.onRemoveBookmark}'} />
&lt;BrowserButton primaryColor l10nId='cancel' onClick={'{this.onRemoveBookmark}'} />
</Code></Pre>

<BrowserButton secondaryColor l10nId='secondaryColor' onClick={this.onRemoveBookmark} />
<Pre><Code>
&lt;BrowserButton secondaryColor l10nId='secondaryColor' onClick={'{this.onRemoveBookmark}'} />
</Code></Pre>

<BrowserButton actionItem l10nId='actionButton' onClick={this.onRemoveBookmark} />
<Pre><Code>
&lt;BrowserButton actionItem l10nId='done'{'\n'}
onClick={'{this.onRemoveBookmark}'} />
&lt;BrowserButton actionItem l10nId='done' onClick={'{this.onRemoveBookmark}'} />
</Code></Pre>

<BrowserButton subtleItem l10nId='subtleButton' onClick={this.onRemoveBookmark} />
<Pre><Code>
&lt;BrowserButton subtleItem l10nId='cancel' onClick={'{this.onRemoveBookmark}'} />
</Code></Pre>

<BrowserButton primaryColor groupedItem l10nId='primaryButton' onClick={this.onRemoveBookmark} />
<BrowserButton secondaryColor groupedItem l10nId='whiteButton' onClick={this.onRemoveBookmark} />
<BrowserButton primaryColor groupedItem l10nId='primaryButton' onClick={this.onRemoveBookmark} />
<BrowserButton primaryColor groupedItem l10nId='primaryColor' onClick={this.onRemoveBookmark} />
<BrowserButton secondaryColor groupedItem l10nId='secondaryColor' onClick={this.onRemoveBookmark} />
<BrowserButton primaryColor groupedItem l10nId='primaryColor' onClick={this.onRemoveBookmark} />
<Pre><Code>
&lt;BrowserButton primaryColor groupedItem l10nId='cancel' onClick={'{this.onRemoveBookmark}'} />{'\n'}
&lt;BrowserButton secondaryColor groupedItem l10nId='cancel' onClick={'{this.onRemoveBookmark}'} />{'\n'}
Expand All @@ -298,9 +302,11 @@ class AboutStyle extends ImmutableComponent {
&lt;BrowserButton extensionItem l10nId='cancel' onClick={'{this.onRemoveBookmark}'} />
</Code></Pre>

<BrowserButton notificationItem l10nId='notificationItem' onClick={this.onRemoveBookmark} />
<BrowserButton secondaryColor notificationItem groupedItem l10nId='notificationItem' onClick={this.onRemoveBookmark} />
<BrowserButton secondaryColor notificationItem groupedItem l10nId='notificationItem' onClick={this.onRemoveBookmark} />
<Pre><Code>
&lt;BrowserButton notificationItem l10nId='cancel' onClick={'{this.onRemoveBookmark}'} />
&lt;BrowserButton secondaryColor notificationItem groupedItem l10nId='Yes' onClick={'{this.onRemoveBookmark}'} />{'\n'}
&lt;BrowserButton secondaryColor notificationItem groupedItem l10nId='No' onClick={'{this.onRemoveBookmark}'} />
</Code></Pre>

<GoTop />
Expand Down Expand Up @@ -694,15 +700,18 @@ const styles = StyleSheet.create({

wrapper: common,
container: common,

pre: {
background: '#1d1f21',
color: '#FFFFFF',
color: '#fff',
fontSize: '14px',
padding: '5px',
padding: '1rem',
borderRadius: globalStyles.radius.borderRadius,
tabSize: '2',
wordBreak: 'normal'
wordBreak: 'normal',
overflowX: 'scroll'
},

code: {
fontFamily: 'monospace',
whiteSpace: 'pre'
Expand Down