autonomic-cooperative/hometown
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Make it so that if there is no custom mascot uploaded the logo on the about/more page will always be correctly coloured

Browse Source
This commit is contained in:
Emma Winston 2019-09-18 22:55:01 +01:00
parent 76426333d9
commit 1c114185c8
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/javascript/styles/mastodon/about.scss
View File

@ -846,6 +846,12 @@ h1 a.brand {
font-size: 3.8em; font-size: 3.8em;
} }
.originalmascotimg svg {
width: 200px;
fill: $secondary-text-color;
margin-top: -25px;
}
.brand__tagline { .brand__tagline {
display: block; display: block;
position: absolute; position: absolute;

7
app/views/about/more.html.haml
View File

@ -24,8 +24,13 @@
%strong= number_with_delimiter @instance_presenter.status_count %strong= number_with_delimiter @instance_presenter.status_count
%span= t 'about.status_count_after', count: @instance_presenter.status_count %span= t 'about.status_count_after', count: @instance_presenter.status_count
.row__mascot .row__mascot
- if @instance_presenter.mascot&.file&.url
.landing-page__mascot .landing-page__mascot
= image_tag @instance_presenter.mascot&.file&.url || asset_pack_path('media/images/elephant_ui_plane.svg'), alt: '' = image_tag @instance_presenter.mascot&.file&.url
- else
.landing-page__mascot{:class => ("originalmascot")}
%div{:class => ("originalmascotimg")}
= svg_logo
.column-2 .column-2
.landing-page__information.contact-widget .landing-page__information.contact-widget