gitea/nas
1
0
Fork 2
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Merge commit 'eaa1f9e450' into kb_migration

Browse source
This commit is contained in:
KMY 2023-07-07 07:20:37 +09:00
commit 2a813d517d
73 changed files with 987 additions and 72 deletions
Download patch file Download diff file Expand all files Collapse all files

3
app/javascript/styles/contrast/variables.scss
View file

@ -6,6 +6,9 @@ $classic-primary-color: #9baec8;
$classic-secondary-color: #d9e1e8;
$classic-highlight-color: #6364ff;
$emoji-reaction-color: #42485a !default;
$emoji-reaction-selected-color: #617ed5 !default;
$ui-base-color: $classic-base-color !default;
$ui-primary-color: $classic-primary-color !default;
$ui-secondary-color: $classic-secondary-color !default;

3
app/javascript/styles/mastodon-light/variables.scss
View file

@ -13,6 +13,9 @@ $blurple-300: #858afa; // Faded Blue
$grey-600: #4e4c5a; // Trout
$grey-100: #dadaf3; // Topaz
$emoji-reaction-color: #dfe5f5 !default;
$emoji-reaction-selected-color: #9ac1f2 !default;
// Differences
$success-green: lighten(#3c754d, 8%);

6
app/javascript/styles/mastodon/components.scss
View file

@ -1326,7 +1326,7 @@ body > [data-popper-placement] {
margin: 12px 0 2px 4px;
.emoji-reactions-bar__button {
background: lighten($ui-base-color, 12%);
background: $emoji-reaction-color;
border: 0;
cursor: pointer;
display: flex;
@ -1335,7 +1335,7 @@ body > [data-popper-placement] {
height: 24px;
&.toggled {
background: darken($ui-primary-color, 16%);
background: $emoji-reaction-selected-color;
}
> .emoji {
@ -2128,7 +2128,7 @@ a.account__display-name {
font: inherit;
display: block;
width: 100%;
padding: 10px 14px;
padding: 8px 10px;
border: 0;
margin: 0;
background: transparent;

4
app/javascript/styles/mastodon/variables.scss
View file

@ -23,6 +23,10 @@ $classic-primary-color: #9baec8; // Echo Blue
$classic-secondary-color: #d9e1e8; // Pattens Blue
$classic-highlight-color: #6364ff; // Brand purple
// Values for kmyblue original functions
$emoji-reaction-color: #42485a !default;
$emoji-reaction-selected-color: #617ed5 !default;
// Variables for defaults in UI
$base-shadow-color: $black !default;
$base-overlay-background: $black !default;