pipipi-pikachu 5 år sedan
förälder
incheckning
d94cf1912a

+ 0 - 1
src/assets/styles/antd.scss

@@ -16,7 +16,6 @@
 // dropdown
 .ant-dropdown {
   min-width: 120px;
-  animation: none !important;
 }
 .ant-dropdown-menu {
   box-shadow: $boxShadow;

+ 0 - 1
src/assets/styles/prosemirror.scss

@@ -3,7 +3,6 @@
   border: 0;
   font-size: 20px;
   word-break: break-word;
-  font-family: '微软雅黑';
 
   ::selection {
     background-color: rgba(#d14424, 0.3);

+ 4 - 3
src/views/Editor/Canvas/EditableElement.vue

@@ -5,7 +5,8 @@
     :id="'editable-element-' + elementInfo.id"
     :style="{
       zIndex: elementIndex,
-      color: themeFontColor,
+      color: theme.fontColor,
+      fontFamily: theme.fontName,
     }"
   >
     <component
@@ -62,7 +63,7 @@ export default defineComponent({
   },
   setup(props) {
     const store = useStore<State>()
-    const themeFontColor = computed(() => store.state.theme.fontColor)
+    const theme = computed(() => store.state.theme)
 
     const currentElementComponent = computed(() => {
       const elementTypeMap = {
@@ -153,7 +154,7 @@ export default defineComponent({
     return {
       currentElementComponent,
       contextmenus,
-      themeFontColor,
+      theme,
     }
   },
 })

+ 4 - 3
src/views/Screen/ScreenElement.vue

@@ -3,7 +3,8 @@
     class="screen-element"
     :style="{
       zIndex: elementIndex,
-      color: themeFontColor,
+      color: theme.fontColor,
+      fontFamily: theme.fontName,
       visibility: needWaitAnimation ? 'hidden' : 'visible',
     }"
   >
@@ -57,7 +58,7 @@ export default defineComponent({
     })
 
     const store = useStore<State>()
-    const themeFontColor = computed(() => store.state.theme.fontColor)
+    const theme = computed(() => store.state.theme)
     const currentSlide = computed<Slide>(() => store.getters.currentSlide)
 
     const needWaitAnimation = computed(() => {
@@ -70,7 +71,7 @@ export default defineComponent({
     return {
       currentElementComponent,
       needWaitAnimation,
-      themeFontColor,
+      theme,
     }
   },
 })

+ 4 - 3
src/views/components/ThumbnailSlide/ThumbnailElement.vue

@@ -3,7 +3,8 @@
     class="base-element"
     :style="{
       zIndex: elementIndex,
-      color: themeFontColor,
+      color: theme.fontColor,
+      fontFamily: theme.fontName,
     }"
   >
     <component
@@ -41,7 +42,7 @@ export default defineComponent({
   },
   setup(props) {
     const store = useStore<State>()
-    const themeFontColor = computed(() => store.state.theme.fontColor)
+    const theme = computed(() => store.state.theme)
 
     const currentElementComponent = computed(() => {
       const elementTypeMap = {
@@ -57,7 +58,7 @@ export default defineComponent({
 
     return {
       currentElementComponent,
-      themeFontColor,
+      theme,
     }
   },
 })

+ 0 - 1
src/views/components/element/ChartElement/BaseChartElement.vue

@@ -61,7 +61,6 @@ export default defineComponent({
   width: 100%;
   height: 100%;
   opacity: .5;
-  background-color: rgba($color: #000, $alpha: .05);
   display: flex;
   justify-content: center;
   align-items: center;

+ 0 - 1
src/views/components/element/TextElement/BaseTextElement.vue

@@ -67,7 +67,6 @@ export default defineComponent({
   padding: 10px;
   line-height: 1.5;
   word-break: break-word;
-  font-family: '微软雅黑';
 
   .text {
     position: relative;

+ 0 - 1
src/views/components/element/TextElement/index.vue

@@ -293,7 +293,6 @@ export default defineComponent({
   padding: 10px;
   line-height: 1.5;
   word-break: break-word;
-  font-family: '微软雅黑';
 
   .text {
     position: relative;