diff --git a/app/javascript/styles/mastodon-material/plugins/plus.scss b/app/javascript/styles/mastodon-material/plugins/plus.scss new file mode 100644 index 000000000..7d5486561 --- /dev/null +++ b/app/javascript/styles/mastodon-material/plugins/plus.scss @@ -0,0 +1,71 @@ +$name: Plus; +$target-version: "1.0.0"; +$website: ""; +@include version-check($name, $target-version, $website); + +.status__action-bar-button { + background: #eeeeee; + width: 28px !important; + height: 28px !important; + + .fa { vertical-align: bottom } +} + +// exception +.media-modal__overlay .picture-in-picture__footer .icon-button, +.status__action-bar-button.icon-button--with-counter { background: transparent } + +// favorite icon +.star-icon.active, +.star-icon.icon-button.active.activate, +.notification__favourite-icon-wrapper .star-icon { background: #db4437 } + +.notification__favourite-icon-wrapper { + left: -34px; + + .star-icon { + border-radius: 50%; + width: 28px; + height: 28px; + vertical-align: baseline; + font-size: 18px; + + &.fa-fw::before { vertical-align: middle } + } +} + +// Fedibird bottom bar in mobile +.tabs-bar.bottom-bar { + background: #212121; + + .tabs-bar__link { + color: transparentize(#ffffff, 0.5); + + &.active { color: #ffffff } + } +} + +// Quote +.quote-status { + border-radius: 0; + border: none; + border-top: 1px solid $border-color; + padding: 16px 16px 16px 48px; + margin-top: 16px; + + .detailed-status__display-avatar, + .status__avatar { + left: 0 !important; + top: 16px !important; + } +} + +@if $dense { + .quote-status { + padding: 0; + margin-top: 16px; + + .detailed-status__display-avatar, + .status__avatar { top: 8px !important } + } +} \ No newline at end of file diff --git a/app/javascript/styles/mastodon-material/theme/_mixins.scss b/app/javascript/styles/mastodon-material/theme/_mixins.scss index e6bc6dba3..412c4c762 100644 --- a/app/javascript/styles/mastodon-material/theme/_mixins.scss +++ b/app/javascript/styles/mastodon-material/theme/_mixins.scss @@ -277,9 +277,9 @@ $shadow-color-3: rgba(0,0,0,.12); } } -// plugin version checker -@mixin plugin-version-check($plugin-name, $target-version, $website) { +// version checker +@mixin version-check($name, $target-version, $website) { @if $target-version != $version { - @debug "[Info] #{$plugin-name} is made for Mastodon Material #{$target-version}. Some css elements might be broken! Check plugin website: #{$website}"; + @debug "[Info] #{$name} is made for Mastodon Material #{$target-version}. Some css elements might be broken! Check plugin website: #{$website}"; } } \ No newline at end of file diff --git a/app/javascript/styles/mastodon-material/theme/about.scss b/app/javascript/styles/mastodon-material/theme/about.scss index 5010eb1ab..69ee6e664 100644 --- a/app/javascript/styles/mastodon-material/theme/about.scss +++ b/app/javascript/styles/mastodon-material/theme/about.scss @@ -53,4 +53,6 @@ background: $card-bg-color; border: 1px solid $border-color; border-radius: $card-radius; + + &__text { color: $primary-text-color } } \ No newline at end of file diff --git a/app/javascript/styles/mastodon-material/theme/statuses.scss b/app/javascript/styles/mastodon-material/theme/statuses.scss index 6208f8e00..18054c4f4 100644 --- a/app/javascript/styles/mastodon-material/theme/statuses.scss +++ b/app/javascript/styles/mastodon-material/theme/statuses.scss @@ -283,4 +283,4 @@ a.status-card { } } -.entry.h-cite.p-comment.entry-successor { border-top: 1px solid $border-color } \ No newline at end of file +.entry.h-cite.p-comment.entry-successor:first-child { border-top: 1px solid $border-color } \ No newline at end of file diff --git a/app/javascript/styles/mastodon-material/theme/widgets.scss b/app/javascript/styles/mastodon-material/theme/widgets.scss index 050e9b127..4dc9a78f3 100644 --- a/app/javascript/styles/mastodon-material/theme/widgets.scss +++ b/app/javascript/styles/mastodon-material/theme/widgets.scss @@ -66,13 +66,17 @@ .contact-widget { color: $ui-text-color; + padding: 8px; - h4 { color: $ui-text-color } + h4 { + color: $ui-text-color; + padding: 0 0 8px; + } - .account { padding: 4px 0 8px } + .account { padding: 8px 0 } &>a { - padding: 0 8px 4px; + padding: 8px 0; color: $primary-text-color; } } diff --git a/app/javascript/styles/y-zu-auto.scss b/app/javascript/styles/y-zu-auto.scss new file mode 100644 index 000000000..c9bd70433 --- /dev/null +++ b/app/javascript/styles/y-zu-auto.scss @@ -0,0 +1,2 @@ +@use 'y-zu-dark'; +@media (prefers-color-scheme: light) { @import 'y-zu-light'; } \ No newline at end of file diff --git a/config/locales/en.yml b/config/locales/en.yml index c7a749a71..1b5f9e174 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1387,6 +1387,7 @@ en: plus: Plus y-zu-dark: Y-zu (Dark) y-zu-light: Y-zu (Light) + y-zu-auto: Y-zu (Auto) time: formats: default: "%b %d, %Y, %H:%M" diff --git a/config/locales/ja.yml b/config/locales/ja.yml index c4c981387..1dc72d23a 100644 --- a/config/locales/ja.yml +++ b/config/locales/ja.yml @@ -1365,6 +1365,7 @@ ja: plus: Plus y-zu-dark: Y-zu (ダーク) y-zu-light: Y-zu (ライト) + y-zu-auto: Y-zu (自動) time: formats: default: "%Y年%m月%d日 %H:%M" diff --git a/config/themes.yml b/config/themes.yml index df530bd65..cea5258c2 100644 --- a/config/themes.yml +++ b/config/themes.yml @@ -14,3 +14,4 @@ mastodon-material-auto: styles/mastodon-material-auto.scss plus: styles/plus.scss y-zu-dark: styles/y-zu-dark.scss y-zu-light: styles/y-zu-light.scss +y-zu-auto: styles/y-zu-auto.scss