From 0ec16d98245b294b79854bfa0cb07fe2b349a892 Mon Sep 17 00:00:00 2001
From: axolotle <nchesnais@mailoo.org>
Date: Mon, 2 Aug 2021 16:54:55 +0200
Subject: [PATCH] misc fixes

---
 src/assets/scss/fonts/_redaction.scss         |  8 ++++
 .../formItems/MultipleTagsSelect.vue          |  2 +
 src/pages/gallery/GalleryMap.vue              |  8 ++--
 src/pages/gallery/GalleryView.vue             |  1 +
 src/pages/library/LibraryMap.vue              | 40 ++++++++++++++-----
 src/pages/library/LibraryOptions.vue          |  6 ++-
 src/pages/library/LibraryTree.vue             |  4 ++
 7 files changed, 54 insertions(+), 15 deletions(-)

diff --git a/src/assets/scss/fonts/_redaction.scss b/src/assets/scss/fonts/_redaction.scss
index 313e859..92c88b1 100644
--- a/src/assets/scss/fonts/_redaction.scss
+++ b/src/assets/scss/fonts/_redaction.scss
@@ -16,3 +16,11 @@ $font-styles: (
     src: url('#{$location}/#{$font-slug}-#{$weight}-#{$style}.woff2') format('woff2');
   }
 }
+
+@font-face {
+  font-family: $font-name;
+  font-style: italic;
+  font-display: swap;
+  font-weight: 700;
+  src: url('#{$location}/#{$font-slug}-400-italic.woff2') format('woff2');
+}
diff --git a/src/components/formItems/MultipleTagsSelect.vue b/src/components/formItems/MultipleTagsSelect.vue
index 8985187..6e4d2e0 100644
--- a/src/components/formItems/MultipleTagsSelect.vue
+++ b/src/components/formItems/MultipleTagsSelect.vue
@@ -99,6 +99,8 @@ export default {
     .b-form-tag-remove {
       opacity: 1;
       line-height: 0;
+      height: 15px;
+      text-shadow: none;
     }
   }
 }
diff --git a/src/pages/gallery/GalleryMap.vue b/src/pages/gallery/GalleryMap.vue
index 654fee4..6334d3c 100644
--- a/src/pages/gallery/GalleryMap.vue
+++ b/src/pages/gallery/GalleryMap.vue
@@ -126,15 +126,15 @@ export default {
     height: var(--max);
 
     img {
-      max-width: 100%;
-      max-height: 100%;
+      width: 100%;
+      height: 100%;
+      object-fit: cover;
       margin: auto;
       cursor: pointer;
     }
 
-    &.current {
+    &.current img {
       border: 5px solid theme-color('creation');
-      background-color: theme-color('creation');
     }
   }
 }
diff --git a/src/pages/gallery/GalleryView.vue b/src/pages/gallery/GalleryView.vue
index 108f574..899b172 100644
--- a/src/pages/gallery/GalleryView.vue
+++ b/src/pages/gallery/GalleryView.vue
@@ -44,6 +44,7 @@
           <node-view
             :node="node"
             @close-node="hide"
+            @open-node="$emit('view-origin')"
             force-type="ref" show-origin
           />
         </template>
diff --git a/src/pages/library/LibraryMap.vue b/src/pages/library/LibraryMap.vue
index 25943bb..86215f8 100644
--- a/src/pages/library/LibraryMap.vue
+++ b/src/pages/library/LibraryMap.vue
@@ -6,7 +6,11 @@
     >
       <foreignObject
         v-for="node in filteredNodes" :key="'f-' + node.data.id"
-        :style="`--x: ${node.x}px; --y: ${node.y}px; --r: ${node.rotate}deg;`"
+        :class="{ 'safari': isSafari }"
+        :width="size.w" :height="size.h"
+        :x="node.x" :y="node.y"
+        :transform="`rotate(${node.rotate}) translate(-${size.w / 2}, -${size.h / 2})`"
+        :transform-origin="`${node.x} ${node.y}`"
       >
         <node-view
           :id="'preview-node-' + node.data.id"
@@ -78,6 +82,16 @@ export default {
     dataNodes () {
       if (!this.nodes) return
       return this.nodes.map(node => node.data)
+    },
+
+    isSafari () {
+      return /^((?!chrome|android).)*safari/i.test(navigator.userAgent)
+    },
+
+    size () {
+      return window.innerWidth < 1200
+        ? { w: 560 / 1.5, h: 350 / 1.5 }
+        : { w: 560, h: 350 }
     }
   },
 
@@ -131,17 +145,25 @@ export default {
 <style lang="scss">
 #library-map {
   foreignObject {
-    width: $node-card-width-sm;
-    height: $node-card-height-sm;
-    x: var(--x);
-    y: var(--y);
-    transform-origin: var(--x) var(--y);
-    transform: rotate(var(--r)) translate(-#{$node-card-width / 2}, -#{$node-card-height / 2});
+    // width: $node-card-width-sm;
+    // height: $node-card-height-sm;
+    // x: var(--x);
+    // y: var(--y);
+    // transform-origin: var(--x) var(--y);
+    // transform: rotate(var(--r)) translate(-#{$node-card-width / 2}, -#{$node-card-height / 2});
     overflow: visible;
 
     @include media-breakpoint-up($size-bp) {
-      width: $node-card-width;
-      height: $node-card-height;
+      // width: $node-card-width;
+      // height: $node-card-height;
+    }
+
+    &.safari .node-view {
+      position: static;
+
+      .node-view-footer {
+        display: none;
+      }
     }
 
     .node-view {
diff --git a/src/pages/library/LibraryOptions.vue b/src/pages/library/LibraryOptions.vue
index 7b21ef1..b8e9cc7 100644
--- a/src/pages/library/LibraryOptions.vue
+++ b/src/pages/library/LibraryOptions.vue
@@ -90,7 +90,7 @@
     <b-form-group v-else id="depart-group" :label="$t('variants.depart')">
       <b-dropdown id="text-depart-select" variant="outline-dark" right>
         <template #button-content>
-          <node-view-title :node="activeNode" />
+          <node-view-title v-if="activeNode" :node="activeNode" />
         </template>
 
         <b-dropdown-item v-for="node in nodesDeparts" :key="node.id" @click="activeNodeId = node.id">
@@ -208,7 +208,9 @@ export default {
     scrollToChar (char) {
       const h = document.querySelector(`h3[id=${char}]`)
       if (h) {
-        h.scrollIntoView({ behavior: 'smooth' })
+        h.scrollIntoView({
+          behavior: navigator.userAgent.indexOf('Safari') !== -1 ? 'instant' : 'smooth'
+        })
       }
     }
   }
diff --git a/src/pages/library/LibraryTree.vue b/src/pages/library/LibraryTree.vue
index c3d4288..41f01b9 100644
--- a/src/pages/library/LibraryTree.vue
+++ b/src/pages/library/LibraryTree.vue
@@ -210,6 +210,10 @@ foreignObject {
 }
 
 .dot-btn {
+  @media (hover: none) {
+    display: none;
+  }
+
   transform: translate(-50%, -50%);
   pointer-events: none;
   min-width: 200px;