Author: ilya_shaikovsky Date: 2010-06-01 10:29:28 -0400 (Tue, 01 Jun 2010) New Revision: 17451 Removed: root/examples/richfaces-showcase/trunk/src/main/webapp/CSS/ Modified: root/examples/richfaces-showcase/trunk/src/main/webapp/resources/rich/css/page.ecss root/examples/richfaces-showcase/trunk/src/main/webapp/resources/rich/css/panel.ecss root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/component-sample.xhtml root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/poll/poll.xhtml root/examples/richfaces-showcase/trunk/src/main/webapp/templates/includes/navigation.xhtml root/examples/richfaces-showcase/trunk/src/main/webapp/templates/includes/skin-chooser.xhtml root/examples/richfaces-showcase/trunk/src/main/webapp/templates/main.xhtml Log: demo styling Modified: root/examples/richfaces-showcase/trunk/src/main/webapp/resources/rich/css/page.ecss =================================================================== --- root/examples/richfaces-showcase/trunk/src/main/webapp/resources/rich/css/page.ecss 2010-06-01 13:23:33 UTC (rev 17450) +++ root/examples/richfaces-showcase/trunk/src/main/webapp/resources/rich/css/page.ecss 2010-06-01 14:29:28 UTC (rev 17451) @@ -2,9 +2,9 @@ width: 100%; } -.body { - background-color: '#{richSkin.generalBackgroundColor}'; - margin: 0px; +body { + background-color: #FFFFFF; + margin: 10px; } .header_bg { @@ -28,29 +28,24 @@ .menu_col { background-color: '#{richSkin.generalBackgroundColor}'; vertical-align: top; - border-top: 2px solid; - border-top-color: '#{richSkin.panelBorderColor}'; - border-right: 2px solid; - border-right-color: '#{richSkin.panelBorderColor}'; - border-bottom: 2px solid; - border-bottom-color: '#{richSkin.panelBorderColor}'; + border-top: 10px solid #FFFFFF; + border-right: 10px solid #FFFFFF; + border-bottom: 10px solid #FFFFFF; } .content_col { - background-color: '#{richSkin.generalBackgroundColor}'; + background-color: #FFFFFF; vertical-align: top; width: 100%; - border-top: 2px solid; - border-top-color: '#{richSkin.panelBorderColor}'; - border-bottom: 2px solid; - border-bottom-color: '#{richSkin.panelBorderColor}'; + border-top: 10px solid #FFFFFF; + border-bottom: 10px solid #FFFFFF; } *.menu_col,*.content_col,*.footer_bg { font-family: '#{richSkin.generalFamilyFont}'; color: '#{richSkin.generalTextColor}'; font-size: '#{richSkin.generalSizeFont}'; -} +} *.header_content { font-family: '#{richSkin.generalFamilyFont}'; @@ -74,9 +69,8 @@ } .footer_bg_content { + padding:20px; margin: 0px 0px 0px 0px; - height: 45px; - position: relative; } .new_marker { @@ -86,10 +80,17 @@ padding-left: 2px; } -.header_links_container, .header_links_container * { +.header_links_container, .header_links_container a:visited, .header_links_container * { color: '#{richSkin.headerTextColor}'; } .header_links_container { padding-right: 20px; +} + +.skin-chooser{ +margin-bottom: 3px; +} +.samples-navigator{ +margin-bottom: 10px; } \ No newline at end of file Modified: root/examples/richfaces-showcase/trunk/src/main/webapp/resources/rich/css/panel.ecss =================================================================== --- root/examples/richfaces-showcase/trunk/src/main/webapp/resources/rich/css/panel.ecss 2010-06-01 13:23:33 UTC (rev 17450) +++ root/examples/richfaces-showcase/trunk/src/main/webapp/resources/rich/css/panel.ecss 2010-06-01 14:29:28 UTC (rev 17451) @@ -10,7 +10,7 @@ } .rich-panel-header { - padding: 2px; + padding: 7px 20px; border-width: 1px; border-style: solid; background-color: '#{richSkin.headerBackgroundColor}'; Modified: root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/component-sample.xhtml =================================================================== --- root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/component-sample.xhtml 2010-06-01 13:23:33 UTC (rev 17450) +++ root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/component-sample.xhtml 2010-06-01 14:29:28 UTC (rev 17451) @@ -14,7 +14,7 @@ </f:metadata> </ui:define> <ui:define name="body"> - <rich:panel> + <rich:panel styleClass="samples-navigator"> <ui:repeat value="#{demoNavigator.currentDemo.samples}" var="s" varStatus="status"> <h:link value="#{s.name}" includeViewParams="true"> <f:param name="sample" value="#{s.id}" /> @@ -23,7 +23,7 @@ <h:outputText value=" | " rendered="#{not status.last}" /> </ui:repeat> </rich:panel> - <fieldset><legend>#{demoNavigator.currentSample.name}</legend> + <fieldset><legend><b>#{demoNavigator.currentSample.name}</b></legend> <ui:include src="#{demoNavigator.sampleURI}" /></fieldset> </ui:define> </ui:composition> Modified: root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/poll/poll.xhtml =================================================================== --- root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/poll/poll.xhtml 2010-06-01 13:23:33 UTC (rev 17450) +++ root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/poll/poll.xhtml 2010-06-01 14:29:28 UTC (rev 17451) @@ -47,7 +47,7 @@ value="Server Date: #{pollBean.date}" /> </h:panelGrid> </h:form> - <rich:panel bodyClass="note"> + <rich:panel> <b>NOTE:</b>polling is automatically disabled in this demo after one minute of working. </rich:panel> </ui:composition> Modified: root/examples/richfaces-showcase/trunk/src/main/webapp/templates/includes/navigation.xhtml =================================================================== --- root/examples/richfaces-showcase/trunk/src/main/webapp/templates/includes/navigation.xhtml 2010-06-01 13:23:33 UTC (rev 17450) +++ root/examples/richfaces-showcase/trunk/src/main/webapp/templates/includes/navigation.xhtml 2010-06-01 14:29:28 UTC (rev 17451) @@ -11,7 +11,7 @@ <ul> <a4j:repeat value="#{demoNavigator.groups}" var="gr"> <li> - <h:outputText value="#{gr.name}" /> + <h:outputText value="#{gr.name}" style="font-weight:bold"/> <h:outputText rendered="#{gr.newItem}" value="NEW!" styleClass="new_marker" /> </li> <ul> Modified: root/examples/richfaces-showcase/trunk/src/main/webapp/templates/includes/skin-chooser.xhtml =================================================================== --- root/examples/richfaces-showcase/trunk/src/main/webapp/templates/includes/skin-chooser.xhtml 2010-06-01 13:23:33 UTC (rev 17450) +++ root/examples/richfaces-showcase/trunk/src/main/webapp/templates/includes/skin-chooser.xhtml 2010-06-01 14:29:28 UTC (rev 17451) @@ -7,7 +7,7 @@ xmlns:rich="http://java.sun.com/jsf/composite/rich"> <ui:composition> - <rich:panel> + <rich:panel styleClass="skin-chooser"> <a4j:repeat var="skin" value="#{skinBean.skins}" iterationStatusVar="iterStatus"> <h:link value="#{skin}" includeViewParams="true"> <f:param name="skin" value="#{skin}"/> Modified: root/examples/richfaces-showcase/trunk/src/main/webapp/templates/main.xhtml =================================================================== --- root/examples/richfaces-showcase/trunk/src/main/webapp/templates/main.xhtml 2010-06-01 13:23:33 UTC (rev 17450) +++ root/examples/richfaces-showcase/trunk/src/main/webapp/templates/main.xhtml 2010-06-01 14:29:28 UTC (rev 17451) @@ -38,14 +38,13 @@ <tr> <td width="100%" height="100%" class="bg_tabbody" colspan="2"> <table cellpadding="0" cellspacing="0" border="0" width="100%" - height="100%" class="rich-page-content #{cc.attrs.contentClass}"> + height="100%" class="rich-page-content"> <tbody> <tr> - <td class="menu_col rich-page-sidebar #{cc.attrs.sidebarClass}"> - <div class="menu_width spacer" - style="width:#{cc.attrs.sidebarWidth}px"></div> + <td class="menu_col rich-page-sidebar"> + <div class="menu_width spacer"></div> <ui:include src="/templates/includes/navigation.xhtml" /></td> - <td class="content_col rich-page-body #{cc.attrs.bodyClass}"> + <td class="content_col rich-page-body"> <ui:remove> <fieldset> @@ -64,7 +63,7 @@ <tr> <td class="footer_bg" colspan="2"> <div - class="footer_bg_content rich-page-footer #{cc.attrs.footerClass}"> + class="footer_bg_content rich-page-footer"> RichFaces 4.0 ALPHA 2</div> </td> </tr>