Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
QOTO
qoto
Commits
3bacd13c
Commit
3bacd13c
authored
Jan 16, 2020
by
Takeshi Umeda
Browse files
Add list to tab bar
parent
4dce57dd
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
4 additions
and
0 deletions
+4
-0
app/javascript/mastodon/features/compose/index.js
app/javascript/mastodon/features/compose/index.js
+1
-0
app/javascript/mastodon/features/ui/components/tabs_bar.js
app/javascript/mastodon/features/ui/components/tabs_bar.js
+1
-0
app/javascript/mastodon/locales/en.json
app/javascript/mastodon/locales/en.json
+1
-0
app/javascript/mastodon/locales/ja.json
app/javascript/mastodon/locales/ja.json
+1
-0
No files found.
app/javascript/mastodon/features/compose/index.js
View file @
3bacd13c
...
...
@@ -107,6 +107,7 @@ class Compose extends React.PureComponent {
{
!
columns
.
some
(
column
=>
column
.
get
(
'
id
'
)
===
'
PUBLIC
'
)
&&
(
<
Link
to
=
'
/timelines/public
'
className
=
'
drawer__tab
'
title
=
{
intl
.
formatMessage
(
messages
.
public
)}
aria
-
label
=
{
intl
.
formatMessage
(
messages
.
public
)}
><
Icon
id
=
'
globe
'
fixedWidth
/><
/Link
>
)}
<
Link
to
=
'
/lists
'
className
=
'
drawer__tab
'
title
=
{
intl
.
formatMessage
(
messages
.
lists
)}
aria
-
label
=
{
intl
.
formatMessage
(
messages
.
lists
)}
><
Icon
id
=
'
list-ul
'
fixedWidth
/><
/Link
>
<
a
href
=
'
/settings/preferences
'
className
=
'
drawer__tab
'
title
=
{
intl
.
formatMessage
(
messages
.
preferences
)}
aria
-
label
=
{
intl
.
formatMessage
(
messages
.
preferences
)}
><
Icon
id
=
'
cog
'
fixedWidth
/><
/a
>
<
a
href
=
'
/auth/sign_out
'
className
=
'
drawer__tab
'
title
=
{
intl
.
formatMessage
(
messages
.
logout
)}
aria
-
label
=
{
intl
.
formatMessage
(
messages
.
logout
)}
onClick
=
{
this
.
handleLogoutClick
}
><
Icon
id
=
'
sign-out
'
fixedWidth
/><
/a
>
<
/nav
>
...
...
app/javascript/mastodon/features/ui/components/tabs_bar.js
View file @
3bacd13c
...
...
@@ -11,6 +11,7 @@ export const links = [
<
NavLink
className
=
'
tabs-bar__link
'
to
=
'
/timelines/home
'
data
-
preview
-
title
-
id
=
'
column.home
'
data
-
preview
-
icon
=
'
home
'
><
Icon
id
=
'
home
'
fixedWidth
/><
FormattedMessage
id
=
'
tabs_bar.home
'
defaultMessage
=
'
Home
'
/><
/NavLink>
,
<
NavLink
className
=
'
tabs-bar__link
'
to
=
'
/notifications
'
data
-
preview
-
title
-
id
=
'
column.notifications
'
data
-
preview
-
icon
=
'
bell
'
><
NotificationsCounterIcon
/><
FormattedMessage
id
=
'
tabs_bar.notifications
'
defaultMessage
=
'
Notifications
'
/><
/NavLink>
,
<
NavLink
className
=
'
tabs-bar__link
'
exact
to
=
'
/timelines/public
'
data
-
preview
-
title
-
id
=
'
column.public
'
data
-
preview
-
icon
=
'
globe
'
><
Icon
id
=
'
globe
'
fixedWidth
/><
FormattedMessage
id
=
'
tabs_bar.federated_timeline
'
defaultMessage
=
'
Federated
'
/><
/NavLink>
,
<
NavLink
className
=
'
tabs-bar__link
'
exact
to
=
'
/lists
'
data
-
preview
-
title
-
id
=
'
column.lists
'
data
-
preview
-
icon
=
'
list-ul
'
><
Icon
id
=
'
list-ul
'
fixedWidth
/><
FormattedMessage
id
=
'
tabs_bar.lists
'
defaultMessage
=
'
Lists
'
/><
/NavLink>
,
<
NavLink
className
=
'
tabs-bar__link optional
'
to
=
'
/search
'
data
-
preview
-
title
-
id
=
'
tabs_bar.search
'
data
-
preview
-
icon
=
'
bell
'
><
Icon
id
=
'
search
'
fixedWidth
/><
FormattedMessage
id
=
'
tabs_bar.search
'
defaultMessage
=
'
Search
'
/><
/NavLink>
,
<
NavLink
className
=
'
tabs-bar__link
'
style
=
{{
flexGrow
:
'
0
'
,
flexBasis
:
'
30px
'
}}
to
=
'
/getting-started
'
data
-
preview
-
title
-
id
=
'
getting_started.heading
'
data
-
preview
-
icon
=
'
bars
'
><
Icon
id
=
'
bars
'
fixedWidth
/><
/NavLink>
,
];
...
...
app/javascript/mastodon/locales/en.json
View file @
3bacd13c
...
...
@@ -484,6 +484,7 @@
"suggestions.header"
:
"You might be interested in…"
,
"tabs_bar.federated_timeline"
:
"Federated"
,
"tabs_bar.home"
:
"Home"
,
"tabs_bar.lists"
:
"List"
,
"tabs_bar.local_timeline"
:
"Local"
,
"tabs_bar.notifications"
:
"Notifications"
,
"tabs_bar.search"
:
"Search"
,
...
...
app/javascript/mastodon/locales/ja.json
View file @
3bacd13c
...
...
@@ -466,6 +466,7 @@
"suggestions.header"
:
"興味あるかもしれません…"
,
"tabs_bar.federated_timeline"
:
"連合"
,
"tabs_bar.home"
:
"ホーム"
,
"tabs_bar.lists"
:
"リスト"
,
"tabs_bar.local_timeline"
:
"ローカル"
,
"tabs_bar.notifications"
:
"通知"
,
"tabs_bar.search"
:
"検索"
,
...
...
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