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
Pleroma
mastofe
Commits
bcd29f1d
Verified
Commit
bcd29f1d
authored
Jul 03, 2019
by
KokaKiwi
Committed by
Haelwenn
Feb 29, 2020
Browse files
Fix "Getting Started" column
parent
c7155a8c
Changes
2
Hide whitespace changes
Inline
Side-by-side
app/javascript/flavours/glitch/features/getting_started/index.js
View file @
bcd29f1d
...
...
@@ -177,12 +177,12 @@ const NAVIGATION_PANEL_BREAKPOINT = 600 + (285 * 2) + (10 * 2);
<
/div>
,
]);
const
instance_panel
=
(
customPanelEnabled
?
<
div
className
=
'
getting-started getting-started__panel
scrollable
'
dangerouslySetInnerHTML
=
{{
__html
:
customPanel
}}
/> : null
)
;
const
instance_panel
=
(
customPanelEnabled
?
<
div
className
=
'
getting-started getting-started__panel
'
dangerouslySetInnerHTML
=
{{
__html
:
customPanel
}}
/> : null
)
;
return
(
<
Column
bindToDocument
=
{
!
multiColumn
}
name
=
'
getting-started
'
icon
=
'
asterisk
'
heading
=
{
intl
.
formatMessage
(
messages
.
heading
)}
label
=
{
intl
.
formatMessage
(
messages
.
menu
)}
hideHeadingOnMobile
>
<
div
className
=
'
scrollable optionally-scrollable
'
>
<
div
className
=
'
getting-started__wrapper
scrollable
'
>
<
div
className
=
'
getting-started__wrapper
'
>
{
!
multiColumn
&&
<
NavigationBar
account
=
{
myAccount
}
/>
}
{
multiColumn
&&
<
ColumnSubheading
text
=
{
intl
.
formatMessage
(
messages
.
navigation_subheading
)}
/>
}
{
navItems
}
...
...
app/javascript/flavours/glitch/features/ui/components/link_footer.js
View file @
bcd29f1d
import
{
connect
}
from
'
react-redux
'
;
import
React
from
'
react
'
;
import
PropTypes
from
'
prop-types
'
;
import
{
FormattedMessage
,
defineMessages
,
injectIntl
}
from
'
react-intl
'
;
import
{
FormattedMessage
,
injectIntl
}
from
'
react-intl
'
;
import
{
Link
}
from
'
react-router-dom
'
;
const
messages
=
defineMessages
({
logoutMessage
:
{
id
:
'
confirmations.logout.message
'
,
defaultMessage
:
'
Are you sure you want to log out?
'
},
logoutConfirm
:
{
id
:
'
confirmations.logout.confirm
'
,
defaultMessage
:
'
Log out
'
},
});
export
default
@
injectIntl
@
connect
(
null
,
mapDispatchToProps
)
class
LinkFooter
extends
React
.
PureComponent
{
...
...
@@ -19,7 +14,7 @@ class LinkFooter extends React.PureComponent {
render
()
{
return
(
<
div
className
=
'
getting-started__footer
scrollable
'
>
<
div
className
=
'
getting-started__footer
'
>
<
p
>
<
FormattedMessage
id
=
'
getting_started.mastofe_notice
'
...
...
Write
Preview
Supports
Markdown
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