Merge branch 'final-fixes-frfr' into 'develop'
Final fixes frfr See merge request pleroma/pleroma-fe!2245
This commit is contained in:
commit
683b2d7fea
4 changed files with 8 additions and 3 deletions
0
changelog.d/finalfix-fr.skip
Normal file
0
changelog.d/finalfix-fr.skip
Normal file
|
|
@ -129,6 +129,13 @@ export default {
|
||||||
shadow: ['--buttonDefaultHoverGlow', '--buttonPressedBevel']
|
shadow: ['--buttonDefaultHoverGlow', '--buttonPressedBevel']
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
state: ['toggled', 'hover', 'focused'],
|
||||||
|
directives: {
|
||||||
|
background: '--accent,-24.2',
|
||||||
|
shadow: ['--buttonDefaultHoverGlow', '--buttonPressedBevel']
|
||||||
|
}
|
||||||
|
},
|
||||||
{
|
{
|
||||||
state: ['toggled', 'disabled'],
|
state: ['toggled', 'disabled'],
|
||||||
directives: {
|
directives: {
|
||||||
|
|
|
||||||
|
|
@ -32,6 +32,7 @@
|
||||||
margin: 0;
|
margin: 0;
|
||||||
|
|
||||||
.user-info {
|
.user-info {
|
||||||
|
width: 100%;
|
||||||
margin: 1.2em;
|
margin: 1.2em;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -42,7 +42,6 @@ export const createStyleSheet = (id, priority = 1000) => {
|
||||||
|
|
||||||
|
|
||||||
export const adoptStyleSheets = throttle(() => {
|
export const adoptStyleSheets = throttle(() => {
|
||||||
console.log('adopt')
|
|
||||||
if (supportsAdoptedStyleSheets) {
|
if (supportsAdoptedStyleSheets) {
|
||||||
document.adoptedStyleSheets = Object
|
document.adoptedStyleSheets = Object
|
||||||
.values(stylesheets)
|
.values(stylesheets)
|
||||||
|
|
@ -138,8 +137,6 @@ export const tryLoadCache = async () => {
|
||||||
eagerStyles.ready = true
|
eagerStyles.ready = true
|
||||||
lazyStyles.ready = true
|
lazyStyles.ready = true
|
||||||
|
|
||||||
adoptStyleSheets()
|
|
||||||
|
|
||||||
console.info(`Loaded theme from cache`)
|
console.info(`Loaded theme from cache`)
|
||||||
return true
|
return true
|
||||||
} else {
|
} else {
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue