diff options
Diffstat (limited to 'app/javascript/flavours/glitch')
-rw-r--r-- | app/javascript/flavours/glitch/features/getting_started/components/announcements.js | 12 | ||||
-rw-r--r-- | app/javascript/flavours/glitch/styles/polls.scss | 2 |
2 files changed, 11 insertions, 3 deletions
diff --git a/app/javascript/flavours/glitch/features/getting_started/components/announcements.js b/app/javascript/flavours/glitch/features/getting_started/components/announcements.js index 5f6e6d84c..acaa78fe3 100644 --- a/app/javascript/flavours/glitch/features/getting_started/components/announcements.js +++ b/app/javascript/flavours/glitch/features/getting_started/components/announcements.js @@ -378,6 +378,14 @@ class Announcements extends ImmutablePureComponent { index: 0, }; + static getDerivedStateFromProps(props, state) { + if (props.announcements.size > 0 && state.index >= props.announcements.size) { + return { index: props.announcements.size - 1 }; + } else { + return null; + } + } + componentDidMount () { this._markAnnouncementAsRead(); } @@ -389,7 +397,7 @@ class Announcements extends ImmutablePureComponent { _markAnnouncementAsRead () { const { dismissAnnouncement, announcements } = this.props; const { index } = this.state; - const announcement = announcements.get(index) || announcements.get(index - 1); + const announcement = announcements.get(index); if (!announcement.get('read')) dismissAnnouncement(announcement.get('id')); } @@ -407,7 +415,7 @@ class Announcements extends ImmutablePureComponent { render () { const { announcements, intl } = this.props; - const index = this.state.index < announcements.size ? this.state.index : announcements.size - 1; + const { index } = this.state; if (announcements.isEmpty()) { return null; diff --git a/app/javascript/flavours/glitch/styles/polls.scss b/app/javascript/flavours/glitch/styles/polls.scss index 9c86cca58..f00aac2ee 100644 --- a/app/javascript/flavours/glitch/styles/polls.scss +++ b/app/javascript/flavours/glitch/styles/polls.scss @@ -102,8 +102,8 @@ &:active, &:focus, &:hover { + border-color: lighten($valid-value-color, 15%); border-width: 4px; - background: none; } &::-moz-focus-inner { |