diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
index be750a5e41..d33766d501 100644
--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
@@ -1,3 +1,7 @@
-patreon: mastodon
-open_collective: mastodon
-custom: https://sponsor.joinmastodon.org
+# Linking to Merveilles funding, Mastodon funding, & dariusk from Hometown
+patreon: merveillestown
+open_collective: merveilles
+ko_fi: merveillestown
+liberapay: merveilles
+github: [Gargron, dariusk]
+custom: ['https://www.patreon.com/mastodon', 'https://opencollective.com/mastodon', 'https://www.patreon.com/tinysubversions', 'https://sponsor.joinmastodon.org']
diff --git a/app/helpers/branding_helper.rb b/app/helpers/branding_helper.rb
index ad7702aea7..8cfb1aedb9 100644
--- a/app/helpers/branding_helper.rb
+++ b/app/helpers/branding_helper.rb
@@ -19,16 +19,16 @@ def _logo_as_symbol_icon
end
def render_logo
- image_pack_tag('logo.svg', alt: 'Mastodon', class: 'logo logo--icon')
+ image_pack_tag('merveilles-logo.svg', alt: 'Mastodon', class: 'logo logo--icon')
end
def render_symbol(version = :icon)
path = begin
case version
when :icon
- 'logo-symbol-icon.svg'
+ 'merveilles-logo-symbol-icon.svg'
when :wordmark
- 'logo-symbol-wordmark.svg'
+ 'merveilles-logo-symbol-wordmark.svg'
end
end
diff --git a/app/javascript/icons/android-chrome-144x144.png b/app/javascript/icons/android-chrome-144x144.png
index 42afb6b332..e0d90c723a 100644
Binary files a/app/javascript/icons/android-chrome-144x144.png and b/app/javascript/icons/android-chrome-144x144.png differ
diff --git a/app/javascript/icons/android-chrome-192x192.png b/app/javascript/icons/android-chrome-192x192.png
index da49a7bc63..7c8f486f86 100644
Binary files a/app/javascript/icons/android-chrome-192x192.png and b/app/javascript/icons/android-chrome-192x192.png differ
diff --git a/app/javascript/icons/android-chrome-256x256.png b/app/javascript/icons/android-chrome-256x256.png
index 1513fe5ddd..e08fa55ef2 100644
Binary files a/app/javascript/icons/android-chrome-256x256.png and b/app/javascript/icons/android-chrome-256x256.png differ
diff --git a/app/javascript/icons/android-chrome-36x36.png b/app/javascript/icons/android-chrome-36x36.png
index 58f943da66..c73d2d95cf 100644
Binary files a/app/javascript/icons/android-chrome-36x36.png and b/app/javascript/icons/android-chrome-36x36.png differ
diff --git a/app/javascript/icons/android-chrome-384x384.png b/app/javascript/icons/android-chrome-384x384.png
index 27faa20376..1a36ee0221 100644
Binary files a/app/javascript/icons/android-chrome-384x384.png and b/app/javascript/icons/android-chrome-384x384.png differ
diff --git a/app/javascript/icons/android-chrome-48x48.png b/app/javascript/icons/android-chrome-48x48.png
index 9d0c2557d2..8f177392ad 100644
Binary files a/app/javascript/icons/android-chrome-48x48.png and b/app/javascript/icons/android-chrome-48x48.png differ
diff --git a/app/javascript/icons/android-chrome-512x512.png b/app/javascript/icons/android-chrome-512x512.png
index 1a05ef6a51..2cdee267e6 100644
Binary files a/app/javascript/icons/android-chrome-512x512.png and b/app/javascript/icons/android-chrome-512x512.png differ
diff --git a/app/javascript/icons/android-chrome-72x72.png b/app/javascript/icons/android-chrome-72x72.png
index 10c088cc4f..8596d5797a 100644
Binary files a/app/javascript/icons/android-chrome-72x72.png and b/app/javascript/icons/android-chrome-72x72.png differ
diff --git a/app/javascript/icons/android-chrome-96x96.png b/app/javascript/icons/android-chrome-96x96.png
index 9e4ccf400b..fe6e66813c 100644
Binary files a/app/javascript/icons/android-chrome-96x96.png and b/app/javascript/icons/android-chrome-96x96.png differ
diff --git a/app/javascript/icons/apple-touch-icon-1024x1024.png b/app/javascript/icons/apple-touch-icon-1024x1024.png
index 79048c69e3..292c05fe26 100644
Binary files a/app/javascript/icons/apple-touch-icon-1024x1024.png and b/app/javascript/icons/apple-touch-icon-1024x1024.png differ
diff --git a/app/javascript/icons/apple-touch-icon-114x114.png b/app/javascript/icons/apple-touch-icon-114x114.png
index 1816537129..c40838e032 100644
Binary files a/app/javascript/icons/apple-touch-icon-114x114.png and b/app/javascript/icons/apple-touch-icon-114x114.png differ
diff --git a/app/javascript/icons/apple-touch-icon-120x120.png b/app/javascript/icons/apple-touch-icon-120x120.png
index 8f82855019..ab5c9a9ae8 100644
Binary files a/app/javascript/icons/apple-touch-icon-120x120.png and b/app/javascript/icons/apple-touch-icon-120x120.png differ
diff --git a/app/javascript/icons/apple-touch-icon-144x144.png b/app/javascript/icons/apple-touch-icon-144x144.png
index 42afb6b332..e0d90c723a 100644
Binary files a/app/javascript/icons/apple-touch-icon-144x144.png and b/app/javascript/icons/apple-touch-icon-144x144.png differ
diff --git a/app/javascript/icons/apple-touch-icon-152x152.png b/app/javascript/icons/apple-touch-icon-152x152.png
index 6522f71573..e895880679 100644
Binary files a/app/javascript/icons/apple-touch-icon-152x152.png and b/app/javascript/icons/apple-touch-icon-152x152.png differ
diff --git a/app/javascript/icons/apple-touch-icon-167x167.png b/app/javascript/icons/apple-touch-icon-167x167.png
index e4c4464f39..812be3b141 100644
Binary files a/app/javascript/icons/apple-touch-icon-167x167.png and b/app/javascript/icons/apple-touch-icon-167x167.png differ
diff --git a/app/javascript/icons/apple-touch-icon-180x180.png b/app/javascript/icons/apple-touch-icon-180x180.png
index 52259f766c..1ab11c211f 100644
Binary files a/app/javascript/icons/apple-touch-icon-180x180.png and b/app/javascript/icons/apple-touch-icon-180x180.png differ
diff --git a/app/javascript/icons/apple-touch-icon-57x57.png b/app/javascript/icons/apple-touch-icon-57x57.png
index ccd2a5e70b..162e69c8d0 100644
Binary files a/app/javascript/icons/apple-touch-icon-57x57.png and b/app/javascript/icons/apple-touch-icon-57x57.png differ
diff --git a/app/javascript/icons/apple-touch-icon-60x60.png b/app/javascript/icons/apple-touch-icon-60x60.png
index 475604243d..51ca0d77f1 100644
Binary files a/app/javascript/icons/apple-touch-icon-60x60.png and b/app/javascript/icons/apple-touch-icon-60x60.png differ
diff --git a/app/javascript/icons/apple-touch-icon-72x72.png b/app/javascript/icons/apple-touch-icon-72x72.png
index 10c088cc4f..8596d5797a 100644
Binary files a/app/javascript/icons/apple-touch-icon-72x72.png and b/app/javascript/icons/apple-touch-icon-72x72.png differ
diff --git a/app/javascript/icons/apple-touch-icon-76x76.png b/app/javascript/icons/apple-touch-icon-76x76.png
index 1935432757..8cfc7cf6b3 100644
Binary files a/app/javascript/icons/apple-touch-icon-76x76.png and b/app/javascript/icons/apple-touch-icon-76x76.png differ
diff --git a/app/javascript/icons/favicon-16x16.png b/app/javascript/icons/favicon-16x16.png
index 17e8421826..257615d12f 100644
Binary files a/app/javascript/icons/favicon-16x16.png and b/app/javascript/icons/favicon-16x16.png differ
diff --git a/app/javascript/icons/favicon-32x32.png b/app/javascript/icons/favicon-32x32.png
index 907143ed56..7ddb7230bc 100644
Binary files a/app/javascript/icons/favicon-32x32.png and b/app/javascript/icons/favicon-32x32.png differ
diff --git a/app/javascript/icons/favicon-48x48.png b/app/javascript/icons/favicon-48x48.png
index 4959a0ca59..158d74055e 100644
Binary files a/app/javascript/icons/favicon-48x48.png and b/app/javascript/icons/favicon-48x48.png differ
diff --git a/app/javascript/images/mailer/logo.png b/app/javascript/images/mailer/logo.png
index 77d0ef849f..06374b2a80 100644
Binary files a/app/javascript/images/mailer/logo.png and b/app/javascript/images/mailer/logo.png differ
diff --git a/app/javascript/images/mailer/wordmark.png b/app/javascript/images/mailer/wordmark.png
index 6f12538616..5587574419 100644
Binary files a/app/javascript/images/mailer/wordmark.png and b/app/javascript/images/mailer/wordmark.png differ
diff --git a/app/javascript/images/merveilles-icon.svg b/app/javascript/images/merveilles-icon.svg
new file mode 100644
index 0000000000..20d67cd914
--- /dev/null
+++ b/app/javascript/images/merveilles-icon.svg
@@ -0,0 +1,8 @@
+
+
+
diff --git a/app/javascript/images/merveilles-logo-symbol-icon.svg b/app/javascript/images/merveilles-logo-symbol-icon.svg
new file mode 100644
index 0000000000..dc2fc8464c
--- /dev/null
+++ b/app/javascript/images/merveilles-logo-symbol-icon.svg
@@ -0,0 +1,7 @@
+
+
+
diff --git a/app/javascript/images/merveilles-logo-symbol-wordmark.svg b/app/javascript/images/merveilles-logo-symbol-wordmark.svg
new file mode 100644
index 0000000000..1d20e7af0a
--- /dev/null
+++ b/app/javascript/images/merveilles-logo-symbol-wordmark.svg
@@ -0,0 +1,22 @@
+
+
+
diff --git a/app/javascript/images/merveilles-logo.svg b/app/javascript/images/merveilles-logo.svg
new file mode 100644
index 0000000000..f2a25f8717
--- /dev/null
+++ b/app/javascript/images/merveilles-logo.svg
@@ -0,0 +1,8 @@
+
+
+
diff --git a/app/javascript/styles/merveilles.scss b/app/javascript/styles/merveilles.scss
new file mode 100644
index 0000000000..aa876edf95
--- /dev/null
+++ b/app/javascript/styles/merveilles.scss
@@ -0,0 +1,2476 @@
+@import "application";
+
+/*
+ general
+*/
+
+:root {
+ --black: #000;
+ --gray-shade-1: #111;
+ --gray-shade-1-5: #1a1a1a;
+ --gray-shade-2: #222;
+ --gray-shade-3: #333;
+ --gray-shade-4: #444;
+ --gray-shade-5: #555;
+ --gray-shade-6: #666;
+ --gray-shade-7: #777;
+ --gray-shade-8: #888;
+ --gray-shade-9: #999;
+ --gray-shade-a: #aaa;
+ --gray-shade-c: #ccc;
+ --gray-shade-e: #eee;
+ --white: #fff;
+ --cyan: #72dec2;
+ --cyan-light: #9ffce3;
+}
+
+html {
+ scrollbar-color: var(--gray-shade-3) var(--gray-shade-2) !important;
+}
+
+body {
+ background: var(--gray-shade-2) !important;
+}
+
+.ui {
+ background: var(--gray-shade-1) !important;
+}
+
+.button {
+ background: var(--cyan);
+ color: var(--gray-shade-3);
+}
+
+.button:hover {
+ background: var(--cyan-light);
+}
+
+.app-holder > div {
+ background: var(--gray-shade-2) !important;
+}
+
+.link-button {
+ color: var(--cyan);
+ text-decoration: underline;
+}
+
+.rich-formatting strong {
+ color: var(--gray-shade-e);
+}
+
+.nothing-here {
+ background-color: var(--gray-shade-2);
+ color: var(--gray-shade-a);
+}
+
+.column-header {
+ height: 45px;
+ overflow: hidden;
+ line-height: 15px;
+ font-size: 14px;
+}
+
+.column-header > button {
+ background: var(--gray-shade-3) !important;
+}
+
+.column-header__button {
+ background: var(--gray-shade-3) !important;
+ margin: 0 !important;
+ color: var(--gray-shade-a) !important;
+}
+
+.column-header__button:hover {
+ color: var(--white) !important;
+ cursor: pointer;
+}
+
+.column-header__collapsible-inner {
+ background: var(--gray-shade-1);
+}
+
+.column-header__collapsible-inner .column-settings__section {
+ color: var(--white);
+}
+
+.column-header__collapsible-inner
+ .column-settings__section.setting-toggle__label {
+ color: var(--white);
+}
+
+.column-header__collapsible-inner .text-btn {
+ display: inline-block;
+ font-family: inherit;
+ font-size: inherit;
+ cursor: pointer;
+ border: 2px solid #ffffff;
+ background: var(--white);
+ padding: 5px 10px !important;
+ border-radius: 30px;
+ color: var(--black);
+}
+
+.column-header__collapsible-inner .text-btn:hover {
+ background: var(--gray-shade-1);
+ color: var(--white);
+ text-decoration: none;
+}
+
+.react-toggle--checked .react-toggle-thumb {
+ border-color: var(--black);
+ border-width: 2px;
+}
+
+.react-toggle .react-toggle-track {
+ background-color: var(--gray-shade-3) !important;
+ border-color: var(--gray-shade-1);
+ border-width: 2px;
+}
+
+.react-toggle:hover .react-toggle-track {
+ background-color: var(--cyan) !important;
+}
+
+.setting-toggle__label {
+ color: var(--gray-shade-9);
+}
+
+.react-toggle-track-x svg path {
+ opacity: 0.25;
+}
+
+.react-toggle-track-check svg path {
+ fill: var(--cyan) !important;
+}
+
+.loading-bar {
+ background-color: var(--cyan) !important;
+}
+
+.loading-indicator {
+ color: var(--cyan) !important;
+}
+
+.loading-indicator__figure {
+ border-color: var(--cyan) !important;
+}
+
+@keyframes loader-figure {
+ 0% {
+ background-color: var(--cyan);
+ width: 0;
+ height: 0;
+ }
+
+ 29% {
+ background-color: var(--cyan);
+ }
+
+ 30% {
+ width: 42px;
+ height: 42px;
+ background-color: transparent;
+ border-width: 21px;
+ opacity: 1;
+ }
+
+ 100% {
+ width: 42px;
+ height: 42px;
+ background-color: transparent;
+ border-width: 0;
+ opacity: 0;
+ }
+}
+
+.notification {
+ background: var(--gray-shade-2) !important;
+}
+
+.notification__favourite-icon-wrapper {
+ left: 10px;
+ top: 2px;
+ position: absolute;
+}
+
+.notification__favourite-icon-wrapper .star-icon::before {
+ display: none !important;
+}
+
+.notification__favourite-icon-wrapper .star-icon {
+ background-image: url("data:image/svg+xml; utf8,");
+ height: 15px;
+ background-position: center;
+ background-size: 15px;
+}
+
+.notification__favourite-icon-wrapper .fa-retweet::before {
+ display: none !important;
+}
+
+.notification__favourite-icon-wrapper .fa-retweet {
+ background-image: url("data:image/svg+xml; utf8,");
+ height: 17px;
+ background-size: 17px;
+ background-position: center;
+}
+
+.notification__filter-bar button {
+ background: var(--black);
+ color: var(--gray-shade-7);
+}
+
+.notification__filter-bar {
+ background: var(--black);
+ border-bottom-color: var(--gray-shade-3);
+}
+
+.notification__filter-bar button.active {
+ color: var(--white);
+}
+
+.notification__filter-bar button.active::before {
+ border-color: transparent transparent var(--gray-shade-3);
+}
+
+.notification__filter-bar button.active::after {
+ border-color: transparent transparent var(--gray-shade-2);
+}
+
+.star-icon .icon-button:hover {
+ color: var(--white) !important;
+ cursor: pointer;
+}
+
+.notification__message {
+ color: var(--gray-shade-5) !important;
+ margin: 0;
+ line-height: 30px;
+ padding: 0;
+ padding-left: 67px;
+ border-bottom: 1px solid var(--gray-shade-3);
+ background: var(--black);
+ font-size: 12px;
+}
+
+.notification__message .fa {
+ color: var(--cyan) !important;
+}
+
+.notification.unread:before,
+.status__wrapper.unread:before {
+ border-color: var(--cyan) !important;
+}
+
+.status {
+ border-bottom: 1px solid var(--gray-shade-3) !important;
+}
+
+.status__wrapper {
+ background: var(--gray-shade-2) !important;
+}
+
+.status.status-direct:not(.read) {
+ border-bottom-color: var(--gray-shade-3);
+ background: var(--black);
+}
+
+.display-name__account {
+ color: var(--gray-shade-5) !important;
+}
+
+.status.light .display-name strong,
+.status.light .status__display-name {
+ color: var(--white);
+}
+
+.status.light .status__content a {
+ color: var(--cyan);
+}
+
+.icon-button,
+.icon-button.inverted {
+ color: var(--white) !important;
+}
+
+.icon-button.active {
+ color: var(--cyan) !important;
+}
+
+.icon-button:hover {
+ color: var(--cyan) !important;
+ cursor: pointer;
+ background-color: rgba(0, 0, 0, 0);
+}
+
+.compose-form__sensitive-button .icon-button {
+ color: var(--gray-shade-3) !important;
+}
+
+.compose-form__sensitive-button .icon-button:hover {
+ color: var(--gray-shade-5) !important;
+}
+
+.compose-form__sensitive-button .checkbox.active {
+ border-color: var(--cyan);
+ background-color: var(--cyan);
+}
+
+.status__relative-time {
+ color: var(--gray-shade-5) !important;
+}
+
+.status__visibility-icon {
+ color: var(--gray-shade-5) !important;
+}
+
+.status__content p {
+ color: var(--white) !important;
+}
+
+.muted .status__content p {
+ color: var(--gray-shade-7) !important;
+}
+
+.muted .status__content a {
+ color: var(--gray-shade-9) !important;
+}
+
+.muted .status__display-name strong {
+ color: var(--gray-shade-9) !important;
+}
+
+a.floating-action-button {
+ background: var(--white);
+ color: var(--black);
+}
+
+a.floating-action-button:hover,
+.floating-action-button:focus,
+.floating-action-button:active {
+ background: var(--gray-shade-e);
+ color: var(--black);
+}
+
+::-webkit-scrollbar {
+ width: 5px !important;
+ height: 5px !important;
+}
+
+::-webkit-scrollbar-thumb {
+ background: var(--gray-shade-3) !important;
+}
+
+::-webkit-scrollbar-thumb:hover {
+ background: var(--gray-shade-5) !important;
+ cursor: pointer;
+}
+
+::-webkit-scrollbar-thumb:active {
+ background: var(--white) !important;
+ cursor: pointer;
+}
+
+::-webkit-scrollbar-track {
+ background: var(--gray-shade-2) !important;
+}
+
+::-webkit-scrollbar-track:hover {
+ background: var(--gray-shade-2) !important;
+}
+
+::-webkit-scrollbar-track:active {
+ background: var(--gray-shade-3) !important;
+}
+
+.detailed-status {
+ background: var(--gray-shade-2);
+}
+
+.status__content__read-more-button,
+.status__content .status__content__spoiler-link {
+ background: var(--black);
+ color: var(--white);
+ font-size: 12px;
+ display: block;
+ border-radius: 3px;
+ line-height: 30px;
+ padding: 0 10px;
+ margin-top: 15px;
+ text-transform: capitalize;
+ font-weight: normal;
+ margin-left: 0;
+}
+
+.status__content__read-more-button:hover,
+.status__content .status__content__spoiler-link:hover {
+ text-decoration: none;
+ background: var(--white);
+ color: var(--black);
+}
+
+.dropdown-menu,
+.dropdown-menu__item a {
+ background: var(--gray-shade-4);
+ color: var(--gray-shade-e);
+}
+
+.dropdown-menu__arrow.bottom {
+ border-bottom-color: var(--gray-shade-4);
+}
+
+.dropdown-menu__separator {
+ border-bottom: 1px solid var(--gray-shade-a);
+}
+
+.dropdown-menu__item a:active,
+.dropdown-menu__item a:focus,
+.dropdown-menu__item a:hover {
+ background: var(--cyan);
+ color: var(--gray-shade-3);
+}
+
+.column > .scrollable {
+ background: var(--gray-shade-2);
+ scrollbar-color: var(--gray-shade-3) var(--gray-shade-2);
+ scrollbar-width: thin;
+}
+
+.column-header__back-button {
+ background: var(--gray-shade-3);
+ margin: 0;
+ color: var(--white);
+}
+
+.column-settings__hashtags .column-select__control {
+ background: var(--gray-shade-3);
+ color: var(--white);
+}
+
+.column-settings__hashtags .column-select__placeholder,
+.column-settings__hashtags .column-select__indicator-separator,
+.column-settings__hashtags .column-select__clear-indicator,
+.column-settings__hashtags .column-select__dropdown-indicator {
+ color: var(--gray-shade-a);
+}
+
+.column-settings__hashtags .column-select__clear-indicator:active,
+.column-settings__hashtags .column-select__clear-indicator:focus,
+.column-settings__hashtags .column-select__clear-indicator:hover,
+.column-settings__hashtags .column-select__dropdown-indicator:active,
+.column-settings__hashtags .column-select__dropdown-indicator:focus,
+.column-settings__hashtags .column-select__dropdown-indicator:hover {
+ color: var(--gray-shade-e);
+}
+
+.column-select__menu {
+ background: var(--gray-shade-2) !important;
+ color: var(--gray-shade-e);
+}
+
+.column-settings__hashtags .column-select__input,
+.column-settings__hashtags .column-select__multi-value__label {
+ color: var(--white);
+}
+
+.column-settings__hashtags .column-select__option {
+ color: var(--cyan);
+}
+
+.column-settings__hashtags .column-select__option--is-focused,
+.column-settings__hashtags .column-select__option--is-selected {
+ background: var(--gray-shade-3);
+}
+
+.attachment-list__list a {
+ color: var(--gray-shade-9);
+}
+
+.attachment-list.compact .fa {
+ color: var(--gray-shade-9);
+}
+
+.status__action-bar {
+ margin-bottom: 5px;
+}
+
+.status__action-bar__counter {
+ margin-right: 0;
+}
+
+.status__action-bar-button {
+ margin-right: 5px !important;
+ border-radius: 3px;
+ height: 20px !important;
+}
+
+.status__action-bar-button > * {
+ display: block;
+ height: 20px !important;
+ margin-top: 0 !important;
+ background-position: center center !important;
+}
+
+.status__action-bar-button.icon-button:hover {
+ cursor: pointer;
+}
+
+.status__action-bar__counter__label {
+ position: absolute;
+ left: 140px;
+ bottom: 11px;
+ line-height: 22px;
+ color: var(--gray-shade-4);
+ font-size: 14px;
+ font-weight: normal;
+ display: none;
+}
+
+.status__action-bar-button[aria-label="Share"] {
+ display: none;
+}
+
+.status__action-bar-dropdown {
+ margin-left: auto;
+}
+
+.detailed-status__meta {
+ color: var(--gray-shade-6);
+}
+
+.column {
+ padding: 5px 2.5px;
+}
+
+.column-header > .column-header__back-button {
+ color: var(--white);
+}
+
+.column-header.active {
+ box-shadow: 0 1px 0 rgba(114, 222, 194, 0.6);
+}
+
+.column-header__wrapper.active::before {
+ background: radial-gradient(
+ ellipse,
+ rgba(114, 222, 194, 0.6) 0%,
+ rgba(43, 144, 217, 0) 60%
+ );
+}
+
+.status__content a {
+ color: var(--gray-shade-c);
+}
+
+.detailed-status__action-bar {
+ background: none;
+ border-top: 1px solid var(--gray-shade-4);
+ border-bottom: 1px solid var(--gray-shade-4);
+}
+
+.detailed-status__action-bar button > * {
+ display: block !important;
+ height: 20px;
+ width: 20px;
+}
+
+.drawer {
+ padding: 5px 2.5px 5px 5px !important;
+}
+
+.drawer__header {
+ background: var(--gray-shade-3);
+ height: 45px;
+}
+
+.drawer__header a {
+ color: var(--white);
+}
+
+.drawer__header a:hover {
+ background: var(--gray-shade-4);
+}
+
+.drawer__inner {
+ background-color: var(--gray-shade-3);
+}
+
+.drawer__inner.darker {
+ background: var(--gray-shade-2);
+}
+
+.drawer__inner__mastodon {
+ background: none;
+}
+
+.search__input {
+ padding: 15px;
+ background: var(--gray-shade-2);
+ color: var(--white);
+ height: 45px;
+ font-size: 14px;
+}
+
+.search__input:active {
+ background: var(--black);
+}
+
+.search__input:focus {
+ background: var(--gray-shade-2);
+}
+
+.search__input::placeholder {
+ color: var(--gray-shade-7);
+}
+
+.search__icon .fa-search,
+.search__icon .fa-times-circle {
+ position: absolute;
+ top: 15px;
+}
+
+.compose-form {
+ position: relative;
+ z-index: 0;
+}
+
+.compose-form .compose-form__buttons-wrapper {
+ background: var(--gray-shade-2);
+}
+
+.compose-form__publish .button {
+ background: var(--white);
+ color: transparent;
+}
+
+.compose-form__publish .button:hover {
+ background: var(--cyan);
+ cursor: pointer;
+}
+
+.compose-form__publish .button::after {
+ content: "Post";
+ color: var(--black);
+ left: 18px;
+ display: inline-block;
+ position: absolute;
+}
+
+.getting-started__trends h4,
+.trends-widget h4 {
+ color: var(--gray-shade-c);
+ border-bottom: 1px solid var(--gray-shade-3);
+}
+
+.getting-started__trends .trends__item__current {
+ color: var(--gray-shade-c);
+}
+
+.trends__item__name {
+ color: var(--gray-shade-6);
+}
+
+.trends__item__name a {
+ color: var(--gray-shade-c);
+}
+
+.trends__item__sparkline path:first-child {
+ fill: rgba(114, 222, 194, 0.25) !important;
+}
+
+.trends__item__sparkline path:last-child {
+ stroke: var(--cyan) !important;
+}
+
+.trends__item {
+ border-bottom: 1px solid var(--gray-shade-3);
+}
+
+.search-results__header {
+ color: var(--gray-shade-5);
+ background: var(--black);
+ border-bottom: 1px dotted var(--gray-shade-3);
+}
+
+.search-results__section h5 {
+ display: none;
+}
+
+.status-card,
+.attachment-list,
+.attachment-list__icon {
+ color: var(--gray-shade-a);
+ border-color: var(--gray-shade-4);
+}
+
+a.status-card:hover {
+ background: var(--gray-shade-3);
+}
+
+.status-card__description {
+ color: var(--gray-shade-8);
+}
+
+.status-card.compact {
+ border: 0;
+ background: transparent;
+ color: var(--black);
+}
+
+.status-card.compact:hover {
+ background: var(--gray-shade-c);
+}
+
+.status-card__content {
+ color: var(--black);
+ background: var(--white);
+}
+
+.status-card__title {
+ color: var(--black);
+}
+
+.status-card__image {
+ background-color: transparent;
+}
+
+.navigation-bar__profile-edit span {
+ color: var(--gray-shade-6);
+}
+
+.text-icon-button {
+ color: var(--gray-shade-6);
+}
+
+.character-counter {
+ color: var(--gray-shade-5) !important;
+}
+
+.column-back-button {
+ background: var(--gray-shade-3);
+ color: var(--white);
+}
+
+.account__header {
+ background-color: var(--black);
+}
+
+.account__header > div {
+ background: var(--gray-shade-2);
+}
+
+.account__header .account__header__username {
+ background: var(--black);
+ display: inline-block;
+ color: var(--white);
+ padding: 0 10px;
+ line-height: 30px;
+ border-radius: 5px;
+ margin-top: 15px;
+ margin-bottom: 15px;
+}
+
+.account__header__tabs__buttons .icon-button {
+ border: 0;
+}
+
+.account__header .account__header__content {
+ background: var(--gray-shade-2);
+ color: var(--white);
+}
+
+.account__header__content a {
+ color: var(--cyan);
+}
+
+.account__header__bio .account__header__fields a {
+ color: var(--cyan);
+}
+
+.account__header__bar .avatar .account__avatar {
+ border: 2px solid var(--gray-shade-4);
+}
+
+.account__header__fields {
+ border-color: var(--gray-shade-3);
+}
+
+.account__header__bar {
+ border-bottom-color: var(--gray-shade-3);
+}
+
+.account__disclaimer {
+ border-top: 0;
+ color: var(--gray-shade-6);
+}
+
+.account__action-bar__tab {
+ border-right-color: var(--gray-shade-3);
+}
+
+.account__action-bar__tab > span {
+ color: var(--gray-shade-6);
+}
+
+.account__action-bar__tab.active {
+ border-bottom-color: var(--cyan);
+}
+
+.account__section-headline {
+ background: var(--gray-shade-1);
+ border-bottom: 1px solid var(--gray-shade-3);
+}
+
+.account__action-bar {
+ border-top-color: var(--gray-shade-3);
+ border-bottom-color: var(--gray-shade-3);
+}
+
+.account {
+ border-bottom-color: var(--gray-shade-3);
+}
+
+.reply-indicator {
+ background: var(--gray-shade-2);
+}
+
+.reply-indicator__content {
+ color: var(--gray-shade-c);
+}
+
+.reply-indicator__content a {
+ color: var(--white);
+}
+
+.reply-indicator .display-name__html {
+ color: var(--white);
+}
+
+.icon-button i.fa-reply,
+.icon-button i.fa-reply-all {
+ background-image: url("data:image/svg+xml; utf8,");
+ display: inline-block;
+}
+
+.icon-button:hover i.fa-reply,
+.icon-button:hover i.fa-reply-all {
+ background-image: url("data:image/svg+xml; utf8,");
+}
+
+.icon-button i.fa-reply::before,
+.icon-button i.fa-reply-all::before {
+ display: none !important;
+}
+
+.icon-button i.fa-star {
+ background-image: url("data:image/svg+xml; utf8,");
+}
+
+.icon-button i.fa-star::before {
+ display: none;
+}
+
+.icon-button:hover i.fa-star {
+ background-image: url("data:image/svg+xml; utf8,");
+}
+
+.icon-button.active i.fa-star {
+ background-image: url("data:image/svg+xml; utf8,");
+ height: 22px;
+ background-position: 0 0;
+ background-size: 22px;
+ vertical-align: middle;
+}
+
+.icon-button i.fa-lock {
+ background-image: url("data:image/svg+xml; utf8,");
+ height: 22px;
+ background-position: 0 3px;
+ background-size: 22px;
+}
+
+.icon-button i.fa-lock::before {
+ display: none;
+}
+
+.icon-button:hover i.fa-lock {
+ background-image: url("data:image/svg+xml; utf8,");
+}
+
+.icon-button i.fa-envelope {
+ background-image: url("data:image/svg+xml; utf8,");
+ height: 22px;
+ background-position: 0 3px;
+ background-size: 22px;
+}
+
+.icon-button i.fa-envelope::before {
+ display: none;
+}
+
+.icon-button:hover i.fa-envelope {
+ background-image: url("data:image/svg+xml; utf8,");
+}
+
+.icon-button i.fa-ellipsis-h {
+ background-image: url("data:image/svg+xml; utf8,");
+ display: inline-block;
+ width: 22px;
+ height: 20px;
+ background-position: 0 center;
+ background-repeat: no-repeat;
+ background-size: contain;
+ margin-top: 2px;
+}
+
+.icon-button i.fa-ellipsis-h::before {
+ display: none;
+}
+
+.icon-button:hover i.fa-ellipsis-h {
+ background-image: url("data:image/svg+xml; utf8,");
+}
+
+.icon-button i.fa-retweet {
+ background-image: url("data:image/svg+xml; utf8,") !important;
+}
+
+.icon-button i.fa-retweet::before {
+ display: none;
+}
+
+.icon-button:hover i.fa-retweet {
+ background-image: url("data:image/svg+xml; utf8,") !important;
+}
+
+.icon-button.active i.fa-retweet {
+ background-image: url("data:image/svg+xml; utf8,") !important;
+}
+
+.icon-button i.fa-share-alt::before {
+ display: none;
+}
+
+.icon-button i.fa-share-alt {
+ background-image: url("data:image/svg+xml; utf8,");
+}
+
+.icon-button:hover i.fa-share-alt {
+ background-image: url("data:image/svg+xml; utf8,");
+}
+
+.icon-button i.fa-bookmark {
+ background-image: url("data:image/svg+xml; utf8,");
+}
+
+.icon-button.active i.fa-bookmark {
+ background-image: url("data:image/svg+xml; utf8,");
+}
+
+.icon-button:hover i.fa-bookmark {
+ background-image: url("data:image/svg+xml; utf8,");
+}
+
+.icon-button i.fa-bookmark::before {
+ display: none;
+}
+
+.detailed-status__link i.fa-retweet {
+ width: 14px;
+ height: 14px;
+ background-image: url("data:image/svg+xml; utf8,");
+ vertical-align: sub;
+}
+
+.detailed-status__link i.fa-retweet::before {
+ display: none !important;
+}
+
+.detailed-status__link i.fa-star {
+ width: 14px;
+ height: 14px;
+ background-image: url("data:image/svg+xml; utf8,");
+ margin-bottom: 0.5px;
+ vertical-align: sub;
+}
+
+.detailed-status__link i.fa-star::before {
+ display: none !important;
+}
+
+.regeneration-indicator,
+.regeneration-indicator__label strong {
+ color: var(--gray-shade-6);
+ background: var(--gray-shade-2);
+}
+
+.status__prepend {
+ color: var(--gray-shade-6);
+}
+
+.status__display-name {
+ color: var(--gray-shade-9);
+}
+
+.status__prepend .status__display-name strong {
+ color: var(--gray-shade-9);
+}
+
+.fa-retweet::before {
+ color: var(--cyan);
+ content: url("data:image/svg+xml; utf8,") !important;
+}
+
+.status__prepend-icon {
+ color: var(--cyan);
+ margin-top: -2px;
+}
+
+.getting-started {
+ background: var(--gray-shade-2);
+ color: var(--gray-shade-6);
+}
+
+.getting-started__wrapper .navigation-bar {
+ background-color: var(--gray-shade-2);
+}
+
+.column-subheading {
+ background: var(--gray-shade-2);
+ color: var(--gray-shade-6);
+}
+
+.column-link {
+ background: var(--gray-shade-3);
+ color: #ffffff;
+}
+
+.column-link:hover {
+ background: var(--gray-shade-4);
+}
+
+.getting-started__footer a {
+ color: var(--gray-shade-6);
+}
+
+.getting-started__footer p {
+ color: var(--gray-shade-4);
+}
+
+.getting-started__footer p a {
+ color: var(--gray-shade-6);
+}
+
+.columns-area {
+ padding: 0;
+}
+
+.tabs-bar {
+ background: none;
+ height: 45px;
+ overflow: hidden;
+}
+
+.tabs-bar__wrapper {
+ background-color: var(--gray-shade-2);
+}
+
+.tabs-bar__link {
+ border-bottom: 0;
+}
+
+.tabs-bar__link.active {
+ border-bottom: 0;
+ color: var(--cyan);
+}
+
+.loading-bar {
+ background-color: var(--cyan);
+}
+
+.status-card__image-image {
+ border-radius: 0 !important;
+}
+
+.column-header.active .column-header__icon {
+ color: var(--cyan);
+ text-shadow: none;
+}
+
+.empty-column-indicator,
+.error-column {
+ color: var(--white);
+ background: var(--gray-shade-2);
+}
+
+.column-inline-form {
+ color: var(--white);
+ background: var(--gray-shade-2);
+}
+
+.column-inline-form .setting-text {
+ color: var(--white);
+ background-color: var(--gray-shade-5);
+}
+
+.column-inline-form .setting-text:focus {
+ color: var(--cyan);
+ border-bottom: 2px solid var(--cyan);
+}
+
+.navigation-bar .navigation-bar__profile-account {
+ color: var(--white);
+}
+
+.trends__header {
+ color: var(--white);
+ background-color: var(--gray-shade-1);
+}
+
+.media-spoiler {
+ color: var(--gray-shade-5);
+}
+
+.load-more {
+ color: var(--white);
+}
+
+.load-more:hover {
+ color: var(--cyan);
+ background: var(--gray-shade-3);
+}
+
+.privacy-dropdown__dropdown {
+ background: var(--gray-shade-3);
+}
+
+.privacy-dropdown__option,
+.privacy-dropdown__option__content,
+.privacy-dropdown__option__content strong {
+ background: var(--gray-shade-3);
+ color: var(--white);
+}
+
+.privacy-dropdown__option:hover .privacy-dropdown__option__content,
+.privacy-dropdown__option:hover .privacy-dropdown__option__content strong,
+.privacy-dropdown__option.active .privacy-dropdown__option__content,
+.privacy-dropdown__option.active .privacy-dropdown__option__content strong,
+.privacy-dropdown__option.active
+ .privacy-dropdown__option__content
+ strong:hover {
+ background: var(--cyan) !important;
+ color: var(--gray-shade-3);
+}
+
+.privacy-dropdown__option.active,
+.privacy-dropdown__option:hover,
+.privacy-dropdown__option.active:hover {
+ background: var(--cyan);
+}
+
+.privacy-dropdown.active .privacy-dropdown__value.active {
+ color: var(--gray-shade-3);
+ background: var(--cyan);
+}
+
+.privacy-dropdown.active .privacy-dropdown__value.active i {
+ color: var(--gray-shade-3);
+}
+
+.text-icon-button.active {
+ color: var(--cyan);
+}
+
+.privacy-dropdown .icon-button.active {
+ color: var(--gray-shade-3) !important;
+ background: var(--cyan);
+ border-radius: 4px 4px 0 0;
+}
+
+.focusable:focus .detailed-status {
+ background: var(--gray-shade-1);
+}
+
+.focusable:focus .detailed-status__action-bar {
+ background: var(--gray-shade-1);
+}
+
+.focusable:focus .status.status-direct {
+ background: var(--gray-shade-1);
+}
+
+/*
+ public facing pages
+*/
+
+.public-layout {
+ background: var(--gray-shade-1);
+}
+
+/* extended description page */
+
+.contact-widget h4 {
+ color: var(--gray-shade-a);
+}
+
+.contact-widget > a {
+ color: var(--gray-shade-a);
+}
+
+.table-of-contents {
+ background: var(--gray-shade-2);
+}
+
+.table-of-contents li a {
+ border-bottom-color: var(--gray-shade-3);
+}
+
+/* public facing header nav */
+
+.public-layout .header {
+ background: var(--gray-shade-2);
+}
+
+.public-layout .header .brand:hover {
+ background: var(--gray-shade-4);
+}
+
+.public-layout .header .nav-link {
+ color: var(--gray-shade-c);
+}
+
+/* The two rulesets below address a background color gap
+ at the top of the public profile pages */
+.public-layout div.container {
+ padding-top: 10px;
+}
+
+.public-layout div.container nav.header {
+ margin-top: 0;
+}
+
+.public-layout .header p {
+ color: var(--cyan);
+}
+
+.public-layout .header .nav-button {
+ background: var(--gray-shade-3);
+ color: var(--gray-shade-c);
+}
+
+.public-layout .header .nav-button:hover {
+ color: var(--cyan);
+ background: var(--gray-shade-4);
+}
+
+/* other public pages */
+
+.page-header {
+ background: var(--gray-shade-2);
+}
+
+.page-header p {
+ color: var(--gray-shade-a);
+}
+
+.public-layout .public-account-header {
+ background: var(--gray-shade-2);
+}
+
+.public-layout .public-account-header__bar::before {
+ background: var(--gray-shade-2);
+}
+
+.public-layout .public-account-header__bar a.avatar {
+ border: 0;
+}
+
+.public-layout .public-account-header__tabs__tabs .counter {
+ border-right-color: var(--gray-shade-3);
+}
+
+.public-layout .public-account-header__tabs__tabs .counter.active::after {
+ border-bottom: 2px solid var(--cyan);
+}
+
+.public-layout .public-account-header__tabs__tabs .counter::after {
+ border-bottom: 2px solid var(--gray-shade-9);
+}
+
+.public-layout .public-account-header__tabs__tabs .counter .counter-label,
+.account__header__bio .counter .counter-label {
+ color: var(--gray-shade-9);
+}
+
+.public-layout .public-account-header__bar a.avatar img {
+ border: 4px solid var(--gray-shade-2);
+}
+
+.public-layout .public-account-bio .account__header__fields dl,
+.public-account-bio .account__header__fields,
+.account__header .account__header__fields dl,
+.account__header__bio .account__header__fields dl {
+ border-color: var(--gray-shade-3);
+}
+
+.public-layout .public-account-bio .account__header__fields dt,
+.account__header .account__header__fields dt {
+ color: var(--white);
+ background: var(--gray-shade-2);
+}
+
+.public-layout .public-account-bio .account__header__fields dd,
+.account__header .account__header__fields dd,
+.account__header__bio .account__header__fields dd {
+ color: var(--white);
+ background: var(--gray-shade-2);
+}
+
+.public-layout .public-account-bio .account__header__fields a,
+.account__header__fields a,
+.account__header__bio .account__header__fields a {
+ color: var(--cyan);
+}
+
+.activity-stream .entry:first-child .detailed-status,
+.activity-stream .entry:first-child .status,
+.activity-stream .entry:first-child .load-more {
+ border-radius: none;
+}
+
+.activity-stream .entry {
+ background: var(--gray-shade-2);
+}
+
+.activity-stream div[data-component] {
+ max-width: 540px !important;
+}
+
+.account__section-headline a {
+ color: var(--gray-shade-6);
+}
+
+.account__section-headline a.active::after {
+ border-color: transparent transparent var(--gray-shade-2);
+}
+
+.account__section-headline a:hover {
+ color: var(--white);
+}
+
+.public-layout .public-account-header__tabs__name h1 small,
+.account__header__tabs__name h1 small {
+ color: var(--cyan);
+}
+
+.button.logo-button {
+ background: var(--gray-shade-3);
+}
+
+.button.logo-button:hover {
+ background: var(--cyan);
+}
+
+.public-layout .hero-widget__text {
+ color: var(--white);
+ background: var(--gray-shade-2);
+}
+
+.public-layout .public-account-bio .account__header__content,
+.public-layout .public-account-bio__extra,
+.public-layout .public-account-bio .roles {
+ border-color: var(--gray-shade-3);
+ background: var(--gray-shade-2);
+}
+
+.public-layout
+ .public-account-header__extra
+ .public-account-bio
+ .account__header__fields {
+ border-top: 1px solid var(--gray-shade-3);
+}
+
+.public-layout .public-account-header__extra__links a,
+.account__header__extra__links a {
+ color: var(--gray-shade-6);
+}
+
+.public-layout .public-account-bio__extra,
+.public-layout .public-account-bio .roles {
+ color: var(--cyan);
+}
+
+.public-layout .status__action-bar__counter__label {
+ left: 148px;
+ bottom: 18px;
+}
+
+.public-layout .footer *,
+.public-layout .footer .brand svg path {
+ color: var(--gray-shade-6) !important;
+ fill: var(--gray-shade-6);
+}
+
+.public-layout .box-widget {
+ background: var(--gray-shade-2);
+}
+
+.public-layout .box-widget a,
+.public-layout .box-widget a:visited {
+ color: var(--cyan);
+}
+
+.public-layout .box-widget ul {
+ list-style: none;
+ margin-left: 0;
+}
+
+.public-layout .box-widget ul li {
+ margin: 0;
+ margin-bottom: 1em;
+ padding-left: 1em;
+ position: relative;
+}
+
+.public-layout .box-widget ul li::after {
+ content: "";
+ height: 0.35em;
+ width: 0.35em;
+ background: var(--gray-shade-e);
+ display: block;
+ position: absolute;
+ transform: rotate(45deg);
+ top: 0.66em;
+ left: 0;
+}
+
+.public-layout .box-widget .rich-formatting em {
+ color: var(--gray-shade-e);
+}
+
+.public-layout .box-widget .rich-formatting li,
+.public-layout .box-widget .rich-formatting p {
+ color: var(--gray-shade-c);
+}
+
+.public-layout .box-widget .rich-formatting h1,
+.public-layout .box-widget .rich-formatting h2,
+.public-layout .box-widget .rich-formatting h3 {
+ color: var(--white);
+}
+
+.public-layout .box-widget .rich-formatting table th {
+ color: var(--gray-shade-9);
+}
+
+.public-layout .box-widget .rich-formatting table tr {
+ border-bottom-color: var(--gray-shade-3);
+ color: var(--gray-shade-c);
+}
+
+.public-layout .contact-widget,
+.public-layout .landing-page__information.contact-widget {
+ color: var(--white);
+ background: var(--gray-shade-2);
+}
+
+.public-layout .contact-widget,
+.public-layout .landing-page__information.contact-widget a {
+ color: var(--cyan);
+}
+
+.account-role.admin {
+ border: 2px solid #ffffff;
+ background: transparent;
+ line-height: 15px;
+ border-radius: 14px;
+ padding: 5px 10px;
+ display: inline-block;
+ color: var(--white);
+}
+
+@media only screen and (max-width: 600px) {
+ .public-account-bio .account__header__fields,
+ .account__header .account__header__fields dt {
+ color: var(--white);
+ background: var(--gray-shade-2);
+ }
+
+ .public-layout .public-account-header__tabs__name h1 {
+ background: none;
+ padding-left: 0;
+ margin-right: 0;
+ margin-top: 0;
+ text-align: left;
+ border-radius: 0;
+ }
+
+ .public-layout .public-account-header__bar {
+ background: none;
+ }
+
+ .public-layout .public-account-header__extra__links a {
+ color: var(--gray-shade-6);
+ }
+}
+
+/*
+ settings sidebar
+*/
+
+.admin-wrapper .content-heading {
+ border-bottom-color: var(--gray-shade-1);
+}
+
+.admin-wrapper .quick-nav a {
+ color: var(--white);
+}
+
+.admin-wrapper .quick-nav a:hover {
+ color: var(--cyan);
+}
+
+.admin-wrapper .sidebar__toggle {
+ background-color: var(--gray-shade-3);
+
+ a:hover {
+ background-color: var(--gray-shade-4);
+ }
+}
+
+.admin-wrapper .sidebar__toggle__icon {
+ & > i {
+ color: var(--gray-shade-a);
+ }
+}
+
+.admin-wrapper .sidebar-wrapper {
+ height: inherit;
+ background: var(--black);
+}
+
+.admin-wrapper .sidebar-wrapper .sidebar-wrapper__inner {
+ background: var(--black);
+}
+
+.admin-wrapper .sidebar ul a {
+ color: var(--white);
+}
+
+.admin-wrapper .sidebar ul a:hover,
+.admin-wrapper .sidebar ul a:focus {
+ color: var(--cyan);
+ background: var(--gray-shade-2);
+}
+
+.admin-wrapper .sidebar ul a.selected {
+ background: var(--gray-shade-2);
+}
+
+.admin-wrapper .sidebar ul li {
+ background: var(--gray-shade-1);
+}
+
+.admin-wrapper .sidebar-wrapper .sidebar ul .simple-navigation-active-leaf a {
+ color: var(--white);
+ background: var(--gray-shade-3);
+}
+
+.admin-wrapper
+ .sidebar-wrapper
+ .sidebar
+ ul
+ .simple-navigation-active-leaf
+ a:hover,
+.admin-wrapper
+ .sidebar-wrapper
+ .sidebar
+ ul
+ .simple-navigation-active-leaf
+ a:focus {
+ color: var(--cyan);
+ background: var(--gray-shade-2);
+}
+
+.admin-wrapper .simple_form button {
+ background: var(--cyan);
+ color: var(--gray-shade-3);
+}
+
+.admin-wrapper .simple_form button:hover {
+ background: var(--cyan-light);
+}
+
+.admin-wrapper .simple_form .block-button {
+ color: var(--gray-shade-3);
+ background: var(--cyan);
+}
+
+.admin-wrapper .simple_form .block-button:hover {
+ background: var(--cyan-light);
+}
+
+.admin-wrapper a.button {
+ background: var(--cyan);
+}
+
+.admin-wrapper a.button:hover {
+ background: var(--cyan-light);
+}
+
+.admin-wrapper .table > tbody > tr:nth-child(odd) > td,
+.admin-wrapper .table > tbody > tr:nth-child(odd) > th {
+ background: var(--gray-shade-4);
+}
+
+.admin-wrapper .table th,
+.table td {
+ border: 0;
+ background: var(--gray-shade-2);
+}
+
+.admin-wrapper .table a {
+ text-decoration: none;
+ color: var(--cyan);
+}
+
+.admin-wrapper .card__bar {
+ background: var(--gray-shade-3);
+}
+
+.admin-wrapper .card__bar .display-name span {
+ color: var(--cyan);
+}
+
+.admin-wrapper .content .muted-hint,
+body .muted-hint,
+.simple_form p.hint {
+ color: var(--gray-shade-9);
+}
+
+.admin-wrapper .content .muted-hint a,
+body .muted-hint a {
+ color: var(--cyan);
+}
+
+.admin-wrapper .content h2,
+.admin-wrapper .content h4 {
+ color: var(--gray-shade-c);
+ border-bottom: 1px solid var(--gray-shade-3);
+}
+
+.admin-wrapper .content h3,
+.admin-wrapper .content h6 {
+ color: var(--gray-shade-c);
+}
+
+.admin-wrapper .content > p {
+ color: var(--gray-shade-9);
+}
+
+/*
+ profile directory
+*/
+
+.endorsements-widget h4 {
+ color: var(--gray-shade-5);
+}
+
+.filter-form {
+ background: var(--gray-shade-2);
+}
+
+.radio-button__input {
+ border: 1px solid var(--gray-shade-9);
+}
+
+.radio-button__input.checked {
+ border-color: var(--cyan);
+ background: var(--cyan);
+}
+
+.directory__card__img {
+ background: var(--gray-shade-3);
+}
+
+.directory__card__bar,
+.directory__card__extra {
+ background: var(--gray-shade-2);
+}
+
+.directory__card__extra .account__header__content {
+ border-bottom: 1px solid var(--gray-shade-5);
+}
+
+.directory__card__bar .display-name span {
+ color: var(--gray-shade-a);
+}
+
+.directory__tag a {
+ border-color: var(--gray-shade-3);
+ background: var(--gray-shade-2);
+}
+
+.directory__tag.active a {
+ background: var(--cyan);
+}
+
+.directory__tag a:active,
+.directory__tag a:focus,
+.directory__tag a:hover {
+ background: var(--gray-shade-3);
+}
+
+.directory__tag a h4 .fa {
+ color: var(--gray-shade-5);
+}
+
+.directory__tag a h4 small {
+ color: var(--gray-shade-5);
+}
+
+.directory__tag a .trends__item__current {
+ color: var(--gray-shade-5);
+}
+
+.directory__tag.active a .trends__item__current {
+ color: var(--white);
+}
+
+.account__header__content,
+.accounts-table__count small {
+ color: var(--gray-shade-9);
+}
+
+/*
+ public facing card sytle
+*/
+
+.card__bar {
+ background: var(--gray-shade-2);
+}
+
+.card > a:active .card__bar,
+.card > a:focus .card__bar,
+.card > a:hover .card__bar {
+ background: var(--gray-shade-3);
+}
+
+.card__bar .display-name span {
+ color: var(--cyan);
+}
+
+.card__img {
+ background: var(--gray-shade-1);
+}
+
+/*
+ landing page
+*/
+
+.landing-page__short-description h1 small {
+ color: var(--gray-shade-9);
+}
+
+.landing-page h2 {
+ color: var(--white);
+}
+
+.landing-page h3 {
+ color: var(--gray-shade-c);
+}
+
+.landing-page h4 {
+ color: var(--gray-shade-c);
+}
+
+.landing-page h6 {
+ color: var(--gray-shade-c);
+}
+
+.landing-page p {
+ color: var(--white);
+}
+
+.landing-page p a {
+ color: var(--gray-shade-a) !important;
+}
+
+.landing-page__call-to-action {
+ background: var(--gray-shade-2);
+ margin-bottom: -10px;
+}
+
+.landing-page__mascot {
+ height: 100px;
+ position: relative;
+ left: -40px;
+ bottom: 150px;
+}
+
+.landing-page__mascot img {
+ height: 320px;
+}
+
+.landing-page__information {
+ background: var(--gray-shade-3);
+}
+
+.landing-page__information strong {
+ color: var(--white);
+}
+
+.landing-page__forms {
+ background: transparent;
+}
+
+.landing-page__forms .button {
+ background-color: var(--white);
+ color: var(--black);
+}
+
+.landing-page__forms .button.button-alternative-2 {
+ background: var(--gray-shade-9);
+ color: var(--black);
+}
+
+.landing-page .closed-registrations-message p {
+ color: var(--gray-shade-6);
+}
+
+.landing-page .features-list .features-list__row .text {
+ color: var(--gray-shade-9);
+}
+
+.landing-page .separator-or::before {
+ border-bottom-color: var(--gray-shade-3);
+}
+
+.landing-page .separator-or span {
+ color: var(--gray-shade-c);
+ background: var(--gray-shade-3);
+}
+
+.simple_form button {
+ background: var(--cyan);
+ color: var(--gray-shade-2);
+}
+
+.simple_form button:hover {
+ background: var(--cyan-light);
+}
+
+.simple_form select {
+ background-color: var(--gray-shade-1);
+}
+
+.simple_form .input.boolean label a {
+ color: var(--cyan);
+}
+
+.landing .simple_form .user_agreement .label_input > label,
+.landing .simple_form p.lead,
+.simple_form .label_input__append,
+.landing .hero-widget h4,
+.landing .hero-widget__counter span,
+.simple_form .input.with_block_label .hint,
+.simple_form .hint {
+ color: var(--gray-shade-a);
+}
+
+.landing .hero-widget__footer {
+ background: var(--gray-shade-2);
+}
+
+.landing__brand {
+ display: none;
+}
+
+.landing__grid {
+ padding-top: 15px;
+}
+
+.button.button-primary {
+ background: var(--cyan);
+ color: var(--gray-shade-2);
+}
+
+.button.button-primary:hover {
+ background: var(--cyan-light);
+}
+
+.button.button-secondary {
+ color: var(--gray-shade-2);
+ border: 1px solid var(--gray-shade-2);
+}
+
+.button.button-secondary:hover {
+ color: var(--gray-shade-4);
+ border: 1px solid var(--gray-shade-3);
+}
+
+.button.button-secondary:active,
+.button.button-secondary:focus,
+.button.button-secondary:hover {
+ color: var(--gray-shade-6);
+ border: 1px solid var(--gray-shade-2);
+}
+
+.simple_form input[type=text],
+.simple_form input[type=number],
+.simple_form input[type=email],
+.simple_form input[type=password],
+.simple_form textarea {
+ background: var(--gray-shade-1);
+}
+
+.simple_form input[type=text]::placeholder,
+.simple_form input[type=number]::placeholder,
+.simple_form input[type=email]::placeholder,
+.simple_form input[type=password]::placeholder,
+.simple_form textarea::placeholder {
+ color: var(--gray-shade-7);
+}
+
+.simple_form input[type="text"]:focus,
+.simple_form input[type="email"]:active,
+.simple_form input[type="email"]:focus,
+.simple_form input[type="number"]:active,
+.simple_form input[type="number"]:focus,
+.simple_form input[type="password"]:active,
+.simple_form input[type="password"]:focus,
+.simple_form input[type="text"]:active,
+.simple_form input[type="text"]:focus,
+.simple_form textarea:active,
+.simple_form textarea:focus,
+.simple_form input[type="email"]:required:valid,
+.simple_form input[type="number"]:required:valid,
+.simple_form input[type="password"]:required:valid,
+.simple_form input[type="text"]:required:valid,
+.simple_form textarea:required:valid {
+ background: var(--gray-shade-1);
+ border-color: var(--cyan);
+}
+
+.poll .button.button-secondary:disabled {
+ background-color: var(--cyan);
+ cursor: pointer;
+ opacity: .5;
+}
+
+.poll .button.button-secondary {
+ background-color: var(--cyan);
+ cursor: pointer;
+ opacity: 1;
+}
+
+.poll__input {
+ border: 1px solid var(--gray-shade-9);
+}
+
+.poll__text {
+ color: var(--white);
+}
+
+.poll__link {
+ color: var(--cyan);
+}
+
+.poll__footer {
+ color: var(--gray-shade-6);
+}
+
+.poll__chart {
+ background: var(--gray-shade-3);
+}
+
+.poll__chart.leading,
+.poll__chart.leading .poll-text,
+.muted .poll__chart.leading {
+ background: var(--cyan);
+}
+
+.actions-modal,
+.boost-modal,
+.confirmation-modal,
+.mute-modal,
+.report-modal {
+ background: var(--gray-shade-2);
+ color: var(--white);
+}
+
+.actions-modal .status {
+ background: none;
+ border-bottom-color: var(--white) !important;
+}
+
+.actions-modal ul li:not(:empty) a,
+.actions-modal ul li:not(:empty) a button {
+ color: var(--white);
+}
+
+.actions-modal ul li:not(:empty) a.active,
+.actions-modal ul li:not(:empty) a.active button,
+.actions-modal ul li:not(:empty) a:active,
+.actions-modal ul li:not(:empty) a:active button,
+.actions-modal ul li:not(:empty) a:focus,
+.actions-modal ul li:not(:empty) a:focus button,
+.actions-modal ul li:not(:empty) a:hover,
+.actions-modal ul li:not(:empty) a:hover button {
+ background-color: var(--cyan);
+ color: var(--gray-shade-3);
+}
+
+.boost-modal__action-bar,
+.confirmation-modal__action-bar,
+.mute-modal__action-bar {
+ background: var(--gray-shade-3);
+}
+
+.boost-modal__action-bar .button,
+.confirmation-modal__action-bar .button,
+.mute-modal__action-bar .button {
+ background: var(--cyan);
+ color: var(--gray-shade-5);
+}
+
+.confirmation-modal__action-bar .confirmation-modal__cancel-button,
+.confirmation-modal__action-bar .confirmation-modal__secondary-button,
+.confirmation-modal__action-bar .mute-modal__cancel-button,
+.mute-modal__action-bar .confirmation-modal__cancel-button,
+.mute-modal__action-bar .confirmation-modal__secondary-button,
+.mute-modal__action-bar .mute-modal__cancel-button {
+ color: var(--cyan);
+ background: none !important;
+}
+
+.media-modal__button--active {
+ background-color: var(--cyan);
+}
+
+.report-modal__comment .setting-text-label {
+ color: var(--gray-shade-c);
+}
+
+.flash-message {
+ background: var(--gray-shade-3);
+ color: var(--gray-shade-9);
+}
+
+.flash-message .oauth-code {
+ background: var(--gray-shade-3);
+}
+
+.react-toggle-track-check svg path {
+ fill: var(--gray-shade-3);
+}
+
+.search-popout {
+ background: var(--gray-shade-2);
+}
+
+.search-popout h4,
+.search-popout em {
+ color: var(--cyan) !important;
+}
+
+.search-popout span {
+ color: var(--gray-shade-a);
+}
+
+@media screen and (min-width: 630px) {
+ .compose-panel .compose-form {
+ padding-bottom: 0;
+ margin-bottom: 0;
+ }
+
+ .columns-area--mobile .notification__message {
+ margin-left: 0;
+ padding-top: 0;
+ }
+
+ .columns-area--mobile .notification__favourite-icon-wrapper {
+ left: 25px;
+ }
+
+ .tabs-bar__wrapper {
+ background: var(--gray-shade-1);
+ }
+
+ .tabs-bar__link:active,
+ .tabs-bar__link:focus,
+ .tabs-bar__link:hover {
+ background: transparent;
+ color: var(--cyan);
+ }
+}
+
+.column-link--transparent.active {
+ color: var(--cyan);
+}
+
+.navigation-panel hr {
+ border-top: 2px solid var(--gray-shade-9);
+}
+
+.compose-form .autosuggest-textarea__suggestions {
+ background: var(--gray-shade-3);
+ color: var(--white);
+}
+
+.compose-form .autosuggest-textarea__suggestions__item.selected,
+.compose-form .autosuggest-textarea__suggestions__item:active,
+.compose-form .autosuggest-textarea__suggestions__item:focus,
+.compose-form .autosuggest-textarea__suggestions__item:hover {
+ background-color: var(--cyan);
+ color: var(--black);
+}
+
+.compose-form .autosuggest-textarea__textarea::placeholder {
+ color: var(--gray-shade-7);
+}
+
+.icon-with-badge__badge {
+ background: var(--cyan);
+ color: var(--gray-shade-3);
+ border: 0;
+}
+
+.reply-indicator__content a.unhandled-link,
+.status__content a.unhandled-link {
+ color: var(--cyan);
+}
+
+/* Announcment Styling */
+
+.announcments,
+.announcements {
+ background: var(--gray-shade-3);
+}
+
+.announcements__item__unread {
+ background: var(--cyan);
+}
+
+.announcements__pagination {
+ color: var(--gray-shade-a);
+}
+
+.announcements__item__content a.unhandled-link {
+ color: var(--cyan);
+}
+
+.reactions-bar__item {
+ background: var(--gray-shade-5);
+}
+
+.reactions-bar .emoji-button:hover {
+ color: var(--gray-shade-e);
+}
+
+.reactions-bar__item:hover {
+ background: var(--gray-shade-4);
+}
+
+.reactions-bar__item__count,
+.reactions-bar .emoji-button {
+ color: var(--gray-shade-e);
+}
+
+/* DM styling */
+
+.conversation {
+ border-bottom: 1px solid var(--gray-shade-3);
+}
+
+.conversation:focus {
+ background: var(--gray-shade-3);
+}
+
+.conversation--unread {
+ background: var(--gray-shade-1);
+}
+
+.conversation__unread {
+ background: var(--cyan);
+}
+
+.conversation__content__names {
+ color: var(--gray-shade-9);
+}
+
+.conversation__content__relative-time {
+ color: var(--gray-shade-9);
+}
+
+/*
+ audio/video player styling
+*/
+
+.audio-player {
+ background: var(--black);
+}
+
+.audio-player__progress-placeholder {
+ background-color: var(--cyan);
+}
+
+.audio-player__wave-placeholder {
+ background-color: var(--gray-shade-3);
+}
+
+.audio-player__waveform::before {
+ border-top: 1px solid var(--gray-shade-3);
+}
+
+.audio-player .video-player__controls {
+ background: var(--black);
+ border-top: 1px solid var(--black);
+}
+
+.video-player__volume__handle {
+ background: var(--cyan);
+}
+
+.video-player__volume::before {
+ background: var(--gray-shade-3);
+}
+
+.video-player__volume__current {
+ background: var(--cyan);
+}
+
+/*
+ list-adder
+*/
+.list-adder,
+.list-adder__account,
+.list-adder__lists {
+ background: var(--gray-shade-2);
+}
+
+.list-adder .list {
+ border-bottom-color: var(--gray-shade-3);
+}
+
+/*
+ settings & dashboard styles, tables
+*/
+
+.neutral-hint,
+.admin-wrapper .content .neutral-hint {
+ color: var(--gray-shade-6);
+}
+
+.announcements-list {
+ border: 1px solid var(--black);
+ overflow: hidden;
+ position: relative;
+}
+
+.announcements-list__item {
+ background: var(--gray-shade-3);
+ border-bottom: 1px solid var(--black);
+}
+
+.announcements-list__item__meta {
+ color: var(--gray-shade-7);
+}
+
+button.table-action-link,
+a.table-action-link {
+ color: var(--gray-shade-a);
+}
+
+.batch-table__toolbar {
+ background-color: var(--gray-shade-1);
+ border-color: var(--black);
+ color: var(--gray-shade-a);
+}
+
+.batch-table__body,
+.batch-table .nothing-here {
+ background-color: var(--gray-shade-1);
+ color: var(--gray-shade-a);
+}
+
+.batch-table__row {
+ background: var(--gray-shade-1-5);
+ border-color: var(--black);
+}
+
+.batch-table__row:hover {
+ background: var(--gray-shade-3);
+}
+
+.batch-table__row:nth-child(even) {
+ background: var(--gray-shade-1);
+}
+
+.filters .filter-subset a {
+ border-bottom-color: var(--gray-shade-4);
+ color: var(--gray-shade-a);
+}
+
+.filters .filter-subset a:hover {
+ border-bottom-color: var(--gray-shade-4);
+ color: var(--gray-shade-c);
+}
+
+.filters .filter-subset a.selected {
+ border-bottom-color: var(--cyan);
+ color: var(--cyan);
+}
+
+.dashboard__counters > div > a,
+.dashboard__counters > div > div {
+ background: var(--gray-shade-3);
+}
+
+.dashboard__counters > div > a:hover {
+ background: var(--gray-shade-5);
+}
+
+.dashboard__counters__label {
+ color: var(--gray-shade-a);
+}
+
+.account__header__bio .account__header__fields {
+ border-top: 1px solid var(--gray-shade-3);
+}
+
+.account__header__bio .account__header__joined {
+ color: var(--gray-shade-8);
+}
+
+.simple_form .hint a {
+ color: var(--cyan);
+}
+
+.simple_form .input.boolean label.checkbox {
+ accent-color: var(--cyan);
+}
+
+.announcements-list, .applications-list__item {
+ border: 1px solid var(--gray-shade-5);
+}
+
+.applications-list__item {
+ background: var(--gray-shade-1-5);
+}
+
+.permissions-list__item__text__type {
+ color: var(--cyan-light);
+}
+
+.announcements-list__item__title {
+ color: var(--gray-shade-c);
+}
+
+.permissions-list__item {
+ color: var(--gray-shade-e);
+ border-bottom: 1px solid var(--gray-shade-5);
+
+}
+
+.empty-column-indicator, .error-column, .follow_requests-unlocked_explanation {
+ color: var(--gray-shade-e);
+}
+
+.empty-column-indicator a, .error-column a, .follow_requests-unlocked_explanation a {
+ color: var(--cyan);
+}
+
+.scrollable .account-card {
+ background: var(--gray-shade-1);
+}
+
+.scrollable .account-card__bio::after {
+ background: linear-gradient(270deg,var(--gray-shade-1),transparent);
+}
+
+.account-card__bio a {
+ color: var(--gray-shade-c);
+
+}
+
+.account-card__counters__item small {
+ color: var(--gray-shade-c);
+}
+
+.keyboard-shortcuts kbd {
+ background-color: var(--black);
+ border: 1px solid var(--cyan);
+}
+
+.permissions-list__item {
+ color: var(--white);
+ border-bottom: 1px solid var(--gray-shade-5);
+}
+
+.permissions-list__item:last-child {
+ padding-bottom: 12px;
+}
+
+.permissions-list__item__text__type {
+ color: var(--cyan);
+}
+
+.oauth-prompt p {
+ color: var(--gray-shade-e);
+}
+
+.follow-prompt strong, .oauth-prompt strong {
+ color: var(--cyan);}
+
+.oauth-prompt h3 {
+ color: var(--gray-shade-e);
+}
+
+.oauth-prompt .permissions-list {
+ border: 1px solid var(--gray-shade-5);
+ background: var(--gray-shade-5);
+}
+
+.account-header .name {
+ color: var(--gray-shade-e);
+}
+
+.upload-progress__tracker {
+ background: var(--cyan);
+}
+
+.upload-progress__backdrop {
+ background: var(--gray-shade-2);
+}
+
+.simple_form .input.radio_buttons .radio {
+ accent-color: var(--cyan);
+}
+
+.follow_requests-unlocked_explanation {
+ background: var(--gray-shade-1);
+}
+
+.account__header__account-note label {
+ color: var(--gray-shade-a)
+}
+
+.account__header__account-note textarea {
+ border: 2px solid var(--gray-shade-4);
+}
+
+.account__header__account-note textarea::placeholder {
+ color: var(--gray-shade-a);
+ opacity: 1;
+}
+
+.account__header__account-note textarea:focus {
+ background: var(--gray-shade-1);
+}
+
+.account__header__bio .account__header__fields .verified a,
+.account__header__bio .account__header__fields .verified dd,
+.account__header__bio .account__header__fields .verified dt {
+ color: var(--cyan);
+}
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index cef59ced26..94ac58aa68 100755
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -19,9 +19,9 @@
- %w(57 60 72 76 114 120 144 152 167 180 1024).each do |size|
%link{ rel: 'apple-touch-icon', sizes: "#{size}x#{size}", href: asset_pack_path("media/icons/apple-touch-icon-#{size}x#{size}.png") }/
- %link{ rel: 'mask-icon', href: asset_pack_path('media/images/logo-symbol-icon.svg'), color: '#6364FF' }/
+ %link{ rel: 'mask-icon', href: asset_pack_path('media/images/merveilles-logo-symbol-icon.svg'), color: '#FFFFFF' }/
%link{ rel: 'manifest', href: manifest_path(format: :json) }/
- %meta{ name: 'theme-color', content: '#191b22' }/
+ %meta{ name: 'theme-color', content: '#000000' }/
%meta{ name: 'apple-mobile-web-app-capable', content: 'yes' }/
%title= content_for?(:page_title) ? safe_join([yield(:page_title).chomp.html_safe, title], ' - ') : title
diff --git a/app/views/shared/_web_app.html.haml b/app/views/shared/_web_app.html.haml
index 998cee9fa9..b1d1feaca3 100644
--- a/app/views/shared/_web_app.html.haml
+++ b/app/views/shared/_web_app.html.haml
@@ -11,7 +11,7 @@
.notranslate.app-holder#mastodon{ data: { props: Oj.dump(default_props) } }
%noscript
- = image_pack_tag 'logo.svg', alt: 'Mastodon'
+ = image_pack_tag 'merveilles-logo.svg', alt: 'Mastodon'
%div
= t('errors.noscript_html', apps_path: 'https://joinmastodon.org/apps')
diff --git a/config/locales/en.yml b/config/locales/en.yml
index fb9a6329d2..62fe175d99 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1623,7 +1623,8 @@ en:
does_not_match_previous_name: does not match the previous name
themes:
contrast: Mastodon (High contrast)
- default: Mastodon (Dark)
+ default: Merveilles
+ mastodon-dark: Mastodon (Dark)
mastodon-light: Mastodon (Light)
macaron: Macaron (Pastel light)
fairy-floss: Fairy Floss (Pastel dark)
diff --git a/config/themes.yml b/config/themes.yml
index 620bc7f993..50a899c554 100644
--- a/config/themes.yml
+++ b/config/themes.yml
@@ -1,4 +1,5 @@
-default: styles/application.scss
+default: styles/merveilles.scss
+mastodon-dark: styles/application.scss
contrast: styles/contrast.scss
mastodon-light: styles/mastodon-light.scss
macaron: styles/macaron.scss
diff --git a/lib/assets/wordmark.dark.png b/lib/assets/wordmark.dark.png
index 6f12538616..5587574419 100644
Binary files a/lib/assets/wordmark.dark.png and b/lib/assets/wordmark.dark.png differ
diff --git a/lib/assets/wordmark.light.png b/lib/assets/wordmark.light.png
index c669cc1f61..9597fb0890 100644
Binary files a/lib/assets/wordmark.light.png and b/lib/assets/wordmark.light.png differ
diff --git a/lib/tasks/branding.rake b/lib/tasks/branding.rake
index f3563f3f7d..9ee68e54a0 100644
--- a/lib/tasks/branding.rake
+++ b/lib/tasks/branding.rake
@@ -18,10 +18,10 @@ namespace :branding do
end
# Displayed size is 34px, at 3x it's 102px
- rsvg_convert.run(input: Rails.root.join('app', 'javascript', 'images', 'logo-symbol-wordmark.svg'), size: 102, output: output_dest.join('wordmark.png'))
+ rsvg_convert.run(input: Rails.root.join('app', 'javascript', 'images', 'merveilles-logo-symbol-wordmark.svg'), size: 102, output: output_dest.join('wordmark.png'))
# Displayed size is 24px, at 3x it's 72px
- rsvg_convert.run(input: Rails.root.join('app', 'javascript', 'images', 'logo-symbol-icon.svg'), size: 72, output: output_dest.join('logo.png'))
+ rsvg_convert.run(input: Rails.root.join('app', 'javascript', 'images', 'merveilles-logo-symbol-icon.svg'), size: 72, output: output_dest.join('logo.png'))
end
desc 'Generate light/dark logotypes for GitHub'
@@ -29,14 +29,14 @@ namespace :branding do
rsvg_convert = Terrapin::CommandLine.new('rsvg-convert', '--stylesheet :stylesheet -h :size --keep-aspect-ratio :input -o :output')
output_dest = Rails.root.join('lib', 'assets')
- rsvg_convert.run(stylesheet: Rails.root.join('lib', 'assets', 'wordmark.dark.css'), input: Rails.root.join('app', 'javascript', 'images', 'logo-symbol-wordmark.svg'), size: 102, output: output_dest.join('wordmark.dark.png'))
- rsvg_convert.run(stylesheet: Rails.root.join('lib', 'assets', 'wordmark.light.css'), input: Rails.root.join('app', 'javascript', 'images', 'logo-symbol-wordmark.svg'), size: 102, output: output_dest.join('wordmark.light.png'))
+ rsvg_convert.run(stylesheet: Rails.root.join('lib', 'assets', 'wordmark.dark.css'), input: Rails.root.join('app', 'javascript', 'images', 'merveilles-logo-symbol-wordmark.svg'), size: 102, output: output_dest.join('wordmark.dark.png'))
+ rsvg_convert.run(stylesheet: Rails.root.join('lib', 'assets', 'wordmark.light.css'), input: Rails.root.join('app', 'javascript', 'images', 'merveilles-logo-symbol-wordmark.svg'), size: 102, output: output_dest.join('wordmark.light.png'))
end
desc 'Generate favicons and app icons from SVG source files'
task generate_app_icons: :environment do
- favicon_source = Rails.root.join('app', 'javascript', 'images', 'hometown.svg')
- app_icon_source = Rails.root.join('app', 'javascript', 'images', 'hometown-icon.svg')
+ favicon_source = Rails.root.join('app', 'javascript', 'images', 'merveilles-icon.svg')
+ app_icon_source = Rails.root.join('app', 'javascript', 'images', 'merveilles-logo.svg')
output_dest = Rails.root.join('app', 'javascript', 'icons')
rsvg_convert = Terrapin::CommandLine.new('rsvg-convert', '-w :size -h :size --keep-aspect-ratio :input -o :output')
@@ -68,7 +68,7 @@ namespace :branding do
desc 'Generate badge icon from SVG source files'
task generate_app_badge: :environment do
rsvg_convert = Terrapin::CommandLine.new('rsvg-convert', '--stylesheet :stylesheet -w :size -h :size --keep-aspect-ratio :input -o :output')
- badge_source = Rails.root.join('app', 'javascript', 'images', 'logo-symbol-icon.svg')
+ badge_source = Rails.root.join('app', 'javascript', 'images', 'merveilles-logo-symbol-icon.svg')
output_dest = Rails.root.join('public')
stylesheet = Rails.root.join('lib', 'assets', 'wordmark.light.css')
diff --git a/public/android-chrome-192x192.png b/public/android-chrome-192x192.png
new file mode 100644
index 0000000000..cb17bce83d
Binary files /dev/null and b/public/android-chrome-192x192.png differ
diff --git a/public/apple-touch-icon.png b/public/apple-touch-icon.png
new file mode 100644
index 0000000000..53c434aaa3
Binary files /dev/null and b/public/apple-touch-icon.png differ
diff --git a/public/avatars/original/missing.png b/public/avatars/original/missing.png
index 29b27183b7..6e4aa34f43 100644
Binary files a/public/avatars/original/missing.png and b/public/avatars/original/missing.png differ
diff --git a/public/badge.png b/public/badge.png
index bd618c7290..609933e51a 100644
Binary files a/public/badge.png and b/public/badge.png differ
diff --git a/public/favicon.ico b/public/favicon.ico
index e77b00a543..0aa83abc7b 100644
Binary files a/public/favicon.ico and b/public/favicon.ico differ
diff --git a/public/mask-icon.svg b/public/mask-icon.svg
new file mode 100644
index 0000000000..cd4d14073c
--- /dev/null
+++ b/public/mask-icon.svg
@@ -0,0 +1,16 @@
+
+
+
diff --git a/public/mstile-150x150.png b/public/mstile-150x150.png
new file mode 100644
index 0000000000..4fb29b7bbc
Binary files /dev/null and b/public/mstile-150x150.png differ
diff --git a/public/robots.txt b/public/robots.txt
index 771bf2160b..8b76864900 100644
--- a/public/robots.txt
+++ b/public/robots.txt
@@ -1,5 +1,8 @@
# See http://www.robotstxt.org/robotstxt.html for documentation on how to use the robots.txt file
+User-agent: CCBot
+Disallow: /
+
User-agent: *
Disallow: /media_proxy/
Disallow: /interact/