Switch out old hometown logo for new one

Also tidies up a bunch of svgs that were hardcoded and shouldn't have been

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

app/javascript/images/hometown.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="hometownlogo" x="0px" y="0px" viewBox="25 40 50 20" width="100%" height="100%"><g><path d="M55.9,53.9H35.3c-0.7,0-1.3,0.6-1.3,1.3s0.6,1.3,1.3,1.3h20.6c0.7,0,1.3-0.6,1.3-1.3S56.6,53.9,55.9,53.9z"/><path d="M55.9,58.2H35.3c-0.7,0-1.3,0.6-1.3,1.3s0.6,1.3,1.3,1.3h20.6c0.7,0,1.3-0.6,1.3-1.3S56.6,58.2,55.9,58.2z"/><path d="M55.9,62.6H35.3c-0.7,0-1.3,0.6-1.3,1.3s0.6,1.3,1.3,1.3h20.6c0.7,0,1.3-0.6,1.3-1.3S56.6,62.6,55.9,62.6z"/><path d="M64.8,53.9c-0.7,0-1.3,0.6-1.3,1.3v8.8c0,0.7,0.6,1.3,1.3,1.3s1.3-0.6,1.3-1.3v-8.8C66,54.4,65.4,53.9,64.8,53.9z"/><path d="M60.4,53.9c-0.7,0-1.3,0.6-1.3,1.3v8.8c0,0.7,0.6,1.3,1.3,1.3s1.3-0.6,1.3-1.3v-8.8C61.6,54.4,61.1,53.9,60.4,53.9z"/><path d="M63.7,48.3c1.3-0.7,2-2.5,2-5.6c0-3.6-0.9-7.8-3.3-7.8s-3.3,4.2-3.3,7.8c0,3.1,0.7,4.9,2,5.6v2.4c0,0.7,0.6,1.3,1.3,1.3   s1.3-0.6,1.3-1.3V48.3z M62.4,37.8c0.4,0.8,0.8,2.5,0.8,4.9c0,2.5-0.5,3.4-0.8,3.4s-0.8-0.9-0.8-3.4C61.7,40.3,62.1,38.6,62.4,37.8   z"/><path d="M57,42.7c0-0.1-0.1-0.1-0.1-0.2l-3.2-4.1c-0.2-0.3-0.6-0.5-1-0.5h-1.6v-1.9c0-0.7-0.6-1.3-1.3-1.3s-1.3,0.6-1.3,1.3V38   h-3.9h-1.1h-5.2c-0.4,0-0.7,0.2-1,0.5l-3.2,4.1c0,0.1-0.1,0.1-0.1,0.2c0,0-0.1,0.1-0.1,0.1C34,43,34,43.2,34,43.3v7.4   c0,0.7,0.6,1.3,1.3,1.3h5.2h7.4h8c0.7,0,1.3-0.6,1.3-1.3v-7.4c0-0.2,0-0.3-0.1-0.4C57,42.8,57,42.8,57,42.7z M41.7,49.5h-5.2v-4.9   h10.2v4.9H41.7z M48.5,42.1l-1.2-1.6h4.8l1.2,1.6H48.5z M44.1,40.5l1.2,1.6h-7.5l1.2-1.6H44.1z M49.2,44.6h5.5v4.9h-5.5V44.6z"/></g></svg>

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;
 }

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;
+          }
+        }
       }
     }
 

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;
   }
 }
 

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
+        - 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' }

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')