Compare commits

..

8 commits

Author SHA1 Message Date
Henry Jameson
e8338a2f65 Merge branch 'mobile-modals' into shigusegubu-themes3 2024-12-29 18:56:14 +02:00
Henry Jameson
d5d7582741 changelog 2024-12-29 18:55:41 +02:00
Henry Jameson
d3474e171e fix confirmation modal overflows 2024-12-29 18:48:58 +02:00
HJ
86e1e6becf Merge branch 'emoji-fixes' into 'develop'
Another fix attempt

See merge request pleroma/pleroma-fe!1961
2024-12-28 14:51:22 +00:00
Henry Jameson
984dfd06c2 alternatively 2024-12-28 16:48:33 +02:00
HJ
1ff3be579c Merge branch 'emoji-fixes' into 'develop'
fix default values for emoji size calculations

See merge request pleroma/pleroma-fe!1960
2024-12-28 14:44:21 +00:00
Henry Jameson
38c0856c20 default values 2024-12-28 16:43:49 +02:00
HJ
9c10370e19 Merge branch 'emoji-fixes' into 'develop'
Emoji fixes

See merge request pleroma/pleroma-fe!1956
2024-12-28 14:33:02 +00:00
5 changed files with 40 additions and 7 deletions

View file

@ -0,0 +1 @@
modal layout for mobile has new layout to make it easy to use

1
changelog.d/modals.fix Normal file
View file

@ -0,0 +1 @@
fixed modals buttons overflow

View file

@ -47,6 +47,9 @@ export default {
watch: {
themeApplied (value) {
this.removeSplash()
},
layoutType (value) {
document.getElementById('modal').classList = ['-' + this.layoutType]
}
},
created () {
@ -54,6 +57,7 @@ export default {
const val = this.$store.getters.mergedConfig.interfaceLanguage
this.$store.dispatch('setOption', { name: 'interfaceLanguage', value: val })
window.addEventListener('resize', this.updateMobileState)
document.getElementById('modal').classList = ['-' + this.layoutType]
},
mounted () {
if (this.$store.state.interface.themeApplied) {

View file

@ -69,12 +69,41 @@
margin: 0;
padding: 0.5em;
border-top: 1px solid var(--border);
display: flex;
justify-content: flex-end;
display: grid;
grid-gap: 0.5em;
grid-auto-columns: minmax(max-content, 1fr);
height: auto;
button {
width: auto;
margin-left: 0.5rem;
padding-left: 2em;
padding-right: 2em;
}
}
}
#modal.-mobile {
.dialog-modal.panel {
top: auto;
left: 0;
right: 0;
bottom: 0;
max-width: none;
transform: none;
width: 100vw;
margin: auto;
z-index: 2001;
.dialog-modal-footer {
flex-direction: column;
justify-content: flex-end;
grid-auto-columns: initial;
grid-auto-rows: 1fr;
button {
grid-column: 1;
height: 2em;
}
}
}
}

View file

@ -140,8 +140,8 @@ const EmojiPicker = {
},
updateEmojiSize () {
const css = window.getComputedStyle(this.$refs.popover.$el)
const fontSize = css.getPropertyValue('font-size')
const emojiSize = css.getPropertyValue('--emojiSize')
const fontSize = css.getPropertyValue('font-size') || '14px'
const emojiSize = css.getPropertyValue('--emojiSize') || '2.2rem'
const fontSizeUnit = fontSize.replace(/[0-9,.]+/, '')
const fontSizeValue = Number(fontSize.replace(/[^0-9,.]+/, ''))
@ -155,8 +155,6 @@ const EmojiPicker = {
} else {
fontSizeMultiplier = fontSizeValue / 14
}
console.log('Multiplier', fontSizeMultiplier)
console.log('Result', fontSizeMultiplier * 14)
let emojiSizeReal
if (emojiSizeUnit.endsWith('em')) {