You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by hn...@apache.org on 2017/10/10 17:48:35 UTC
[myfaces-tobago] branch master updated: TOBAGO-1759 Update
Bootstrap to 4.0.0 beta 1 (from alpha 6) * fix suggest length with standard
label layout * fix suggest length inside input group * fix length of
components if message button is attached * fix tc:file length * update
messageLayout test
This is an automated email from the ASF dual-hosted git repository.
hnoeth pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git
The following commit(s) were added to refs/heads/master by this push:
new bfecb48 TOBAGO-1759 Update Bootstrap to 4.0.0 beta 1 (from alpha 6) * fix suggest length with standard label layout * fix suggest length inside input group * fix length of components if message button is attached * fix tc:file length * update messageLayout test
bfecb48 is described below
commit bfecb48c56c5c01f5bcff2a9b73c89b64b7933da
Author: Henning Noeth <hn...@apache.org>
AuthorDate: Tue Oct 10 19:48:27 2017 +0200
TOBAGO-1759 Update Bootstrap to 4.0.0 beta 1 (from alpha 6)
* fix suggest length with standard label layout
* fix suggest length inside input group
* fix length of components if message button is attached
* fix tc:file length
* update messageLayout test
---
tobago-core/src/main/resources/scss/_tobago.scss | 30 ++++++++++++++--------
.../5000-messageLayout/messageLayout.xhtml | 8 +++++-
2 files changed, 27 insertions(+), 11 deletions(-)
diff --git a/tobago-core/src/main/resources/scss/_tobago.scss b/tobago-core/src/main/resources/scss/_tobago.scss
index 5ff1bbc..79b963a 100644
--- a/tobago-core/src/main/resources/scss/_tobago.scss
+++ b/tobago-core/src/main/resources/scss/_tobago.scss
@@ -239,6 +239,15 @@ body {
}
}
+/* the non-label-element inside of a label-layout with flex box */
+.tobago-flexLayout.tobago-label-container > {
+ .form-control, .form-control-plaintext, .twitter-typeahead,
+ .tobago-input-group-outer, .tobago-messages-container,
+ .tobago-file, .tobago-selectManyShuttle {
+ flex: 1 0 0px;
+ }
+}
+
/* flowLayout ---------------------------------------------------------- */
.tobago-flowLayout {
}
@@ -342,12 +351,6 @@ table.tobago-gridLayout > tbody {
width: 155px;
}
-/* the non-label-element inside of a label-layout with flex box */
-.tobago-flexLayout.tobago-label-container > .form-control,
-.tobago-flexLayout.tobago-label-container > .form-control-plaintext {
- flex: 1 0 0px;
-}
-
/* link ----------------------------------------------------------- */
.tobago-link {
@@ -448,10 +451,6 @@ button {
margin-right: 0; /* for tc:in margin 5px is already set */
margin-bottom: 5px;
}
-
- .tobago-selectManyShuttle {
- flex-grow: 1;
- }
}
}
@@ -468,6 +467,12 @@ a.tobago-messages-button {
}
}
+.tobago-flexLayout.tobago-messages-container > {
+ .twitter-typeahead , .tobago-input-group-outer, .tobago-selectManyShuttle, .tobago-file {
+ flex: 1 0 0px;
+ }
+}
+
/* nav ----------------------------------------------------------- */
/* styles for drop down menu first level */
@@ -1079,6 +1084,11 @@ th.tobago-sheet-headerCell-markup-filler > .tobago-sheet-header {
}
}
+.input-group > .twitter-typeahead > .tobago-in {
+ width: 100%;
+ border-right: 0;
+}
+
/* tab / tab-group ----------------------------------------------------------------- */
.tobago-tab-content {
}
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/60000-manual/5000-messageLayout/messageLayout.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/60000-manual/5000-messageLayout/messageLayout.xhtml
index 46fcb38..dc796e8 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/60000-manual/5000-messageLayout/messageLayout.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/60000-manual/5000-messageLayout/messageLayout.xhtml
@@ -26,6 +26,7 @@
<tc:button label="Submit"/>
<tc:section label="Severity">
+ <tc:in label="Vergleich"/>
<tc:in label="Fatal" validator="#{severityController.addFatal}"/>
<tc:in label="Error" validator="#{severityController.addError}"/>
<tc:in label="Warn" validator="#{severityController.addWarn}"/>
@@ -41,6 +42,11 @@
<tc:in label="Label Right" required="true" labelLayout="flexRight"/>
<tc:in label="Label Left" required="true"/>
<tc:in required="true"/>
+ <tc:in label="Suggest" required="true">
+ <tc:suggest totalCount="10" query="#{suggestController.query}">
+ <tc:selectItems value="#{suggestController.languages}" var="language" itemValue="#{language}"/>
+ </tc:suggest>
+ </tc:in>
<tc:in label="Input Group" required="true">
<f:facet name="before">https://example.com/</f:facet>
<f:facet name="after"><tc:button label="OK" omit="true"/></f:facet>
@@ -70,7 +76,7 @@
<tc:selectItem itemLabel="Item One" itemValue="one"/>
<tc:selectItem itemLabel="Item Two" itemValue="two"/>
</tc:selectManyCheckbox>
- <tc:selectManyShuttle label="Shuttle" labelLayout="top" value="#{selectManyShuttleController.selectedPlanets}"
+ <tc:selectManyShuttle label="Shuttle" value="#{selectManyShuttleController.selectedPlanets}"
required="true">
<tc:selectItems value="#{selectManyShuttleController.planets}"
var="planet" itemLabel="#{planet.name}" itemValue="#{planet}"/>
--
To stop receiving notification emails like this one, please contact
['"commits@myfaces.apache.org" <co...@myfaces.apache.org>'].