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 @@ >
- -
- - + + - -
-

- -

- -
-
-
-
-
-
+ + + + + + +
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';