diff --git a/app/renderer/components/common/browserButton.js b/app/renderer/components/common/browserButton.js index 6e9db23dda7..71469d3dfa8 100644 --- a/app/renderer/components/common/browserButton.js +++ b/app/renderer/components/common/browserButton.js @@ -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, @@ -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: { diff --git a/app/renderer/components/main/notificationBar.js b/app/renderer/components/main/notificationBar.js index 93e49d43390..979de732847 100644 --- a/app/renderer/components/main/notificationBar.js +++ b/app/renderer/components/main/notificationBar.js @@ -83,7 +83,7 @@ class NotificationItem extends ImmutableComponent { } { this.props.detail.get('buttons').map((button) => -

-          <BrowserButton l10nId='cancel' onClick={'{this.onRemoveBookmark}'} />
+          <BrowserButton primaryColor l10nId='cancel' onClick={'{this.onRemoveBookmark}'} />
+        
+ + +

+          <BrowserButton secondaryColor l10nId='secondaryColor' onClick={'{this.onRemoveBookmark}'} />
         

-          <BrowserButton actionItem l10nId='done'{'\n'}
-          onClick={'{this.onRemoveBookmark}'} />
+          <BrowserButton actionItem l10nId='done' onClick={'{this.onRemoveBookmark}'} />
         
@@ -284,9 +288,9 @@ class AboutStyle extends ImmutableComponent { <BrowserButton subtleItem l10nId='cancel' onClick={'{this.onRemoveBookmark}'} /> - - - + + +

           <BrowserButton primaryColor groupedItem l10nId='cancel' onClick={'{this.onRemoveBookmark}'} />{'\n'}
           <BrowserButton secondaryColor groupedItem l10nId='cancel' onClick={'{this.onRemoveBookmark}'} />{'\n'}
@@ -298,9 +302,11 @@ class AboutStyle extends ImmutableComponent {
           <BrowserButton extensionItem l10nId='cancel' onClick={'{this.onRemoveBookmark}'} />
         
- + +

-          <BrowserButton notificationItem l10nId='cancel' onClick={'{this.onRemoveBookmark}'} />
+          <BrowserButton secondaryColor notificationItem groupedItem l10nId='Yes' onClick={'{this.onRemoveBookmark}'} />{'\n'}
+          <BrowserButton secondaryColor notificationItem groupedItem l10nId='No' onClick={'{this.onRemoveBookmark}'} />
         
@@ -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'