diff --git a/app/renderer/components/common/browserButton.js b/app/renderer/components/common/browserButton.js index 8d7acaf4766..6e9db23dda7 100644 --- a/app/renderer/components/common/browserButton.js +++ b/app/renderer/components/common/browserButton.js @@ -14,6 +14,9 @@ class BrowserButton extends ImmutableComponent { this.props.primaryColor && [styles.browserButton_default, styles.browserButton_primaryColor], this.props.secondaryColor && [styles.browserButton_default, styles.browserButton_secondaryColor], this.props.subtleItem && [styles.browserButton_default, styles.browserButton_subtleItem], + // actionItem is just subtleItem with a blue background + this.props.actionItem && + [styles.browserButton_default, styles.browserButton_subtleItem, styles.browserButton_actionItem], this.props.extensionItem && styles.browserButton_extensionItem, this.props.groupedItem && styles.browserButton_groupedItem, this.props.notificationItem && styles.browserButton_notificationItem @@ -21,7 +24,6 @@ class BrowserButton extends ImmutableComponent { // that needs to be refactored and included in this file // ............................................. // this.props.smallItem && styles.browserButton_smallItem, - // this.props.actionItem && styles.browserButton_actionItem, // this.props.navItem && styles.browserButton_navItem, // this.props.panelItem && styles.browserButton_panelItem, ] @@ -185,6 +187,10 @@ const styles = StyleSheet.create({ ':active': { bottom: 0 } + }, + + browserButton_actionItem: { + background: globalStyles.button.action.backgroundColor } }) diff --git a/app/renderer/components/main/noScriptInfo.js b/app/renderer/components/main/noScriptInfo.js index 217e1664d44..755e9bf67d1 100644 --- a/app/renderer/components/main/noScriptInfo.js +++ b/app/renderer/components/main/noScriptInfo.js @@ -11,7 +11,7 @@ const urlParse = require('../../../common/urlParse') // Components const ImmutableComponent = require('../immutableComponent') const Dialog = require('../common/dialog') -const Button = require('../common/button') +const BrowserButton = require('../common/browserButton') // Actions const appActions = require('../../../../js/actions/appActions') @@ -100,12 +100,10 @@ class NoScriptInfo extends ImmutableComponent { get buttons () { return
- <button data-l10n-id='done' className='browserButton actionButton'{'\n'}
+ <BrowserButton actionItem l10nId='done'{'\n'}
onClick={'{this.onRemoveBookmark}'} />
diff --git a/less/button.less b/less/button.less
index 93a7a1fa938..72bd2eb4279 100644
--- a/less/button.less
+++ b/less/button.less
@@ -85,7 +85,6 @@ span.buttonSeparator {
}
&.primaryButton,
- &.actionButton,
&.wideButton,
&.subtleButton,
&.whiteButton {
@@ -99,7 +98,6 @@ span.buttonSeparator {
}
&.primaryButton,
- &.actionButton,
&.subtleButton,
&.whiteButton {
padding-right: 16px;
@@ -121,10 +119,6 @@ span.buttonSeparator {
}
}
- &.actionButton {
- background-color: #4099FF;
- }
-
&.wideButton {
width: auto;
padding-right: 35px;