Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Haelwenn
glitchsoc-fe
Commits
9ad5de8a
Unverified
Commit
9ad5de8a
authored
Jun 01, 2018
by
David Yip
Committed by
GitHub
Jun 01, 2018
Browse files
Merge pull request #501 from ThibG/glitch-soc/features/red-bookmarks
Make active bookmarks red (fixes #493)
parents
0aba716f
b9fdeceb
Changes
4
Hide whitespace changes
Inline
Side-by-side
app/javascript/flavours/glitch/components/status_action_bar.js
View file @
9ad5de8a
...
...
@@ -188,7 +188,7 @@ export default class StatusActionBar extends ImmutablePureComponent {
<
IconButton
className
=
'
status__action-bar-button
'
disabled
=
{
reblogDisabled
}
active
=
{
status
.
get
(
'
reblogged
'
)}
pressed
=
{
status
.
get
(
'
reblogged
'
)}
title
=
{
reblogDisabled
?
intl
.
formatMessage
(
messages
.
cannot_reblog
)
:
intl
.
formatMessage
(
reblogMessage
)}
icon
=
{
reblogIcon
}
onClick
=
{
this
.
handleReblogClick
}
/
>
<
IconButton
className
=
'
status__action-bar-button star-icon
'
disabled
=
{
anonymousAccess
}
animate
active
=
{
status
.
get
(
'
favourited
'
)}
pressed
=
{
status
.
get
(
'
favourited
'
)}
title
=
{
intl
.
formatMessage
(
messages
.
favourite
)}
icon
=
'
star
'
onClick
=
{
this
.
handleFavouriteClick
}
/
>
{
shareButton
}
<
IconButton
className
=
'
status__action-bar-button
'
disabled
=
{
anonymousAccess
}
active
=
{
status
.
get
(
'
bookmarked
'
)}
pressed
=
{
status
.
get
(
'
bookmarked
'
)}
title
=
{
intl
.
formatMessage
(
messages
.
bookmark
)}
icon
=
'
bookmark
'
onClick
=
{
this
.
handleBookmarkClick
}
/
>
<
IconButton
className
=
'
status__action-bar-button
bookmark-icon
'
disabled
=
{
anonymousAccess
}
active
=
{
status
.
get
(
'
bookmarked
'
)}
pressed
=
{
status
.
get
(
'
bookmarked
'
)}
title
=
{
intl
.
formatMessage
(
messages
.
bookmark
)}
icon
=
'
bookmark
'
onClick
=
{
this
.
handleBookmarkClick
}
/
>
<
div
className
=
'
status__action-bar-dropdown
'
>
<
DropdownMenuContainer
disabled
=
{
anonymousAccess
}
status
=
{
status
}
items
=
{
menu
}
icon
=
'
ellipsis-h
'
size
=
{
18
}
direction
=
'
right
'
ariaLabel
=
{
intl
.
formatMessage
(
messages
.
more
)}
/
>
...
...
app/javascript/flavours/glitch/features/status/components/action_bar.js
View file @
9ad5de8a
...
...
@@ -159,7 +159,7 @@ export default class ActionBar extends React.PureComponent {
<
div
className
=
'
detailed-status__button
'
><
IconButton
disabled
=
{
reblog_disabled
}
active
=
{
status
.
get
(
'
reblogged
'
)}
title
=
{
reblog_disabled
?
intl
.
formatMessage
(
messages
.
cannot_reblog
)
:
intl
.
formatMessage
(
reblog_message
)}
icon
=
{
reblogIcon
}
onClick
=
{
this
.
handleReblogClick
}
/></
div
>
<
div
className
=
'
detailed-status__button
'
><
IconButton
className
=
'
star-icon
'
animate
active
=
{
status
.
get
(
'
favourited
'
)}
title
=
{
intl
.
formatMessage
(
messages
.
favourite
)}
icon
=
'
star
'
onClick
=
{
this
.
handleFavouriteClick
}
/></
div
>
{
shareButton
}
<
div
className
=
'
detailed-status__button
'
><
IconButton
active
=
{
status
.
get
(
'
bookmarked
'
)}
title
=
{
intl
.
formatMessage
(
messages
.
bookmark
)}
icon
=
'
bookmark
'
onClick
=
{
this
.
handleBookmarkClick
}
/></
div
>
<
div
className
=
'
detailed-status__button
'
><
IconButton
className
=
'
bookmark-icon
'
active
=
{
status
.
get
(
'
bookmarked
'
)}
title
=
{
intl
.
formatMessage
(
messages
.
bookmark
)}
icon
=
'
bookmark
'
onClick
=
{
this
.
handleBookmarkClick
}
/></
div
>
<
div
className
=
'
detailed-status__action-bar-dropdown
'
>
<
DropdownMenuContainer
size
=
{
18
}
icon
=
'
ellipsis-h
'
items
=
{
menu
}
direction
=
'
left
'
ariaLabel
=
'
More
'
/>
...
...
app/javascript/flavours/glitch/styles/components/index.scss
View file @
9ad5de8a
...
...
@@ -248,6 +248,10 @@
color
:
$gold-star
;
}
.bookmark-icon.active
{
color
:
$red-bookmark
;
}
.notification__display-name
{
color
:
inherit
;
font-weight
:
500
;
...
...
app/javascript/flavours/glitch/styles/variables.scss
View file @
9ad5de8a
...
...
@@ -6,6 +6,8 @@ $error-red: #df405a; // Cerise
$warning-red
:
#ff5050
;
// Sunset Orange
$gold-star
:
#ca8f04
;
// Dark Goldenrod
$red-bookmark
:
$warning-red
;
// Values from the classic Mastodon UI
$classic-base-color
:
#282c37
;
// Midnight Express
$classic-primary-color
:
#9baec8
;
// Echo Blue
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment