From 333a4445b79e6130b2bb35af8ab106ec3be66645 Mon Sep 17 00:00:00 2001
From: Benjamin Baer <benjamin.baer@math.uzh.ch>
Date: Wed, 1 Jul 2020 05:47:03 +0200
Subject: [PATCH] added a class list and updated css
---
less/qfq-bs.css.less | 12 ++++++++++++
mockup/tinyMCEUpload.html | 9 ++++++++-
2 files changed, 20 insertions(+), 1 deletion(-)
diff --git a/less/qfq-bs.css.less b/less/qfq-bs.css.less
index 7d4feee42..627e49334 100644
--- a/less/qfq-bs.css.less
+++ b/less/qfq-bs.css.less
@@ -91,6 +91,10 @@ i.@{spinner_class} {
border: 2px solid #ccc;
}
+.qfq-image-border, .qfq-image-border-left, .qfq-image-border-right {
+ border: 1px solid #333;
+}
+
.radio-inline:hover input ~ .checkmark, .radio:hover input ~ .checkmark {
border-color: #2196F3;
}
@@ -685,6 +689,14 @@ span.qfq-typeahead-tag {
}
}
+.qfq-image-left, .qfq-image-border-left {
+ float: left;
+}
+
+.qfq-image-right, .qfq-image-border-right {
+ float: right;
+}
+
.tt-suggestion {
cursor: pointer;
cursor: hand;
diff --git a/mockup/tinyMCEUpload.html b/mockup/tinyMCEUpload.html
index 4c30c0419..b91a4a32f 100644
--- a/mockup/tinyMCEUpload.html
+++ b/mockup/tinyMCEUpload.html
@@ -71,7 +71,14 @@ Use this mockup:
<textarea id="text:2" class="qfq-tinymce" name="rte"
data-config='{ "plugins": "image",
"file_picker_types": "file image media",
- "image_advtab": true,
+ "image_class_list": [
+ {"title": "none", "value": ""},
+ {"title": "border", "value": "qfq-image-border"},
+ {"title": "right", "value": "qfq-image-right"},
+ {"title": "left", "value": "qfq-image-left"},
+ {"title": "border-left", "value": "qfq-image-border-left"},
+ {"title": "border-right", "value": "qfq-image-border-right"}
+ ],
"automatic_uploads": true,
"images_upload_url": "api/pictureUpload.php",
"images_reuse_filename": true }'>
--
GitLab