mirrors
/
cybre-space
mirror of https://cybre.tech/cybrespace/mastodon.git
1
0
Fork 0
Code Releases Activity

Change full logo to use primary text color of the given theme (#10994) 

* Change full logo to use primary text color of the given theme

* Fix colors of public layout header in light theme
This commit is contained in:
Eugen Rochko 2019-06-08 15:30:06 +02:00 committed by GitHub
parent f4bc77f290
commit 20dda5cca0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/helpers/stream_entries_helper.rb
View File

@ -38,6 +38,10 @@ module StreamEntriesHelper
content_tag(:svg, tag(:use, 'xlink:href' => '#mastodon-svg-logo'), 'viewBox' => '0 0 216.4144 232.00976') content_tag(:svg, tag(:use, 'xlink:href' => '#mastodon-svg-logo'), 'viewBox' => '0 0 216.4144 232.00976')
end end
def svg_logo_full
content_tag(:svg, tag(:use, 'xlink:href' => '#mastodon-svg-logo-full'), 'viewBox' => '0 0 713.35878 175.8678')
end
def account_badge(account, all: false) def account_badge(account, all: false)
if account.bot? if account.bot?
content_tag(:div, content_tag(:div, t('accounts.roles.bot'), class: 'account-role bot'), class: 'roles') content_tag(:div, content_tag(:div, t('accounts.roles.bot'), class: 'account-role bot'), class: 'roles')

2
app/javascript/images/logo_full.svg
View File

File diff suppressed because one or more lines are too long
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.5 KiB

After

Width:  |  Height:  |  Size: 5.6 KiB

15
app/javascript/styles/mastodon-light/diff.scss
View File

@ -531,23 +531,14 @@ html {
} }
.header { .header {
background: lighten($ui-base-color, 24%); background: $ui-base-color;
border: 1px solid lighten($ui-base-color, 8%);
.nav-link {
color: $white;
&:hover,
&:focus,
&:active {
color: $white;
}
}
.brand { .brand {
&:hover, &:hover,
&:focus, &:focus,
&:active { &:active {
background: lighten($ui-base-color, 28%); background: lighten($ui-base-color, 4%);
} }
} }
} }

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

@ -659,7 +659,8 @@ $small-breakpoint: 960px;
align-items: center; align-items: center;
padding: 50px; padding: 50px;
img { svg {
fill: $primary-text-color;
height: 52px; height: 52px;
} }

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

@ -21,7 +21,8 @@
justify-content: center; justify-content: center;
align-items: center; align-items: center;
img { svg {
fill: $primary-text-color;
height: 42px; height: 42px;
margin-right: 10px; margin-right: 10px;
} }
@ -256,12 +257,13 @@
display: block; display: block;
padding: 15px; padding: 15px;
img { svg {
display: block; display: block;
height: 18px; height: 18px;
width: auto; width: auto;
position: relative; position: relative;
bottom: -2px; bottom: -2px;
fill: $primary-text-color;
@media screen and (max-width: $no-gap-breakpoint) { @media screen and (max-width: $no-gap-breakpoint) {
height: 20px; height: 20px;

2
app/views/about/show.html.haml
View File

@ -8,7 +8,7 @@
.landing .landing
.landing__brand .landing__brand
= link_to root_url, class: 'brand' do = link_to root_url, class: 'brand' do
= image_pack_tag 'logo_full.svg', alt: 'Mastodon' = svg_logo_full
%span.brand__tagline=t 'about.tagline' %span.brand__tagline=t 'about.tagline'
.landing__grid .landing__grid

1
app/views/layouts/application.html.haml
View File

@ -36,3 +36,4 @@
%div{ style: 'display: none'} %div{ style: 'display: none'}
= render file: Rails.root.join('app', 'javascript', 'images', 'logo_transparent.svg') = render file: Rails.root.join('app', 'javascript', 'images', 'logo_transparent.svg')
= render file: Rails.root.join('app', 'javascript', 'images', 'logo_full.svg')

2
app/views/layouts/auth.html.haml
View File

@ -6,7 +6,7 @@
.logo-container .logo-container
%h1 %h1
= link_to root_path do = link_to root_path do
= image_pack_tag 'logo_full.svg', alt: 'Mastodon' = svg_logo_full
.form-container .form-container
= render 'flashes' = render 'flashes'

2
app/views/layouts/public.html.haml
View File

@ -8,7 +8,7 @@
%nav.header %nav.header
.nav-left .nav-left
= link_to root_url, class: 'brand' do = link_to root_url, class: 'brand' do
= image_pack_tag 'logo_full.svg', alt: 'Mastodon' = svg_logo_full
= link_to t('directories.directory'), explore_path, class: 'nav-link optional' if Setting.profile_directory = link_to t('directories.directory'), explore_path, class: 'nav-link optional' if Setting.profile_directory
= link_to t('about.about_this'), about_more_path, class: 'nav-link optional' = link_to t('about.about_this'), about_more_path, class: 'nav-link optional'