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

Merge pull request #451 from Rintan/features/material-theme

Browse Source 
Materialテーマの修正
This commit is contained in:
YorimiMochida 2021-05-23 11:18:22 +09:00 committed by GitHub
commit a0ecc3e219
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 28 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/javascript/styles/mastodon-material/color/v2-light.scss
View File

@ -131,7 +131,6 @@ $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);
// Media indicator color // Media indicator color
$media-page-indicator-color: #9e9e9e; $media-page-indicator-color: #9e9e9e;
$media-page-indicator-active-color: #e6e6e6; $media-page-indicator-active-color: #e6e6e6;

4
app/javascript/styles/mastodon-material/plugins/fedibird.scss
View File

@ -9,12 +9,14 @@
i { margin: 0 } i { margin: 0 }
} }
.tabs-bar__link span { margin-left: 0 }
.tabs-bar.bottom-bar { .tabs-bar.bottom-bar {
@include shadow-4dp; @include shadow-4dp;
.tabs-bar { .tabs-bar {
&__link, &__link,
&__link.active { border-bottom: none } &__link.active { border-bottom: 4px solid transparent }
} }
&__link span { margin-left: 0 } &__link span { margin-left: 0 }

28
app/javascript/styles/mastodon-material/plugins/itabashi.scss
View File

@ -1,13 +1,26 @@
.quote-indicator { .quote-indicator,
.reply-indicator {
@include card-elevation(false); @include card-elevation(false);
margin-bottom: 16px; margin-bottom: 16px;
padding: 16px; padding: 16px;
&__header { margin-bottom: 4px } &__header { margin-bottom: 4px }
&__display-avatar { margin-right: 8px } &__display-avatar {
margin-right: 8px;
&__content { padding-top: 0 } .account__avatar {
width: 32px !important;
height: 32px !important;
background-size: 32px !important;
}
}
&__content {
padding-top: 0;
padding-left: 32px;
color: $primary-text-color;
}
} }
.quote-status { .quote-status {
@ -28,5 +41,12 @@
} }
} }
.display-name { padding-left: 40px } .detailed-status__display-name {
span,
strong { @include separate-address-line }
}
.display-name { padding-left: 40px }
&>.unlisted-quote>button { color: $ui-text-color }
} }

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

@ -16,4 +16,6 @@
border: none; border: none;
padding: 4px; padding: 4px;
border-radius: 50%; border-radius: 50%;
width: 16px;
height: 16px;
} }