From 697a93749b265ab6702974a53381ed5e9a143a39 Mon Sep 17 00:00:00 2001
From: Carsten Rose <carsten.rose@math.uzh.ch>
Date: Thu, 16 Mar 2017 13:39:57 +0100
Subject: [PATCH] BuildFormBootstrap.php: Added class'clearfix' to every
Bootstrap row 'form-group' - on request of BB: should solve problems which we
don't see at the moment. qfq-bs.css.less: Typeahead - expand with of dropdown
Box to 100% of current input element. Add hoover for the dropdown Box with a
blue background
---
extension/Documentation/Manual.rst | 5 ++++-
extension/qfq/qfq/BuildFormBootstrap.php | 2 +-
less/qfq-bs.css.less | 26 ++++++++++++++++++++----
3 files changed, 27 insertions(+), 6 deletions(-)
diff --git a/extension/Documentation/Manual.rst b/extension/Documentation/Manual.rst
index 8831b008b..158980e89 100644
--- a/extension/Documentation/Manual.rst
+++ b/extension/Documentation/Manual.rst
@@ -3810,7 +3810,10 @@ Changes
* Play formEditor.sql.
- * Dropdownlist of containerassigment updated.
+ * Dropdownlist of container assigment: remove 'class' (always 'container') and insert 'type' ('pill', 'fiedlset', 'templategroup').
+ * FormElement.placeholder colum width extended to 512:
+
+ ALTER TABLE `FormElement` CHANGE `placeholder` `placeholder` VARCHAR(512) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '';
Features
^^^^^^^^
diff --git a/extension/qfq/qfq/BuildFormBootstrap.php b/extension/qfq/qfq/BuildFormBootstrap.php
index 5455a1812..1d51d8e12 100644
--- a/extension/qfq/qfq/BuildFormBootstrap.php
+++ b/extension/qfq/qfq/BuildFormBootstrap.php
@@ -53,7 +53,7 @@ class BuildFormBootstrap extends AbstractBuildForm {
$this->wrap[WRAP_SETUP_TITLE][WRAP_SETUP_END] = "</h1></div></div>";
// Element: Label + Input + Note
- $this->wrap[WRAP_SETUP_ELEMENT][WRAP_SETUP_START] = "<div class='form-group'>";
+ $this->wrap[WRAP_SETUP_ELEMENT][WRAP_SETUP_START] = "<div class='form-group clearfix'>";
$this->wrap[WRAP_SETUP_ELEMENT][WRAP_SETUP_END] = "</div>";
$this->wrap[WRAP_SETUP_SUBRECORD][WRAP_SETUP_START] = "<div class='col-md-12'>";
diff --git a/less/qfq-bs.css.less b/less/qfq-bs.css.less
index e1f88f2af..d2e2c9f74 100644
--- a/less/qfq-bs.css.less
+++ b/less/qfq-bs.css.less
@@ -96,7 +96,6 @@ i.@{spinner_class} {
padding-top: 4px;
}
-
.qfq-color-white {
background-color: #ffffff;
}
@@ -137,7 +136,6 @@ i.@{spinner_class} {
// TypeAhead Suggestions
.tt-menu {
- padding: 12px;
background-color: #fff;
border-left: 1px solid #66afe9;
border-right: 1px solid #66afe9;
@@ -145,11 +143,31 @@ i.@{spinner_class} {
border-bottom-left-radius: 5px;
border-bottom-right-radius: 5px;
-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075), 0 0 8px rgba(102, 175, 233, .6);
- box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075), 0 0 8px rgba(102, 175, 233, .6)
+ box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075), 0 0 8px rgba(102, 175, 233, .6);
+ width: 100%;
+}
+
+@media (min-width: 768px) {
+ .form-horizontal .control-label {
+ text-align: unset;
+ }
+}
+
+.tt-suggestion {
+ cursor: pointer;
+ cursor: hand;
+ padding-left: 12px;
+ padding-right: 12px;
+ padding-bottom: 6px;
+ padding-top: 12px;
}
.tt-suggestion + .tt-suggestion {
- margin-top: 12px;
+ padding-top: 6px;
+}
+
+.tt-suggestion:hover {
+ background-color: rgba(102, 175, 233, .6);
}
--
GitLab