You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lo...@apache.org on 2016/05/11 13:25:34 UTC
svn commit: r1743359 - in
/myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main:
java/org/apache/myfaces/tobago/renderkit/css/
resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/style/
Author: lofwyr
Date: Wed May 11 13:25:33 2016
New Revision: 1743359
URL: http://svn.apache.org/viewvc?rev=1743359&view=rev
Log:
TOBAGO-1549: Style classes for faces-messages incompatible to bootstrap 4
Modified:
myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/css/BootstrapClass.java
myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/css/TobagoClass.java
myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/style/tobago.css
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/css/BootstrapClass.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/css/BootstrapClass.java?rev=1743359&r1=1743358&r2=1743359&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/css/BootstrapClass.java (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/css/BootstrapClass.java Wed May 11 13:25:33 2016
@@ -110,7 +110,7 @@ public enum BootstrapClass implements Cs
FORM_CONTROL_STATIC("form-control-static"),
FORM_GROUP("form-group"),
FORM_INLINE("form-inline"),
- HAS_ERROR("has-error"),
+ HAS_DANGER("has-danger"),
HAS_SUCCESS("has-success"),
HAS_WARNING("has-warning"),
HIDDEN_SM_UP("hidden-sm-up"),
@@ -192,9 +192,11 @@ public enum BootstrapClass implements Cs
if (maximumSeverity == null) {
return null;
} else if (maximumSeverity.getOrdinal() >= SEVERITY_ERROR) {
- return HAS_ERROR;
+ return HAS_DANGER;
} else if (maximumSeverity.getOrdinal() >= SEVERITY_WARN) {
return HAS_WARNING;
+ } else if (maximumSeverity.getOrdinal() >= SEVERITY_INFO) {
+ return TobagoClass.HAS_INFO;
} else {
return null;
}
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/css/TobagoClass.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/css/TobagoClass.java?rev=1743359&r1=1743358&r2=1743359&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/css/TobagoClass.java (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/css/TobagoClass.java Wed May 11 13:25:33 2016
@@ -38,6 +38,8 @@ public enum TobagoClass implements CssIt
DROPDOWN_SUBMENU("dropdown-submenu"),
TABLE_LAYOUT__FIXED("tableLayout-fixed"),
+ HAS_INFO("has-info"),
+
FLEX_LAYOUT("tobago-flexLayout"),
LABEL("tobago-label"),
MENU_BAR("tobago-menuBar"),
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/style/tobago.css
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/style/tobago.css?rev=1743359&r1=1743358&r2=1743359&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/style/tobago.css (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/style/tobago.css Wed May 11 13:25:33 2016
@@ -620,3 +620,35 @@ fixme: there is a problem with the selec
.tobago-tabGroup-toolBar {
display: none;
}
+
+.has-info .text-help,
+.has-info .form-control-label,
+.has-info .radio,
+.has-info .checkbox,
+.has-info .radio-inline,
+.has-info .checkbox-inline,
+.has-info.radio label,
+.has-info.checkbox label,
+.has-info.radio-inline label,
+.has-info.checkbox-inline label {
+ color: #5bc0de;
+}
+
+.has-info .form-control {
+ border-color: #5bc0de;
+}
+
+.has-info .input-group-addon {
+ color: #5bc0de;
+ background-color: #eaf6ea;
+ border-color: #5bc0de;
+}
+
+.has-info .form-control-feedback {
+ color: #5bc0de;
+}
+
+.has-info .form-control-success {
+ background-image: url("data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCA2MTIgNzkyIj48cGF0aCBmaWxsPSIjNWNiODVjIiBkPSJNMjMzLjggNjEwYy0xMy4zIDAtMjYtNi0zNC0xNi44TDkwLjUgNDQ4LjhDNzYuMyA0MzAgODAgNDAzLjMgOTguOCAzODljMTguOC0xNC4yIDQ1LjUtMTAuNCA1OS44IDguNGw3MiA5NUw0NTEuMyAyNDJjMTIuNS0yMCAzOC44LTI2LjIgNTguOC0xMy43IDIwIDEyLjQgMjYgMzguNyAxMy43IDU4LjhMMjcwIDU5MGMtNy40IDEyLTIwLjIgMTkuNC0zNC4zIDIwaC0yeiIvPjwvc3ZnPg==");
+}
+