diff --git a/app/javascript/styles/colorwave.scss b/app/javascript/styles/colorwave.scss index 297c3bf6e1280b..7f8d1b4524ce06 100644 --- a/app/javascript/styles/colorwave.scss +++ b/app/javascript/styles/colorwave.scss @@ -35,6 +35,10 @@ font-style: normal; } +.colorides_logo { + filter: invert(0); +} + body, .ui { background: linear-gradient(45deg,rgb(255,198,222) 0%, rgb(198,198,255) 50%, rgb(198,255,222) 100%); font-family: galyon, Helvetica, sans-serif; diff --git a/app/javascript/styles/flamingo.scss b/app/javascript/styles/flamingo.scss index 09bc652e026493..c05a5a729f49aa 100644 --- a/app/javascript/styles/flamingo.scss +++ b/app/javascript/styles/flamingo.scss @@ -712,9 +712,6 @@ public page fixes mix-blend-mode: normal } -/* add shadow to help with visibility on light bg */ -.brand img {filter: drop-shadow(1px 1px 1px black)} - /* footer logo recolor */ .public-layout .footer .brand svg path {fill: var(--textPageMuted)} .public-layout .footer .brand:hover svg path {fill: var(--accent)} diff --git a/app/javascript/styles/macaron/diff.scss b/app/javascript/styles/macaron/diff.scss index 0dc38d7fdf67bc..7e1400e66c885d 100644 --- a/app/javascript/styles/macaron/diff.scss +++ b/app/javascript/styles/macaron/diff.scss @@ -1,6 +1,10 @@ // Notes! // Sass color functions, "darken" and "lighten" are automatically replaced. +.colorides_logo { + filter: invert(0); +} + html { scrollbar-color: $pink rgba($pink, 0.25); } diff --git a/app/javascript/styles/mastodon-light/diff.scss b/app/javascript/styles/mastodon-light/diff.scss index 3777fccbfb83ca..82965655394304 100644 --- a/app/javascript/styles/mastodon-light/diff.scss +++ b/app/javascript/styles/mastodon-light/diff.scss @@ -1,6 +1,10 @@ // Notes! // Sass color functions, "darken" and "lighten" are automatically replaced. +.colorides_logo { + filter: invert(0); +} + html { scrollbar-color: $ui-base-color rgba($ui-base-color, 0.25); } diff --git a/app/javascript/styles/mastodon/branding.scss b/app/javascript/styles/mastodon/branding.scss index d1bddc68b0d7f9..98c6125f4734f8 100644 --- a/app/javascript/styles/mastodon/branding.scss +++ b/app/javascript/styles/mastodon/branding.scss @@ -1,3 +1,7 @@ .logo { color: $primary-text-color; } + +.colorides_logo { + filter: invert(1); +} diff --git a/app/javascript/styles/purple_haze.scss b/app/javascript/styles/purple_haze.scss index 9a9d96ef50346c..2a3694fc6104a6 100644 --- a/app/javascript/styles/purple_haze.scss +++ b/app/javascript/styles/purple_haze.scss @@ -30,6 +30,14 @@ $light-text-color: #694E78; @import 'application'; +.colorides_logo { + filter: invert(0); +} + +.sidebar__toggle .colorides_logo { + filter: invert(1); +} + html { scrollbar-face-color: #313543; diff --git a/app/views/layouts/admin.html.haml b/app/views/layouts/admin.html.haml index bc18e2599f4e23..efffacf575cb29 100644 --- a/app/views/layouts/admin.html.haml +++ b/app/views/layouts/admin.html.haml @@ -11,12 +11,12 @@ .logo %h2 = link_to root_path, class: 'brand' do - = site_title + %img.colorides_logo{:src => "/colorides.svg", :style => "height: 30px; vertical-align: middle;"} .sidebar__toggle .sidebar__toggle__logo = link_to root_path do - = site_title + %img.colorides_logo{:src => "/colorides.svg", :style => "height: 30px; vertical-align: middle;"} = link_to '#', class: 'sidebar__toggle__icon', 'aria-label': t('navigation.toggle_menu'), 'aria-expanded': 'false' do = fa_icon 'bars' diff --git a/public/colorides.svg b/public/colorides.svg index b645670caa753b..31a08b220de83f 100644 --- a/public/colorides.svg +++ b/public/colorides.svg @@ -9,9 +9,9 @@ xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - width="1800px" - height="350px" - viewBox="-80 -5 80 30" + width="1250px" + height="200px" + viewBox="-80 -5 60 21" version="1.1" id="svg8" inkscape:version="0.92.3 (2405546, 2018-03-11)"