tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix Modern theme when split into separtate flavour

Browse Source
This commit is contained in:
root
2023-08-14 10:43:30 -04:00
parent 03d55b7804
commit 211a7143a7
3 changed files with 70 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

109
app/javascript/flavours/glitch/styles/modern/diff.css
View File

@@ -1,26 +1,26 @@
body.app-body.flavour-glitch body.app-body.flavour-modern-glitch
> #mastodon > #mastodon
.compose-form__autosuggest-wrapper .compose-form__autosuggest-wrapper
> :last-child { > :last-child {
padding-bottom: 2em !important; padding-bottom: 2em !important;
} }
body.app-body.flavour-glitch > #mastodon .compose-form__buttons { body.app-body.flavour-modern-glitch > #mastodon .compose-form__buttons {
width: 100%; width: 100%;
} }
body.app-body.flavour-glitch body.app-body.flavour-modern-glitch
> #mastodon > #mastodon
.compose-form__buttons .compose-form__buttons
> div:last-child { > div:last-child {
margin-inline-start: auto; margin-inline-start: auto;
} }
body.app-body.flavour-glitch > #mastodon .compose-form__buttons-wrapper { body.app-body.flavour-modern-glitch > #mastodon .compose-form__buttons-wrapper {
position: relative; position: relative;
} }
body.app-body.flavour-glitch > #mastodon .character-counter__wrapper { body.app-body.flavour-modern-glitch > #mastodon .character-counter__wrapper {
position: absolute; position: absolute;
inset-inline-end: 0; inset-inline-end: 0;
bottom: 100%; bottom: 100%;
@@ -29,17 +29,20 @@ body.app-body.flavour-glitch > #mastodon .character-counter__wrapper {
padding: 0.1em 0.5em; padding: 0.1em 0.5em;
} }
body.app-body.flavour-glitch > #mastodon .character-counter__wrapper span { body.app-body.flavour-modern-glitch
> #mastodon
.character-counter__wrapper
span {
font-size: 0.9em; font-size: 0.9em;
font-weight: 500; font-weight: 500;
} }
body.app-body.flavour-glitch > #mastodon .collapsed .status__content { body.app-body.flavour-modern-glitch > #mastodon .collapsed .status__content {
height: auto !important; height: auto !important;
overflow: visible; overflow: visible;
} }
body.app-body.flavour-glitch body.app-body.flavour-modern-glitch
> #mastodon > #mastodon
.collapsed .collapsed
.status__content .status__content
@@ -49,7 +52,7 @@ body.app-body.flavour-glitch
max-height: 100px; max-height: 100px;
} }
body.app-body.flavour-glitch body.app-body.flavour-modern-glitch
> #mastodon > #mastodon
.collapsed .collapsed
.status__content .status__content
@@ -57,15 +60,18 @@ body.app-body.flavour-glitch
margin-bottom: 0.4em; margin-bottom: 0.4em;
} }
body.app-body.flavour-glitch > #mastodon .collapsed .status__content br { body.app-body.flavour-modern-glitch > #mastodon .collapsed .status__content br {
display: block; display: block;
} }
body.app-body.flavour-glitch > #mastodon .collapsed .status__content::after { body.app-body.flavour-modern-glitch
> #mastodon
.collapsed
.status__content::after {
content: unset; content: unset;
} }
body.app-body.flavour-glitch body.app-body.flavour-modern-glitch
> #mastodon > #mastodon
.collapsed.muted .collapsed.muted
.status__content__text .status__content__text
@@ -73,12 +79,12 @@ body.app-body.flavour-glitch
display: none; display: none;
} }
body.app-body.flavour-glitch > #mastodon .status > .status__content { body.app-body.flavour-modern-glitch > #mastodon .status > .status__content {
margin-block: -90px -100px !important; margin-block: -90px -100px !important;
padding-block: 100px !important; padding-block: 100px !important;
} }
body.app-body.flavour-glitch body.app-body.flavour-modern-glitch
> #mastodon > #mastodon
.status .status
> .status__content > .status__content
@@ -86,7 +92,7 @@ body.app-body.flavour-glitch
margin-top: 0; margin-top: 0;
} }
body.app-body.flavour-glitch body.app-body.flavour-modern-glitch
> #mastodon > #mastodon
.status .status
> .status__content > .status__content
@@ -94,59 +100,62 @@ body.app-body.flavour-glitch
margin-bottom: 5px !important; margin-bottom: 5px !important;
} }
body.app-body.flavour-glitch > #mastodon .status .full-width { body.app-body.flavour-modern-glitch > #mastodon .status .full-width {
margin-inline: 0 !important; margin-inline: 0 !important;
} }
body.app-body.flavour-glitch > #mastodon .status .status__action-bar { body.app-body.flavour-modern-glitch > #mastodon .status .status__action-bar {
position: static; position: static;
} }
body.app-body.flavour-glitch > #mastodon .status__info .notification__message { body.app-body.flavour-modern-glitch
> #mastodon
.status__info
.notification__message {
padding-top: 0 !important; padding-top: 0 !important;
padding-inline-start: 0 !important; padding-inline-start: 0 !important;
} }
body.app-body.flavour-glitch > #mastodon .status__display-name { body.app-body.flavour-modern-glitch > #mastodon .status__display-name {
line-height: 22px; line-height: 22px;
} }
body.app-body.flavour-glitch > #mastodon .display-name__account { body.app-body.flavour-modern-glitch > #mastodon .display-name__account {
font-size: 15px; font-size: 15px;
} }
body.app-body.flavour-glitch body.app-body.flavour-modern-glitch
> #mastodon > #mastodon
.media-gallery__item .media-gallery__item
> .media-gallery__preview { > .media-gallery__preview {
display: unset; display: unset;
} }
body.app-body.flavour-glitch > #mastodon .status__action-bar-spacer { body.app-body.flavour-modern-glitch > #mastodon .status__action-bar-spacer {
min-width: 5px; min-width: 5px;
} }
body.app-body.flavour-glitch > #mastodon .status__relative-time { body.app-body.flavour-modern-glitch > #mastodon .status__relative-time {
margin-inline: 5px !important; margin-inline: 5px !important;
z-index: 2; z-index: 2;
flex-grow: 0 !important; flex-grow: 0 !important;
} }
body.app-body.flavour-glitch > #mastodon .reactions-bar { body.app-body.flavour-modern-glitch > #mastodon .reactions-bar {
width: unset; width: unset;
margin-top: 8px; margin-top: 8px;
} }
body.app-body.flavour-glitch > #mastodon .reactions-bar button { body.app-body.flavour-modern-glitch > #mastodon .reactions-bar button {
border-radius: 6px !important; border-radius: 6px !important;
padding-block: 2px; padding-block: 2px;
} }
@media (pointer: coarse) { @media (pointer: coarse) {
body.app-body.flavour-glitch > #mastodon .reactions-bar button { body.app-body.flavour-modern-glitch > #mastodon .reactions-bar button {
padding: 4px 8px !important; padding: 4px 8px !important;
} }
body.app-body.flavour-glitch body.app-body.flavour-modern-glitch
> #mastodon > #mastodon
.reactions-bar .reactions-bar
button button
@@ -156,11 +165,11 @@ body.app-body.flavour-glitch > #mastodon .reactions-bar button {
} }
} }
body.app-body.flavour-glitch > #mastodon .reactions-bar:empty { body.app-body.flavour-modern-glitch > #mastodon .reactions-bar:empty {
display: none; display: none;
} }
body.app-body.flavour-glitch body.app-body.flavour-modern-glitch
> #mastodon > #mastodon
.collapsed .collapsed
> .status__info > .status__info
@@ -168,7 +177,7 @@ body.app-body.flavour-glitch
padding-bottom: 0 !important; padding-bottom: 0 !important;
} }
body.app-body.flavour-glitch body.app-body.flavour-modern-glitch
> #mastodon > #mastodon
.notification .notification
> .notification__message { > .notification__message {
@@ -176,16 +185,18 @@ body.app-body.flavour-glitch
padding-top: 18px !important; padding-top: 18px !important;
} }
body.app-body.flavour-glitch > #mastodon .notification .account { body.app-body.flavour-modern-glitch > #mastodon .notification .account {
padding-inline-start: 0 !important; padding-inline-start: 0 !important;
} }
body.app-body.flavour-glitch > #mastodon .notification__favourite-icon-wrapper { body.app-body.flavour-modern-glitch
> #mastodon
.notification__favourite-icon-wrapper {
position: static; position: static;
margin-inline-end: 10px; margin-inline-end: 10px;
} }
body.app-body.flavour-glitch body.app-body.flavour-modern-glitch
> #mastodon > #mastodon
.notification__favourite-icon-wrapper .notification__favourite-icon-wrapper
i { i {
@@ -193,18 +204,21 @@ body.app-body.flavour-glitch
text-align: center; text-align: center;
} }
body.app-body.flavour-glitch > #mastodon .status__prepend, body.app-body.flavour-modern-glitch > #mastodon .status__prepend,
body.app-body.flavour-glitch > #mastodon .status__info .notification__message { body.app-body.flavour-modern-glitch
> #mastodon
.status__info
.notification__message {
padding-bottom: 15px !important; padding-bottom: 15px !important;
padding-top: 0 !important; padding-top: 0 !important;
margin-top: -5px !important; margin-top: -5px !important;
} }
body.app-body.flavour-glitch body.app-body.flavour-modern-glitch
> #mastodon > #mastodon
.status__prepend .status__prepend
.status__prepend-icon-wrapper, .status__prepend-icon-wrapper,
body.app-body.flavour-glitch body.app-body.flavour-modern-glitch
> #mastodon > #mastodon
.status__info .status__info
.notification__message .notification__message
@@ -214,12 +228,12 @@ body.app-body.flavour-glitch
display: flex; display: flex;
} }
body.app-body.flavour-glitch body.app-body.flavour-modern-glitch
> #mastodon > #mastodon
.status__prepend .status__prepend
.status__prepend-icon-wrapper .status__prepend-icon-wrapper
i, i,
body.app-body.flavour-glitch body.app-body.flavour-modern-glitch
> #mastodon > #mastodon
.status__info .status__info
.notification__message .notification__message
@@ -228,34 +242,37 @@ body.app-body.flavour-glitch
margin: auto; margin: auto;
} }
body.app-body.flavour-glitch body.app-body.flavour-modern-glitch
> #mastodon > #mastodon
.detailed-status__wrapper .detailed-status__wrapper
.focusable:not(.status)::before { .focusable:not(.status)::before {
content: unset !important; content: unset !important;
} }
body.app-body.flavour-glitch > #mastodon .setting-text { body.app-body.flavour-modern-glitch > #mastodon .setting-text {
border-radius: 0 !important; border-radius: 0 !important;
margin: 4px; margin: 4px;
width: calc(100% - 8px); width: calc(100% - 8px);
} }
body.app-body.flavour-glitch > #mastodon .column-settings__pillbar { body.app-body.flavour-modern-glitch > #mastodon .column-settings__pillbar {
border-radius: var(--radius); border-radius: var(--radius);
} }
body.app-body.flavour-glitch > #mastodon .pillbar-button { body.app-body.flavour-modern-glitch > #mastodon .pillbar-button {
border-radius: 0 !important; border-radius: 0 !important;
padding: 6px; padding: 6px;
} }
body.app-body.flavour-glitch > #mastodon .account-card .media-modal__close { body.app-body.flavour-modern-glitch
> #mastodon
.account-card
.media-modal__close {
left: 10px; left: 10px;
top: 10px; top: 10px;
} }
body.app-body.flavour-glitch body.app-body.flavour-modern-glitch
> #mastodon > #mastodon
.account-card .account-card
.media-modal__close::before { .media-modal__close::before {
@@ -268,7 +285,7 @@ body.app-body.flavour-glitch
opacity: 0.5; opacity: 0.5;
} }
.layout-multiple-columns.flavour-glitch .drawer__inner { .layout-multiple-columns.flavour-modern-glitch .drawer__inner {
margin-top: -10px; margin-top: -10px;
padding-top: 30px !important; padding-top: 30px !important;
} }

2
app/javascript/flavours/glitch/styles/modern/modern.css
View File

@@ -844,7 +844,7 @@ a:focus-visible,
flex-direction: column; flex-direction: column;
background: inherit; background: inherit;
} }
body:not(.flavour-glitch) body:not(.flavour-modern-glitch)
#mastodon #mastodon
.account-timeline__header .account-timeline__header
.account__header__bar { .account__header__bar {

10
yarn.lock
View File

@@ -11776,17 +11776,19 @@ sass-loader@^10.2.0:
schema-utils "^3.0.0" schema-utils "^3.0.0"
semver "^7.3.2" semver "^7.3.2"
<<<<<<< HEAD sass@^1.38.0:
sass@^1.38.0, sass@^1.62.1:
version "1.63.6" version "1.63.6"
resolved "https://registry.yarnpkg.com/sass/-/sass-1.63.6.tgz#481610e612902e0c31c46b46cf2dad66943283ea" resolved "https://registry.yarnpkg.com/sass/-/sass-1.63.6.tgz#481610e612902e0c31c46b46cf2dad66943283ea"
integrity sha512-MJuxGMHzaOW7ipp+1KdELtqKbfAWbH7OLIdoSMnVe3EXPMTmxTmlaZDCTsgIpPCs3w99lLo9/zDKkOrJuT5byw== integrity sha512-MJuxGMHzaOW7ipp+1KdELtqKbfAWbH7OLIdoSMnVe3EXPMTmxTmlaZDCTsgIpPCs3w99lLo9/zDKkOrJuT5byw==
======= dependencies:
chokidar ">=3.0.0 <4.0.0"
immutable "^4.0.0"
source-map-js ">=0.6.2 <2.0.0"
sass@^1.62.1: sass@^1.62.1:
version "1.64.1" version "1.64.1"
resolved "https://registry.yarnpkg.com/sass/-/sass-1.64.1.tgz#6a46f6d68e0fa5ad90aa59ce025673ddaa8441cf" resolved "https://registry.yarnpkg.com/sass/-/sass-1.64.1.tgz#6a46f6d68e0fa5ad90aa59ce025673ddaa8441cf"
integrity sha512-16rRACSOFEE8VN7SCgBu1MpYCyN7urj9At898tyzdXFhC+a+yOX5dXwAR7L8/IdPJ1NB8OYoXmD55DM30B2kEQ== integrity sha512-16rRACSOFEE8VN7SCgBu1MpYCyN7urj9At898tyzdXFhC+a+yOX5dXwAR7L8/IdPJ1NB8OYoXmD55DM30B2kEQ==
>>>>>>> upstream/main
dependencies: dependencies:
chokidar ">=3.0.0 <4.0.0" chokidar ">=3.0.0 <4.0.0"
immutable "^4.0.0" immutable "^4.0.0"