Browse Source

Navigation & other minor changes

master
Tuan 2 years ago
parent
commit
b1d514ba47
  1. 2
      app/javascript/flavours/glitch/components/error_boundary.js
  2. 2
      app/javascript/flavours/glitch/features/ui/components/link_footer.js
  3. 7
      app/javascript/flavours/glitch/features/ui/components/navigation_panel.js
  4. 2
      app/javascript/flavours/glitch/locales/en.js
  5. 2
      app/javascript/flavours/glitch/locales/tr.js
  6. 6
      app/javascript/skins/glitch/summertime/common.scss

2
app/javascript/flavours/glitch/components/error_boundary.js

@ -67,7 +67,7 @@ export default class ErrorBoundary extends React.PureComponent {
return (
<div tabIndex='-1'>
<div className='error-boundary'>
<h1><FormattedMessage id='web_app_crash.title' defaultMessage="We're sorry, but something went wrong with the Mastodon app." /></h1>
<h1><FormattedMessage id='web_app_crash.title' defaultMessage="We're sorry, but something went wrong with the metu.life." /></h1>
<p>
<FormattedMessage id='web_app_crash.content' defaultMessage='You could try any of the following:' />
</p>

2
app/javascript/flavours/glitch/features/ui/components/link_footer.js

@ -55,7 +55,7 @@ class LinkFooter extends React.PureComponent {
<p>
<FormattedMessage
id='getting_started.open_source_notice'
defaultMessage='Metu.Life is a free as in freedom software forked from {Mastodon}. View our {github}. You can donate at {patreon} to support us.'
defaultMessage='metu.life is free -as in freedom- software forked from {Mastodon}. View our {github}. You can donate at {patreon} to support us.'
values={{
github: <span><a href='https://git.oyd.org.tr/MetuFSS/metu.life' rel='noopener noreferrer' target='_blank'>source code</a> (v{version})</span>,
Mastodon: <a href='https://github.com/glitch-soc/mastodon' rel='noopener noreferrer' target='_blank'>glitch-soc/mastodon</a>,

7
app/javascript/flavours/glitch/features/ui/components/navigation_panel.js

@ -16,10 +16,13 @@ const NavigationPanel = ({ onOpenSettings }) => (
<FollowRequestsNavLink />
<NavLink className='column-link column-link--transparent' to='/timelines/public/local' data-preview-title-id='column.community' data-preview-icon='users' ><Icon className='column-link__icon' id='users' fixedWidth /><FormattedMessage id='tabs_bar.local_timeline' defaultMessage='Local' /></NavLink>
<NavLink className='column-link column-link--transparent' exact to='/timelines/public' data-preview-title-id='column.public' data-preview-icon='globe' ><Icon className='column-link__icon' id='globe' fixedWidth /><FormattedMessage id='tabs_bar.federated_timeline' defaultMessage='Federated' /></NavLink>
<NavLink className='column-link column-link--transparent' to='/timelines/tag/metulife'><Icon className='column-link__icon' id='hashtag' fixedWidth /><FormattedMessage id='navigation_bar.journal' defaultMessage='metu.life Journal'></FormattedMessage></NavLink>
<NavLink className='column-link column-link--transparent' to='/timelines/direct'><Icon className='column-link__icon' id='envelope' fixedWidth /><FormattedMessage id='navigation_bar.direct' defaultMessage='Direct messages' /></NavLink>
<NavLink className='column-link column-link--transparent' to='/bookmarks'><Icon className='column-link__icon' id='bookmark' fixedWidth /><FormattedMessage id='navigation_bar.bookmarks' defaultMessage='Bookmarks' /></NavLink>
{profile_directory && <NavLink className='column-link column-link--transparent' to='/directory'><Icon className='column-link__icon' id='address-book-o' fixedWidth /><FormattedMessage id='getting_started.directory' defaultMessage='Profile directory' /></NavLink>}
<NavLink className='column-link column-link--transparent' to='/lists'><Icon className='column-link__icon' id='list-ul' fixedWidth /><FormattedMessage id='navigation_bar.lists' defaultMessage='Lists' /></NavLink>
<NavLink className='column-link column-link--transparent' to='/getting-started-misc'><Icon className='column-link__icon' id='ellipsis-h' fixedWidth /><FormattedMessage id='navigation_bar.misc' defaultMessage='Misc' /></NavLink>
<ListPanel />
@ -39,8 +42,10 @@ const NavigationPanel = ({ onOpenSettings }) => (
<p><audio style={{width: "285px"}} controls><source src="https://sc.vargonen.net:5001/;stream.mp3"></source></audio></p>
<p><FormattedMessage id='navigation_bar.radiostation' defaultMessage='Current radio station' />: <a id="current-radio" className='column-link--transparent' href='https://www.futuregeneration.net/' target='_blank'>FG</a></p>
<hr />
<a className='column-link column-link--transparent' href='https://think.metu.life' target='_blank'><Icon className='column-link__icon' id='lightbulb-o' fixedWidth /><FormattedMessage id='navigation_bar.think' defaultMessage='Think' /></a>
<a className='column-link column-link--transparent' href='https://discord.gg/p3j8H73Z6s' target='_blank'><Icon className='column-link__icon' id='comments-o' fixedWidth /><FormattedMessage id='navigation_bar.discord' defaultMessage='Discord Server' /></a>
<a className='column-link column-link--transparent' href='/about' target='_blank'><Icon className='column-link__icon' id='external-link' fixedWidth /><FormattedMessage id='navigation_bar.frontpage' defaultMessage='Show front page' /></a>
<p><FormattedMessage id='navigation_bar.weekly' defaultMessage='Join our' /> <a id="discord-server" className='column-link--transparent' href='https://discord.gg/p3j8H73Z6s' target='_blank'>Discord Server</a></p>
<hr />

2
app/javascript/flavours/glitch/locales/en.js

@ -1,7 +1,7 @@
import inherited from 'mastodon/locales/en.json';
const messages = {
'getting_started.open_source_notice': 'Metu Life is free open source software forked from {Mastodon}.', /* You can contribute or report issues on GitHub at {github}.' */
'getting_started.open_source_notice': 'metu.life is free -as in freedom- software forked from {Mastodon}. View our source code {github}. You can donate at {patreon} to support us.',
'layout.auto': 'Auto',
'layout.current_is': 'Your current layout is:',
'layout.desktop': 'Desktop',

2
app/javascript/flavours/glitch/locales/tr.js

@ -1,7 +1,7 @@
import inherited from 'mastodon/locales/tr.json';
const messages = {
// No translations available.
// No translations available
'compose.attach.jitsi': 'Arama başlat',
'compose.attach.doodle': 'Çizim yap',
'compose.attach.gif': 'GIF yükle',

6
app/javascript/skins/glitch/summertime/common.scss

@ -8,9 +8,9 @@
background-size: 128px 128px;
background-color: #fffbe7;
background-image: -webkit-gradient(linear, 0 0, 100% 0, color-stop(.5, #08bec6), color-stop(.5, transparent), to(transparent));
background-image: -moz-linear-gradient(left, #08bec6 50%, transparent 50%, transparent);
background-image: -o-linear-gradient(left, #08bec6 50%, transparent 50%, transparent);
background-image: linear-gradient(left, #08bec6 50%, transparent 50%, transparent);
background-image: -moz-linear-gradient(to left, #08bec6 50%, transparent 50%, transparent);
background-image: -o-linear-gradient(to left, #08bec6 50%, transparent 50%, transparent);
background-image: linear-gradient(to left, #08bec6 50%, transparent 50%, transparent);
}
/* drawer */
.drawer__inner,

Loading…
Cancel
Save