mirrors
/
donphan
mirror of https://github.com/Siphonay/mastodon
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')
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)
if account.bot?
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 {
background: lighten($ui-base-color, 24%);
.nav-link {
color: $white;
&:hover,
&:focus,
&:active {
color: $white;
}
}
background: $ui-base-color;
border: 1px solid lighten($ui-base-color, 8%);
.brand {
&:hover,
&:focus,
&:active {
background: lighten($ui-base-color, 28%);
background: lighten($ui-base-color, 4%);
}
}
}

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