FACES-2255 Incorrect appearance of alloy:button and alloy:commandButt…

…on menu
liferay · May 20, 2015 · f7a6321 · f7a6321
1 parent 7d7b1c2
commit f7a6321
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 4 deletions.
diff --git a/.../java/com/liferay/faces/alloy/component/nodemenunav/internal/NodeMenuNavRendererBase.java b/.../java/com/liferay/faces/alloy/component/nodemenunav/internal/NodeMenuNavRendererBase.java
@@ -237,6 +237,10 @@ public void encodeMarkupEnd(FacesContext facesContext, UIComponent uiComponent)
 		// end yui3-menu div
 		responseWriter.endElement(StringPool.DIV);
 
+		// alloy-nodemenunav-after
+		responseWriter.startElement(StringPool.DIV, uiComponent);
+		responseWriter.writeAttribute(StringPool.CLASS, "alloy-nodemenunav-after", null);
+		responseWriter.endElement(StringPool.DIV);
 	}
 
 	public void encodeMenuRecurse(UIComponent uiComponent, ResponseWriter responseWriter, boolean disabled,

diff --git a/alloy/src/main/resources/META-INF/resources/liferay-faces-alloy/alloy.css b/alloy/src/main/resources/META-INF/resources/liferay-faces-alloy/alloy.css
@@ -9,6 +9,11 @@
 	padding: 4px;
 }
 
+/* alloy-button, alloy-commandbutton */
+.alloy-nodemenunav-after {
+	clear: both;
+}
+
 /* alloy-datatable */
 table.alloy-datatable thead th.facet, table.alloy-datatable tfoot td.facet {
     padding: 2px;

diff --git a/...showcase/showcase-webapp/src/main/webapp/WEB-INF/component/alloy/button/menu/button.xhtml b/...showcase/showcase-webapp/src/main/webapp/WEB-INF/component/alloy/button/menu/button.xhtml
@@ -31,7 +31,6 @@
 						</alloy:link>
 					</alloy:menu>
 				</alloy:button>
-				<div style="clear: both;" />
 			</showcase:example>
 		</alloy:form>
 	</ui:define>
@@ -68,7 +67,6 @@
 						</alloy:link>
 					</alloy:menu>
 				</alloy:button>
-				<div style="clear: both;" />
 			</showcase:example>
 		</alloy:form>
 	</ui:define>

diff --git a/...ase-webapp/src/main/webapp/WEB-INF/component/alloy/commandbutton/menu/commandButton.xhtml b/...ase-webapp/src/main/webapp/WEB-INF/component/alloy/commandbutton/menu/commandButton.xhtml
@@ -32,7 +32,6 @@
 						</alloy:commandLink>
 					</alloy:menu>
 				</alloy:commandButton>
-				<div style="clear: both;" />
 			</showcase:example>
 		</alloy:form>
 	</ui:define>
@@ -70,7 +69,6 @@
 						</alloy:commandLink>
 					</alloy:menu>
 				</alloy:commandButton>
-				<div style="clear: both;" />
 			</showcase:example>
 		</alloy:form>
 	</ui:define>