mstdn.y-zu.org/mastodon
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #462 from Rintan/features/3.4.3

Browse Source 
update to the latest version of mastodon material
This commit is contained in:
YorimiMochida 2021-11-20 23:34:36 +09:00 committed by GitHub
commit 564701797b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
13 changed files with 42 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/javascript/styles/mastodon-material/color/plus-classic.scss
View File

@ -1,8 +1,3 @@
$name: "Plus Classic";
$target-version: "1.0.0";
$website: "";
@include version-check($name, $target-version, $website);
$color-scheme: light; $color-scheme: light;
// Base color // Base color

2
app/javascript/styles/mastodon-material/color/v1-dark.scss
View File

@ -126,7 +126,7 @@ $search-bar-focus-color: #ffffff;
// Tab color // Tab color
$tab-item-color: transparentize(#ffffff, 0.5); $tab-item-color: transparentize(#ffffff, 0.5);
$tab-item-active-color: $primary-color; $tab-item-active-color: #ffffff;
$tab-bg-color: $top-bar-color; $tab-bg-color: $top-bar-color;
$tab-bg-hover-color: transparentize($tab-item-active-color, 0.9); $tab-bg-hover-color: transparentize($tab-item-active-color, 0.9);
$tab-bg-focus-color: transparentize($tab-item-active-color, 0.8); $tab-bg-focus-color: transparentize($tab-item-active-color, 0.8);

8
app/javascript/styles/mastodon-material/plugins/cards.scss
View File

@ -16,6 +16,8 @@
border-radius: 0; border-radius: 0;
} }
} }
.columns-area__panels__main { box-shadow: none }
} }
.status { .status {
@ -36,6 +38,8 @@
background: $card-bg-color; background: $card-bg-color;
} }
.notification .status__wrapper.status__wrapper { box-shadow: none !important } .notification {
.status__wrapper.status__wrapper { box-shadow: none !important }
.notification__filter-bar { @include non-overflow-shadow-4dp } &__filter-bar { @include non-overflow-shadow-4dp }
}

10
app/javascript/styles/mastodon-material/plugins/plus.scss
View File

@ -1,7 +1,8 @@
$name: Plus; $name: "Plus";
$plugin-version: "1.0.0";
$target-version: "1.0.0"; $target-version: "1.0.0";
$website: ""; $website: "";
@include version-check($name, $target-version, $website); @include version-check($name, $plugin-version, $target-version, $website);
.status__action-bar-button { .status__action-bar-button {
background: #eeeeee; background: #eeeeee;
@ -34,11 +35,6 @@ $website: "";
} }
} }
// single column mode
@media screen and (min-width: 415px) {
.columns-area__panels__main { box-shadow: none }
}
// Fedibird bottom bar in mobile // Fedibird bottom bar in mobile
.tabs-bar.bottom-bar { .tabs-bar.bottom-bar {
background: #212121; background: #212121;

6
app/javascript/styles/mastodon-material/plugins/quote.scss
View File

@ -1,3 +1,9 @@
$name: "Quote";
$plugin-version: "1.0.0";
$target-version: "1.0.0";
$website: "";
@include version-check($name, $plugin-version, $target-version, $website);
.quote-indicator, .quote-indicator,
.reply-indicator { .reply-indicator {
@include card-elevation(false); @include card-elevation(false);

5
app/javascript/styles/mastodon-material/theme/_mixins.scss
View File

@ -277,9 +277,8 @@ $shadow-color-3: rgba(0,0,0,.12);
} }
} }
// version checker @mixin version-check($name, $plugin-version, $target-version, $website) {
@mixin version-check($name, $target-version, $website) {
@if $target-version != $version { @if $target-version != $version {
@debug "[Info] #{$name} is made for Mastodon Material #{$target-version}. Some css elements might be broken! Please check plugin website: #{$website}"; @debug "[Info] #{$name} #{$plugin-version} is made for Mastodon Material #{$target-version}. Some css elements might be broken! Please check the following website: #{$website}";
} }
} }

2
app/javascript/styles/mastodon-material/theme/account.scss
View File

@ -24,7 +24,7 @@
&__header { &__header {
&__bar { &__bar {
background: $tab-bg-color; background: $card-bg-color;
padding: 8px; padding: 8px;
border-bottom: none; border-bottom: none;

6
app/javascript/styles/mastodon-material/theme/columns.scss
View File

@ -277,11 +277,11 @@
.muted { .muted {
.status { .status {
&__content { &__content {
color: $read-primary-text-color !important; color: $read-primary-text-color;
p { color: $read-primary-text-color !important } p { color: $read-primary-text-color }
a { color: $read-secondary-text-color !important } a { color: $read-secondary-text-color }
} }
&__display-name strong { color: $read-primary-text-color } &__display-name strong { color: $read-primary-text-color }

2
app/javascript/styles/mastodon-material/theme/components.scss
View File

@ -396,6 +396,8 @@
border-radius: 2px; border-radius: 2px;
padding: 8px 16px; padding: 8px 16px;
} }
&__text { padding: 8px 0 }
} }
&__chart { &__chart {

28
app/javascript/styles/mastodon-material/theme/emoji-picker.scss
View File

@ -4,20 +4,6 @@
background: $menu-bg-color; background: $menu-bg-color;
border-radius: $menu-radius; border-radius: $menu-radius;
margin-top: 0; margin-top: 0;
// bubble
// unable to fit the position
/*&::before {
@include shadow-8dp;
content: "";
position: absolute;
background: $menu-bg-color;
top: -6px;
width: 12px;
height: 12px;
transform: rotate(45deg);
z-index: -1;
}*/
} }
&__modifiers__menu { &__modifiers__menu {
@ -32,14 +18,16 @@
} }
.emoji-mart { .emoji-mart {
width: 388px !important;
font-size: 14px; font-size: 14px;
color: $menu-text-color; color: $menu-text-color;
&-bar { &-bar {
border: 0 solid $border-color; border: 0 solid $border-color;
&:first-child { background: $tab-bg-color } &:first-child {
background: $tab-bg-color;
border-radius: $card-radius $card-radius 0 0;
}
} }
&-anchor { &-anchor {
@ -55,7 +43,7 @@
&:hover { color: $tab-item-active-color } &:hover { color: $tab-item-active-color }
} }
&:hover { color: $tab-item-color } &:hover { color: $tab-item-active-color }
} }
&-search { &-search {
@ -65,6 +53,10 @@
right: auto; right: auto;
left: 16px; left: 16px;
padding: 2px 6px; padding: 2px 6px;
svg { fill: $icon-color }
&:disabled { opacity: 1 }
} }
input { input {
@ -80,6 +72,8 @@
background: $search-bar-focus-color; background: $search-bar-focus-color;
color: $search-bar-text-color; color: $search-bar-text-color;
} }
&::placeholder { color: $tips-text-color }
} }
} }

5
app/javascript/styles/mastodon-material/theme/forms.scss
View File

@ -95,7 +95,10 @@
padding-right: 40px; padding-right: 40px;
height: 40px; height: 40px;
option { background-color: $menu-bg-color } option {
color: $menu-text-color;
background-color: $menu-bg-color;
}
&:hover { background-color: $dropdown-field-bg-hover-color } &:hover { background-color: $dropdown-field-bg-hover-color }

2
app/javascript/styles/mastodon-material/theme/responsive.scss
View File

@ -103,7 +103,7 @@
} }
} }
//single column mode // single column mode
@media screen and (min-width: 630px) { @media screen and (min-width: 630px) {
.tabs-bar__link { .tabs-bar__link {
&:hover { &:hover {

2
app/javascript/styles/mastodon-material/theme/statuses.scss
View File

@ -140,6 +140,8 @@
&>.fa { &>.fa {
font-size: 26px; font-size: 26px;
} }
&-image { border-radius: $card-radius 0 0 $card-radius }
} }
&__title { &__title {