Compare commits
8 commits
5e65c2efb7
...
e8338a2f65
Author | SHA1 | Date | |
---|---|---|---|
|
e8338a2f65 | ||
|
d5d7582741 | ||
|
d3474e171e | ||
|
86e1e6becf | ||
|
984dfd06c2 | ||
|
1ff3be579c | ||
|
38c0856c20 | ||
|
9c10370e19 |
5 changed files with 40 additions and 7 deletions
1
changelog.d/modals-mobile.change
Normal file
1
changelog.d/modals-mobile.change
Normal file
|
@ -0,0 +1 @@
|
|||
modal layout for mobile has new layout to make it easy to use
|
1
changelog.d/modals.fix
Normal file
1
changelog.d/modals.fix
Normal file
|
@ -0,0 +1 @@
|
|||
fixed modals buttons overflow
|
|
@ -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) {
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -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')) {
|
||||
|
|
Loading…
Add table
Reference in a new issue