From ae373330abf0d77fbd3ed1bf6c052b830a2b3c06 Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Fri, 12 Feb 2021 00:18:29 +0200
Subject: [PATCH] Improved slot fill dialog UI, abandoned column layout in
 favour of wrapping flex rows

---
 .../embedInlineCalculations.js                |  1 +
 .../ui/creature/slots/SlotFillDialog.vue      | 94 ++++++++++---------
 app/imports/ui/styles/lineClamp.css           |  6 ++
 app/imports/ui/styles/stylesIndex.js          |  3 +-
 4 files changed, 58 insertions(+), 46 deletions(-)
 create mode 100644 app/imports/ui/styles/lineClamp.css

diff --git a/app/imports/api/creature/computation/afterComputation/embedInlineCalculations.js b/app/imports/api/creature/computation/afterComputation/embedInlineCalculations.js
index 1adbb68a..3821edff 100644
--- a/app/imports/api/creature/computation/afterComputation/embedInlineCalculations.js
+++ b/app/imports/api/creature/computation/afterComputation/embedInlineCalculations.js
@@ -1,5 +1,6 @@
 export default function embedInlineCalculations(string, calculations){
   if (!string) return '';
+  if (!calculations) return string;
   let index = 0;
   return string.replace(/\{([^{}]*)\}/g, () => {
     let comp = calculations && calculations[index++];
diff --git a/app/imports/ui/creature/slots/SlotFillDialog.vue b/app/imports/ui/creature/slots/SlotFillDialog.vue
index 0bac9546..d1a032dc 100644
--- a/app/imports/ui/creature/slots/SlotFillDialog.vue
+++ b/app/imports/ui/creature/slots/SlotFillDialog.vue
@@ -23,49 +23,47 @@
     >
       <v-fade-transition mode="out-in">
         <div v-if="libraryNodes && libraryNodes.length">
-          <column-layout
-            wide-columns
+          <section
+            class="layout row wrap justify-between"
           >
-            <div
+            <v-card
               v-for="node in libraryNodes"
               :key="node._id"
+              hover
+              ripple
+              class="slot-card layout column justify-end"
+              :class="{'selected': node._id === (selectedNode && selectedNode._id)}"
+              :dark="node._id === (selectedNode && selectedNode._id)"
+              @click="selectedNode = node"
             >
-              <v-card
-                hover
-                ripple
-                class="slot-card"
-                :class="{'primary': node._id === (selectedNode && selectedNode._id)}"
-                :dark="node._id === (selectedNode && selectedNode._id)"
-                @click="selectedNode = node"
-              >
-                <v-img
-                  v-if="node.picture"
-                  :src="node.picture"
-                  :height="200"
-                  contain
+              <v-img
+                v-if="node.picture"
+                :src="node.picture"
+                :height="200"
+                contain
+                class="slot-card-image"
+              />
+              <v-card-title primary-title>
+                <tree-node-view
+                  class="mr-2 title mb-0"
+                  :class="{'theme--dark': node._id === (selectedNode && selectedNode._id)}"
+                  :hide-icon="node.picture"
+                  :model="node"
+                  :color="node.color"
                 />
-                <v-card-title primary-title>
-                  <div>
-                    <h3 class="title mb-0">
-                      <tree-node-view
-                        class="mr-2"
-                        :class="{'theme--dark': node._id === (selectedNode && selectedNode._id)}"
-                        :hide-icon="node.picture"
-                        :model="node"
-                        :color="node.color"
-                      />
-                    </h3>
-                    <property-description
-                      :string="model.description"
-                      :calculations="model.descriptionCalculations"
-                      :inactive="model.inactive"
-                    />
-                  </div>
-                </v-card-title>
-              </v-card>
-            </div>
-          </column-layout>
-          <div class="layout row justify-center">
+              </v-card-title>
+              <v-card-text
+                v-if="node.description"
+                class="pt-0"
+              >
+                <property-description
+                  class="slot-card-text line-clamp"
+                  :string="node.description"
+                />
+              </v-card-text>
+            </v-card>
+          </section>
+          <div class="layout row justify-center align-stretch">
             <v-btn
               v-if="currentLimit < countAll"
               :loading="!$subReady.slotFillers"
@@ -147,14 +145,12 @@ import DialogBase from '/imports/ui/dialogStack/DialogBase.vue';
 import { getPropertyName } from '/imports/constants/PROPERTIES.js';
 import { parse, CompilationContext } from '/imports/parser/parser.js';
 import PROPERTIES from '/imports/constants/PROPERTIES.js';
-import ColumnLayout from '/imports/ui/components/ColumnLayout.vue';
 import TreeNodeView from '/imports/ui/properties/treeNodeViews/TreeNodeView.vue';
 import PropertyDescription from '/imports/ui/properties/viewers/shared/PropertyDescription.vue'
 
 export default {
   components: {
 		DialogBase,
-    ColumnLayout,
     TreeNodeView,
     PropertyDescription,
 	},
@@ -270,9 +266,17 @@ export default {
 </script>
 
 <style lang="css" scoped>
-.slot-card {
-  max-width: 500px;
-  width: 100%;
-  display: inline-block;
-}
+  .slot-card {
+    max-width: 500px;
+    width: 300px;
+    flex-grow: 1;
+    flex-shrink: 1;
+    margin: 4px;
+  }
+  .slot-card-text.line-clamp {
+    -webkit-line-clamp: 5;
+  }
+  .slot-card.selected {
+    background: #8E1B1B;
+  }
 </style>
diff --git a/app/imports/ui/styles/lineClamp.css b/app/imports/ui/styles/lineClamp.css
new file mode 100644
index 00000000..0e501f3a
--- /dev/null
+++ b/app/imports/ui/styles/lineClamp.css
@@ -0,0 +1,6 @@
+.line-clamp {
+  display: -webkit-box;
+  -webkit-line-clamp: 3;
+  -webkit-box-orient: vertical;
+  overflow: hidden;
+}
diff --git a/app/imports/ui/styles/stylesIndex.js b/app/imports/ui/styles/stylesIndex.js
index 047251f4..74fa90a3 100644
--- a/app/imports/ui/styles/stylesIndex.js
+++ b/app/imports/ui/styles/stylesIndex.js
@@ -2,4 +2,5 @@ import './speedDial.css';
 import './inheritBackgrounds.css';
 import './centeredInputs.css';
 import './largeFormatInputs.css';
-import './fitAvatars.css'
+import './fitAvatars.css';
+import './lineClamp.css';