diff --git a/app/renderer/components/styles/commonStyles.js b/app/renderer/components/styles/commonStyles.js
index 030756b867..a0014ec8cc 100644
--- a/app/renderer/components/styles/commonStyles.js
+++ b/app/renderer/components/styles/commonStyles.js
@@ -174,13 +174,20 @@ const styles = StyleSheet.create({
width: '100%',
cursor: 'default',
userSelect: 'none',
- marginTop: globalStyles.spacing.navbarMenubarMargin
+ // if there's more than one notification per site,
+ // ensure border is on the last only
+ ':last-child': {
+ borderBottom: `5px solid ${globalStyles.color.notificationBottomBorderColor}`
+ },
+ // last-child will always be orange, but others can be gray
+ ':not(:last-child)': {
+ borderBottom: `1px solid ${globalStyles.color.tabsToolbarBorderColor}`
+ }
},
notificationBar__notificationItem: {
- backgroundColor: '#ffefc0',
+ backgroundColor: globalStyles.color.notificationItemColor,
boxSizing: 'border-box',
borderTop: `1px solid ${globalStyles.color.tabsToolbarBorderColor}`,
- borderBottom: `1px solid ${globalStyles.color.tabsToolbarBorderColor}`,
lineHeight: '24px',
padding: '8px 20px'
},
diff --git a/app/renderer/components/styles/global.js b/app/renderer/components/styles/global.js
index c81b59f483..56a2413500 100644
--- a/app/renderer/components/styles/global.js
+++ b/app/renderer/components/styles/global.js
@@ -75,6 +75,8 @@ const globalStyles = {
statsBlue: '#0796fa',
statsLightGray: '#999999',
defaultIconBackground: '#F7F7F7',
+ notificationItemColor: '#f1e9e5',
+ notificationBottomBorderColor: '#ff5500',
almostInvisible: 'rgba(255,255,255,0.01)',
urlBarOutline: '#bbb',
alphaWhite: 'rgba(255,255,255,0.8)'
diff --git a/app/renderer/components/tabs/tab.js b/app/renderer/components/tabs/tab.js
index 9b215c4f86..d4aeaaa39a 100644
--- a/app/renderer/components/tabs/tab.js
+++ b/app/renderer/components/tabs/tab.js
@@ -14,6 +14,7 @@ const NewSessionIcon = require('./content/newSessionIcon')
const PrivateIcon = require('./content/privateIcon')
const TabTitle = require('./content/tabTitle')
const CloseTabIcon = require('./content/closeTabIcon')
+const {NotificationBarCaret} = require('../../../../js/components/notificationBar')
// Actions
const windowActions = require('../../../../js/actions/windowActions')
@@ -41,6 +42,7 @@ const throttle = require('../../../../js/lib/throttle')
const {getTabBreakpoint, tabUpdateFrameRate} = require('../../lib/tabUtil')
const {isWindows} = require('../../../common/lib/platformUtil')
const {getCurrentWindowId} = require('../../currentWindow')
+const UrlUtil = require('../../../../js/lib/urlutil')
class Tab extends ImmutableComponent {
constructor () {
@@ -303,6 +305,13 @@ class Tab extends ImmutableComponent {
style={this.props.tabWidth ? { flex: `0 0 ${this.props.tabWidth}px` } : {}}
onMouseEnter={this.onMouseEnter}
onMouseLeave={this.onMouseLeave}>
+ {
+ this.props.isActive &&
+ this.props.notificationBarActive
+ .includes(UrlUtil.getUrlOrigin(this.props.tab.get('location')))
+ ?