Merge branch 'fix-preview-interference' into 'develop'

fix theme preview styles being applied to post preview

See merge request pleroma/pleroma-fe!1926
merge-requests/1931/head
HJ 2 months ago
commit 9e34e07a38

@ -25,7 +25,7 @@ import {
faGlobe faGlobe
} from '@fortawesome/free-solid-svg-icons' } from '@fortawesome/free-solid-svg-icons'
import Preview from './theme_tab/preview.vue' import Preview from './theme_tab/theme_preview.vue'
library.add( library.add(
faGlobe faGlobe

@ -1,5 +1,5 @@
<template> <template>
<div class="preview-container"> <div class="theme-preview-container">
<div class="underlay underlay-preview" /> <div class="underlay underlay-preview" />
<div class="panel dummy"> <div class="panel dummy">
<div class="panel-heading"> <div class="panel-heading">
@ -136,7 +136,7 @@ export default {
</script> </script>
<style lang="scss"> <style lang="scss">
.preview-container { .theme-preview-container {
position: relative; position: relative;
border-top: 1px dashed; border-top: 1px dashed;
border-bottom: 1px dashed; border-bottom: 1px dashed;
@ -238,13 +238,13 @@ export default {
min-width: 3em; min-width: 3em;
} }
} }
}
.underlay-preview { .underlay-preview {
position: absolute; position: absolute;
top: 0; top: 0;
bottom: 0; bottom: 0;
left: 10px; left: 10px;
right: 10px; right: 10px;
}
} }
</style> </style>

@ -45,7 +45,7 @@ import TabSwitcher from 'src/components/tab_switcher/tab_switcher.jsx'
import Checkbox from 'src/components/checkbox/checkbox.vue' import Checkbox from 'src/components/checkbox/checkbox.vue'
import Select from 'src/components/select/select.vue' import Select from 'src/components/select/select.vue'
import Preview from './preview.vue' import Preview from './theme_preview.vue'
// List of color values used in v1 // List of color values used in v1
const v1OnlyNames = [ const v1OnlyNames = [

Loading…
Cancel
Save