Author: adrianc
Date: Wed Jan 19 23:09:37 2011
New Revision: 1061056
URL: http://svn.apache.org/viewvc?rev=1061056&view=rev
Log:
Made the Find Screen "Search Results" text match the "Search Options" text.
Also includes a layout demo and the CSS changes needed for the Flat Grey visual
theme.
This is kind of kludgy. We need a screenlet-title style.
Modified:
ofbiz/trunk/framework/common/widget/CommonScreens.xml
ofbiz/trunk/framework/webtools/widget/MiscScreens.xml
ofbiz/trunk/themes/flatgrey/webapp/flatgrey/maincss.css
Modified: ofbiz/trunk/framework/common/widget/CommonScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/widget/CommonScreens.xml?rev=1061056&r1=1061055&r2=1061056&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/framework/common/widget/CommonScreens.xml Wed Jan 19 23:09:37
2011
@@ -489,7 +489,7 @@ under the License.
</container>
</screenlet>
<screenlet padded="false">
- <label style="h2"
text="${uiLabelMap.CommonSearchResults}"/>
+ <label style="h3"
text="${uiLabelMap.CommonSearchResults}"/>
<container id="search-results">
<decorator-section-include name="search-results"/>
</container>
Modified: ofbiz/trunk/framework/webtools/widget/MiscScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/widget/MiscScreens.xml?rev=1061056&r1=1061055&r2=1061056&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/widget/MiscScreens.xml (original)
+++ ofbiz/trunk/framework/webtools/widget/MiscScreens.xml Wed Jan 19 23:09:37
2011
@@ -164,6 +164,10 @@ under the License.
<screenlet>
<label text="${demoText}"/>
</screenlet>
+ <screenlet
title="${uiLabelMap.WebtoolsLayoutDemo}" padded="false">
+ <!-- For aligning screenlet body
h3 elements with screenlet title h3 elements -->
+ <label style="h3"
text="${demoText}"/>
+ </screenlet>
<screenlet
title="${uiLabelMap.WebtoolsLayoutDemo}" id="screenlet-demo" collapsible="true">
<include-form
name="LayoutDemoForm" location="component://webtools/widget/MiscForms.xml"/>
</screenlet>
Modified: ofbiz/trunk/themes/flatgrey/webapp/flatgrey/maincss.css
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/themes/flatgrey/webapp/flatgrey/maincss.css?rev=1061056&r1=1061055&r2=1061056&view=diff
==============================================================================
--- ofbiz/trunk/themes/flatgrey/webapp/flatgrey/maincss.css (original)
+++ ofbiz/trunk/themes/flatgrey/webapp/flatgrey/maincss.css Wed Jan 19 23:09:37
2011
@@ -509,9 +509,13 @@ padding: 0;
border: none;
}
+.no-padding .h1,
+.no-padding .h2,
+.no-padding .h3,
+.no-paddingr h1,
.no-padding h2,
-.no-padding .h2 {
-padding: 0.4em;
+.no-padding h3 {
+padding: 0.7em;
}
/* ----------------------------------- */
@@ -569,8 +573,7 @@ font-size: 1.3em;
}
.screenlet-title-bar h3,
-.screenlet-title-bar .h3,
-.screenlet-title-bar .head4 {
+.screenlet-title-bar .h3 {
font-size: 1.1em;
}
