minor changes

app/javascript/flavours/glitch/features/getting_started/index.js

@@ -40,8 +40,8 @@ const messages = defineMessages({
   misc: { id: 'navigation_bar.misc', defaultMessage: 'Misc' },
   menu: { id: 'getting_started.heading', defaultMessage: 'Getting started' },
   profile_directory: { id: 'getting_started.directory', defaultMessage: 'Profile directory' },
-  radyoodtu: { id: 'navigation_bar.misc', defaultMessage: 'Radyo ODTU' },
+  radyoodtu: { id: 'navigation_bar.radio1', defaultMessage: 'Radyo ODTU' },
-  futuregeneration: { id: 'navigation_bar.misc', defaultMessage: 'Future Generation' },
+  futuregeneration: { id: 'navigation_bar.radio2', defaultMessage: 'Future Generation' },
 });
 
 const makeMapStateToProps = () => {
@@ -187,10 +187,10 @@ const NAVIGATION_PANEL_BREAKPOINT = 600 + (285 * 2) + (10 * 2);
 	    <ColumnSubheading text={intl.formatMessage(messages.futuregeneration)} />
 	    <p><audio style={{width: "285px"}} controls><source src="https://sc.vargonen.net:5001/;stream.mp3"></source></audio></p>
 	    <ColumnSubheading text={intl.formatMessage(messages.misc)} />
-            <a className='column-link' href='/about' target='_blank'><Icon className='column-link__icon' id='lightbulb-o' fixedWidth /><FormattedMessage id='navigation_bar.frontpage' defaultMessage='Think' /></a>
+            <a className='column-link' href='/about' target='_blank'><Icon className='column-link__icon' id='lightbulb-o' fixedWidth /><FormattedMessage id='navigation_bar.think' defaultMessage='Think' /></a>
-            <a className='column-link' href='https://discord.gg/p3j8H73Z6s' target='_blank'><Icon className='column-link__icon' id='comments-o' fixedWidth /><FormattedMessage id='navigation_bar.frontpage' defaultMessage='Discord Server' /></a>
+            <a className='column-link' 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' href='/about' target='_blank'><Icon className='column-link__icon' id='external-link' fixedWidth /><FormattedMessage id='navigation_bar.frontpage' defaultMessage='Show front page' /></a>
-	    <NavLink className='column-link' 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' to='/timelines/tag/2021METUSpringJournal'><Icon className='column-link__icon' id='hashtag' fixedWidth /><FormattedMessage id='navigation_bar.journal' defaultMessage='Spring Journal'></FormattedMessage></NavLink>
 
           </div>
 

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

@@ -16,7 +16,7 @@ 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/tag/2021METUSpringJournal'><Icon className='column-link__icon' id='hashtag' fixedWidth /><FormattedMessage id='navigation_bar.journal' defaultMessage='Spring 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>}

app/javascript/flavours/glitch/styles/accounts.scss

@@ -328,10 +328,9 @@
   }
 }
 
-
 .bg-profile {
   display: block;
-  filter: blur(12px);
+  filter: blur(10px);
   height: 100%;
   left: 0;
   position: fixed;
@@ -346,4 +345,4 @@
     margin: -15px;
     width: calc(100% + 30px);
   }
-}
+}

app/javascript/styles/mastodon/accounts.scss

@@ -325,3 +325,22 @@
     margin-top: 10px;
   }
 }
+
+.bg-profile {
+  display: block;
+  filter: blur(10px);
+  height: 100%;
+  left: 0;
+  position: fixed;
+  top: 0;
+  width: 100%;
+  z-index: -1;
+
+  .bg-profile-img {
+    background-size: cover;
+    background-position: 50%;
+    height: calc(100% + 30px);
+    margin: -15px;
+    width: calc(100% + 30px);
+  }
+}

app/views/accounts/show.html.haml

@@ -21,6 +21,8 @@
 
 .grid
   .column-0
+    .bg-profile
+      .bg-profile-img{ style: "background-image: url(#{@account.header.url( :original)}) !important" }
     .h-feed
       %data.p-name{ value: "#{@account.username} on #{site_hostname}" }/
 

app/views/statuses/show.html.haml

@@ -19,6 +19,8 @@
 
 .grid
   .column-0
+    .bg-profile
+    .bg-profile-img{ style: "background-image: url(#{@account.header_static_url}) !important" }
     .activity-stream.h-entry
       = render partial: 'status', locals: { status: @status, include_threads: true }
   .column-1