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

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

Browse Source 
ビルドエラーの修正
This commit is contained in:
YorimiMochida 2021-08-08 19:03:16 +09:00 committed by GitHub
commit 3696cfc1b7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 22 additions and 17 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

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/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 {

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

@ -32,7 +32,6 @@
} }
.emoji-mart { .emoji-mart {
width: 388px !important;
font-size: 14px; font-size: 14px;
color: $menu-text-color; color: $menu-text-color;
@ -55,7 +54,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 +64,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 +83,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 }
} }
} }

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 {