mirrors/nyastodon
1
0
Fork 0
mirror of https://git.bsd.gay/fef/nyastodon.git synced 2025-01-08 11:37:02 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

merge catcatnya/main into main

Browse source
This commit is contained in:
fef 2022-11-28 22:47:46 +00:00
commit 0157438894
No known key found for this signature in database
GPG key ID: EC22E476DC2D3D84
4 changed files with 28 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.ruby-version
View file

@ -1 +1 @@
3.0.4 3.0.5

35
app/javascript/flavours/glitch/styles/components/columns.scss
View file

@ -558,6 +558,7 @@ $ui-header-height: 55px;
border-radius: 4px; border-radius: 4px;
margin-bottom: 10px; margin-bottom: 10px;
align-items: stretch; align-items: stretch;
gap: 2px;
} }
.pillbar-button { .pillbar-button {
@ -565,7 +566,6 @@ $ui-header-height: 55px;
color: #fafafa; color: #fafafa;
padding: 2px; padding: 2px;
margin: 0; margin: 0;
margin-left: 2px;
font-size: inherit; font-size: inherit;
flex: auto; flex: auto;
background-color: $ui-base-color; background-color: $ui-base-color;
@ -578,43 +578,20 @@ $ui-header-height: 55px;
} }
&:not([disabled]) { &:not([disabled]) {
&:hover { &:hover,
&:focus {
background-color: darken($ui-base-color, 10%); background-color: darken($ui-base-color, 10%);
} }
&:focus {
background-color: darken($ui-base-color, 15%);
}
&:active {
background-color: darken($ui-base-color, 20%);
}
&.active { &.active {
background-color: $ui-highlight-color; background-color: darken($ui-highlight-color, 2%);
box-shadow: inset 0 5px darken($ui-highlight-color, 20%);
&:hover {
background-color: lighten($ui-highlight-color, 10%);
box-shadow: inset 0 5px darken($ui-highlight-color, 10%);
}
&:hover,
&:focus { &:focus {
background-color: lighten($ui-highlight-color, 15%); background-color: $ui-highlight-color;
box-shadow: inset 0 5px darken($ui-highlight-color, 5%);
}
&:active {
background-color: lighten($ui-highlight-color, 20%);
box-shadow: inset 0 5px $ui-highlight-color;
} }
} }
} }
/* TODO: check RTL? */
&:first-child {
margin-left: 0;
}
} }
.limited-account-hint { .limited-account-hint {

20
app/javascript/flavours/glitch/styles/mastodon-light/diff.scss
View file

@ -712,6 +712,26 @@ html {
// Glitch-soc-specific changes // Glitch-soc-specific changes
.pillbar-button {
background: $ui-secondary-color;
&:not([disabled]) {
&:hover,
&:focus {
background: darken($ui-secondary-color, 10%);
}
&.active {
background-color: darken($ui-highlight-color, 2%);
&:hover,
&:focus {
background: lighten($ui-highlight-color, 10%);
}
}
}
}
.glitch.local-settings { .glitch.local-settings {
background: $ui-base-color; background: $ui-base-color;
border: 1px solid lighten($ui-base-color, 8%); border: 1px solid lighten($ui-base-color, 8%);

2
lib/mastodon/version.rb
View file

@ -25,7 +25,7 @@ module Mastodon
end end
def suffix_version def suffix_version
'+1.0.3' '+1.0.5'
end end
def post_suffix def post_suffix