Skip to content

Commit

Permalink
Use Colorides logo, fix themes
Browse files Browse the repository at this point in the history
  • Loading branch information
IsabelaY committed Nov 17, 2024
1 parent 90ed4dd commit 1b9455d
Show file tree
Hide file tree
Showing 8 changed files with 29 additions and 8 deletions.
4 changes: 4 additions & 0 deletions app/javascript/styles/colorwave.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
3 changes: 0 additions & 3 deletions app/javascript/styles/flamingo.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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)}
Expand Down
4 changes: 4 additions & 0 deletions app/javascript/styles/macaron/diff.scss
Original file line number Diff line number Diff line change
@@ -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);
}
Expand Down
4 changes: 4 additions & 0 deletions app/javascript/styles/mastodon-light/diff.scss
Original file line number Diff line number Diff line change
@@ -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);
}
Expand Down
4 changes: 4 additions & 0 deletions app/javascript/styles/mastodon/branding.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
.logo {
color: $primary-text-color;
}

.colorides_logo {
filter: invert(1);
}
8 changes: 8 additions & 0 deletions app/javascript/styles/purple_haze.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions app/views/layouts/admin.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -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;"}

Check warning on line 14 in app/views/layouts/admin.html.haml

View workflow job for this annotation

GitHub Actions / lint

`img` tags must include alt text

Check warning on line 14 in app/views/layouts/admin.html.haml

View workflow job for this annotation

GitHub Actions / lint

Do not use inline style attributes

Check warning on line 14 in app/views/layouts/admin.html.haml

View workflow job for this annotation

GitHub Actions / lint

Hash attribute should start with one space after the opening brace

Check warning on line 14 in app/views/layouts/admin.html.haml

View workflow job for this annotation

GitHub Actions / lint

Hash attribute should end with one space before the closing brace or be on its own line

.sidebar__toggle
.sidebar__toggle__logo
= link_to root_path do
= site_title
%img.colorides_logo{:src => "/colorides.svg", :style => "height: 30px; vertical-align: middle;"}

Check warning on line 19 in app/views/layouts/admin.html.haml

View workflow job for this annotation

GitHub Actions / lint

`img` tags must include alt text

Check warning on line 19 in app/views/layouts/admin.html.haml

View workflow job for this annotation

GitHub Actions / lint

Do not use inline style attributes

Check warning on line 19 in app/views/layouts/admin.html.haml

View workflow job for this annotation

GitHub Actions / lint

Hash attribute should start with one space after the opening brace

Check warning on line 19 in app/views/layouts/admin.html.haml

View workflow job for this annotation

GitHub Actions / lint

Hash attribute should end with one space before the closing brace or be on its own line

= link_to '#', class: 'sidebar__toggle__icon', 'aria-label': t('navigation.toggle_menu'), 'aria-expanded': 'false' do
= fa_icon 'bars'
Expand Down
6 changes: 3 additions & 3 deletions public/colorides.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 1b9455d

Please sign in to comment.