diff --git a/app/javascript/flavours/glitch/features/getting_started/index.js b/app/javascript/flavours/glitch/features/getting_started/index.js
index d7759d039..788455e33 100644
--- a/app/javascript/flavours/glitch/features/getting_started/index.js
+++ b/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' },
- futuregeneration: { id: 'navigation_bar.misc', defaultMessage: 'Future Generation' },
+ radyoodtu: { id: 'navigation_bar.radio1', defaultMessage: 'Radyo ODTU' },
+ futuregeneration: { id: 'navigation_bar.radio2', defaultMessage: 'Future Generation' },
});
const makeMapStateToProps = () => {
@@ -187,10 +187,10 @@ const NAVIGATION_PANEL_BREAKPOINT = 600 + (285 * 2) + (10 * 2);
-
-
+
+
-
+
diff --git a/app/javascript/flavours/glitch/features/ui/components/navigation_panel.js b/app/javascript/flavours/glitch/features/ui/components/navigation_panel.js
index 3e2881b01..02bfedfd2 100644
--- a/app/javascript/flavours/glitch/features/ui/components/navigation_panel.js
+++ b/app/javascript/flavours/glitch/features/ui/components/navigation_panel.js
@@ -16,7 +16,7 @@ const NavigationPanel = ({ onOpenSettings }) => (
-
+
{profile_directory && }
diff --git a/app/javascript/flavours/glitch/styles/accounts.scss b/app/javascript/flavours/glitch/styles/accounts.scss
index 73d13de8a..ad8da003e 100644
--- a/app/javascript/flavours/glitch/styles/accounts.scss
+++ b/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);
}
-}
\ No newline at end of file
+}
diff --git a/app/javascript/styles/mastodon/accounts.scss b/app/javascript/styles/mastodon/accounts.scss
index 2c78e81be..7a0134263 100644
--- a/app/javascript/styles/mastodon/accounts.scss
+++ b/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);
+ }
+}
diff --git a/app/views/accounts/show.html.haml b/app/views/accounts/show.html.haml
index 1a81b96f6..c682c5f01 100644
--- a/app/views/accounts/show.html.haml
+++ b/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}" }/
diff --git a/app/views/statuses/show.html.haml b/app/views/statuses/show.html.haml
index 7ef7b09a2..99fa536cf 100644
--- a/app/views/statuses/show.html.haml
+++ b/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