diff --git a/app/helpers/stream_entries_helper.rb b/app/helpers/stream_entries_helper.rb
index 4b49218ca..50cf77d48 100644
--- a/app/helpers/stream_entries_helper.rb
+++ b/app/helpers/stream_entries_helper.rb
@@ -35,7 +35,7 @@ module StreamEntriesHelper
end
def svg_logo
- content_tag(:svg, tag(:use, 'xlink:href' => '#hometownlogo'), 'viewBox' => '0 0 611.55 611.55')
+ content_tag(:svg, tag(:use, 'xlink:href' => '#hometownlogo'), 'viewBox' => '0 0 100 100')
end
def svg_logo_full
diff --git a/app/javascript/images/hometown.svg b/app/javascript/images/hometown.svg
new file mode 100644
index 000000000..055a5c40f
--- /dev/null
+++ b/app/javascript/images/hometown.svg
@@ -0,0 +1 @@
+
diff --git a/app/javascript/images/hometownlogo.svg b/app/javascript/images/hometownlogo.svg
deleted file mode 100644
index 8133a5cc6..000000000
--- a/app/javascript/images/hometownlogo.svg
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/app/javascript/mastodon/components/error_boundary.js b/app/javascript/mastodon/components/error_boundary.js
index 59ad61e43..35723f2eb 100644
--- a/app/javascript/mastodon/components/error_boundary.js
+++ b/app/javascript/mastodon/components/error_boundary.js
@@ -30,7 +30,7 @@ export default class ErrorBoundary extends React.PureComponent {
return (
);
}
diff --git a/app/javascript/mastodon/features/compose/index.js b/app/javascript/mastodon/features/compose/index.js
index 96f99c2a8..a1df33b12 100644
--- a/app/javascript/mastodon/features/compose/index.js
+++ b/app/javascript/mastodon/features/compose/index.js
@@ -35,7 +35,7 @@ let instanceMascot;
if (mascot) {
instanceMascot = ;
} else {
- instanceMascot = ;
+ instanceMascot = ;
}
export default @connect(mapStateToProps)
diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index a6371e476..85850c3b5 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -3033,9 +3033,8 @@ a.status-card.compact:hover {
}
&__figure {
- background: url('../images/defaultmascotlight.svg') no-repeat center 0;
width: 100%;
- height: 160px;
+ height: 10px;
background-size: contain;
position: absolute;
top: 50%;
@@ -3045,14 +3044,10 @@ a.status-card.compact:hover {
&.missing-indicator {
padding-top: 20px + 48px;
-
- .regeneration-indicator__figure {
- background-image: url('../images/defaultmascotlight.svg');
- }
}
&__label {
- margin-top: 200px;
+ margin-top: 0px;
strong {
display: block;
@@ -6027,7 +6022,7 @@ noscript {
.drawer__inner__mastodon svg#hometownlogo {
position: absolute;
fill: $secondary-text-color;
- width: 90px;
+ width: 100px;
height: 100px;
bottom: 0;
}
@@ -6041,4 +6036,4 @@ div.status__content--with-spoiler {
margin: 0.25rem 0 0 0;
}
}
-}
\ No newline at end of file
+}
diff --git a/app/javascript/styles/mastodon/containers.scss b/app/javascript/styles/mastodon/containers.scss
index 75eab3fd2..9457c901b 100644
--- a/app/javascript/styles/mastodon/containers.scss
+++ b/app/javascript/styles/mastodon/containers.scss
@@ -392,8 +392,42 @@
border-radius: 4px 4px 0 0;
}
+ .originalheader {
+ width: 100%;
+ display: flex;
+ flex-direction: row;
+ flex-wrap: nowrap;
+ justify-content: center;
+ align-items: center;
+ align-content: space-between;
+
+ svg {
+ fill: $secondary-text-color;
+ height: 300px;
+ }
+
+ h1 {
+ flex-grow: 2;
+ text-align: center;
+ white-space: nowrap;
+ font-family: $font-sans-serif, sans-serif;
+ }
+ }
+
+
+
@media screen and (max-width: 600px) {
height: 200px;
+
+ .originalheader {
+ svg {
+ height: 200px;
+ }
+
+ h1 {
+ font-size: 0.5rem;
+ }
+ }
}
}
diff --git a/app/javascript/styles/mastodon/modal.scss b/app/javascript/styles/mastodon/modal.scss
index 1c074f268..2a0d477ac 100644
--- a/app/javascript/styles/mastodon/modal.scss
+++ b/app/javascript/styles/mastodon/modal.scss
@@ -15,7 +15,6 @@
> * {
flex: 1;
max-height: 235px;
- background: url('../images/defaultmascotlight.svg') no-repeat left bottom / contain;
}
}
diff --git a/app/views/about/more.html.haml b/app/views/about/more.html.haml
index f369820c0..50e0d8881 100644
--- a/app/views/about/more.html.haml
+++ b/app/views/about/more.html.haml
@@ -8,9 +8,15 @@
.grid-3
.column-0
.public-account-header.public-account-header--no-bar
- - if @instance_presenter.hero.present? || @instance_presenter.thumbnail.present?
- .public-account-header__image
+ .public-account-header__image
+ - if @instance_presenter.hero.present? || @instance_presenter.thumbnail.present?
= image_tag @instance_presenter.hero&.file&.url || @instance_presenter.thumbnail&.file&.url, alt: @instance_presenter.site_title, class: 'parallax'
+ - else
+ %div{:class => ("originalheader")}
+ = svg_logo
+ %h1
+ = link_to root_url, class: 'brand' do
+ = site_title
.column-1
.landing-page__call-to-action{ dir: 'ltr' }
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index 5bf199a21..9b25ce5f8 100755
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -35,5 +35,5 @@
= content_for?(:content) ? yield(:content) : yield
%div{ style: 'display: none'}
- = render file: Rails.root.join('app', 'javascript', 'images', 'hometownlogo.svg')
+ = render file: Rails.root.join('app', 'javascript', 'images', 'hometown.svg')
= render file: Rails.root.join('app', 'javascript', 'images', 'logo_full.svg')