Author: abelevich
Date: 2010-10-28 08:08:05 -0400 (Thu, 28 Oct 2010)
New Revision: 19724
Modified:
trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inplaceInput.ecss
trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inplaceSelect.ecss
trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/select.ecss
trunk/ui/input/ui/src/test/resources/org/richfaces/renderkit/inplaceSelectTestDefault.xmlunit.xml
trunk/ui/input/ui/src/test/resources/org/richfaces/renderkit/inplaceSelectTestEdit.xmlunit.xml
trunk/ui/input/ui/src/test/resources/org/richfaces/renderkit/inplaceSelectTestWithControls.xmlunit.xml
Log:
fix test, add styles for fonts
Modified:
trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inplaceInput.ecss
===================================================================
---
trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inplaceInput.ecss 2010-10-28
10:59:38 UTC (rev 19723)
+++
trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inplaceInput.ecss 2010-10-28
12:08:05 UTC (rev 19724)
@@ -10,8 +10,9 @@
margin : 0px;
width : 100%;
height : 100%;
- font-family:inherit;
- font-size : inherit;
+ color: '#{richSkin.generalTextColor}';
+ font-family: '#{richSkin.generalFamilyFont}';
+ font-size : '#{richSkin.generalSizeFont}';
}
.rf-ii-edit {
@@ -27,6 +28,9 @@
.rf-ii-lbl {
white-space : nowrap;
+ color: '#{richSkin.generalTextColor}';
+ font-family: '#{richSkin.generalFamilyFont}';
+ font-size : '#{richSkin.generalSizeFont}';
}
.rf-ii-d-s {
@@ -62,6 +66,9 @@
margin : 0px;
width : 100%;
height : 100%
+ color: '#{richSkin.generalTextColor}';
+ font-family: '#{richSkin.generalFamilyFont}';
+ font-size : '#{richSkin.generalSizeFont}';
}
.rf-ii-strut {
Modified:
trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inplaceSelect.ecss
===================================================================
---
trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inplaceSelect.ecss 2010-10-28
10:59:38 UTC (rev 19723)
+++
trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inplaceSelect.ecss 2010-10-28
12:08:05 UTC (rev 19724)
@@ -1,3 +1,9 @@
+.rf-is-fld, .rf-is-opt, .rf-is-lbl {
+ color: '#{richSkin.generalTextColor}';
+ font-family: '#{richSkin.generalFamilyFont}';
+ font-size : '#{richSkin.generalSizeFont}';
+}
+
input.rf-is-fld {
background : '#{richSkin.editBackgroundColor}';
padding : 0px 0px 0px 0px;
@@ -7,8 +13,9 @@
background-image:"url(#{resource['org.richfaces:mark_list.gif']})";
background-position : center right;
background-repeat : no-repeat;
- font-family:inherit;
- font-size : inherit;
+ color: '#{richSkin.generalTextColor}';
+ font-family: '#{richSkin.generalFamilyFont}';
+ font-size : '#{richSkin.generalSizeFont}';
}
.rf-is-none {
@@ -99,10 +106,10 @@
.rf-is-lst-cord {
display : block;
- /*font-size : 0px;*/
position : relative;
- font-family:inherit;
- font-size : inherit;
+ color: '#{richSkin.generalTextColor}';
+ font-family: '#{richSkin.generalFamilyFont}';
+ font-size : '#{richSkin.generalSizeFont}';
}
.rf-is-lst-pos {
Modified:
trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/select.ecss
===================================================================
---
trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/select.ecss 2010-10-28
10:59:38 UTC (rev 19723)
+++
trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/select.ecss 2010-10-28
12:08:05 UTC (rev 19724)
@@ -1,5 +1,5 @@
-.rf-sel-inp.rf-s-fnt, .rf-sel-opt.rf-sel-fnt{
+.rf-sel-inp, .rf-sel-opt {
color: '#{richSkin.generalTextColor}';
font-size: '#{richSkin.generalSizeFont}';
font-family: '#{richSkin.generalFamilyFont}';
Modified:
trunk/ui/input/ui/src/test/resources/org/richfaces/renderkit/inplaceSelectTestDefault.xmlunit.xml
===================================================================
---
trunk/ui/input/ui/src/test/resources/org/richfaces/renderkit/inplaceSelectTestDefault.xmlunit.xml 2010-10-28
10:59:38 UTC (rev 19723)
+++
trunk/ui/input/ui/src/test/resources/org/richfaces/renderkit/inplaceSelectTestDefault.xmlunit.xml 2010-10-28
12:08:05 UTC (rev 19724)
@@ -17,16 +17,17 @@
<span class="rf-is-shdw-r"></span>
<span class="rf-is-shdw-b"></span>
<span class="rf-is-lst-dec">
- <span class="rf-is-lst-scrl"
id="form:inplaceSelectDefaultItems"
- style="height: 100px">
- <span id="form:inplaceSelectDefaultItem0"
class="rf-is-opt">Label#1
+ <span class="rf-is-lst-scrl" style="height: 100px">
+ <span id="form:inplaceSelectDefaultItems">
+ <span id="form:inplaceSelectDefaultItem0"
class="rf-is-opt">Label#1
+ </span>
+ <span id="form:inplaceSelectDefaultItem1"
class="rf-is-opt">Label#2
+ </span>
+ <span id="form:inplaceSelectDefaultItem2"
class="rf-is-opt">Label#3
+ </span>
+ <span id="form:inplaceSelectDefaultItem3"
class="rf-is-opt">Label#4
+ </span>
</span>
- <span id="form:inplaceSelectDefaultItem1"
class="rf-is-opt">Label#2
- </span>
- <span id="form:inplaceSelectDefaultItem2"
class="rf-is-opt">Label#3
- </span>
- <span id="form:inplaceSelectDefaultItem3"
class="rf-is-opt">Label#4
- </span>
</span>
</span>
</span>
Modified:
trunk/ui/input/ui/src/test/resources/org/richfaces/renderkit/inplaceSelectTestEdit.xmlunit.xml
===================================================================
---
trunk/ui/input/ui/src/test/resources/org/richfaces/renderkit/inplaceSelectTestEdit.xmlunit.xml 2010-10-28
10:59:38 UTC (rev 19723)
+++
trunk/ui/input/ui/src/test/resources/org/richfaces/renderkit/inplaceSelectTestEdit.xmlunit.xml 2010-10-28
12:08:05 UTC (rev 19724)
@@ -40,12 +40,17 @@
<span class="rf-is-shdw-r"></span>
<span class="rf-is-shdw-b"></span>
<span class="rf-is-lst-dec">
- <span class="rf-is-lst-scrl"
id="form:inplaceSelectEditItems"
- style="height: 100px">
- <span id="form:inplaceSelectEditItem0"
class="rf-is-opt">Label#1</span>
- <span id="form:inplaceSelectEditItem1"
class="rf-is-opt">Label#2</span>
- <span id="form:inplaceSelectEditItem2"
class="rf-is-opt">Label#3</span>
- <span id="form:inplaceSelectEditItem3"
class="rf-is-opt">Label#4</span>
+ <span class="rf-is-lst-scrl" style="height: 100px">
+ <span id="form:inplaceSelectEditItems">
+ <span id="form:inplaceSelectEditItem0"
class="rf-is-opt">Label#1
+ </span>
+ <span id="form:inplaceSelectEditItem1"
class="rf-is-opt">Label#2
+ </span>
+ <span id="form:inplaceSelectEditItem2"
class="rf-is-opt">Label#3
+ </span>
+ <span id="form:inplaceSelectEditItem3"
class="rf-is-opt">Label#4
+ </span>
+ </span>
</span>
</span>
</span>
Modified:
trunk/ui/input/ui/src/test/resources/org/richfaces/renderkit/inplaceSelectTestWithControls.xmlunit.xml
===================================================================
---
trunk/ui/input/ui/src/test/resources/org/richfaces/renderkit/inplaceSelectTestWithControls.xmlunit.xml 2010-10-28
10:59:38 UTC (rev 19723)
+++
trunk/ui/input/ui/src/test/resources/org/richfaces/renderkit/inplaceSelectTestWithControls.xmlunit.xml 2010-10-28
12:08:05 UTC (rev 19724)
@@ -41,16 +41,17 @@
<span class="rf-is-shdw-r"></span>
<span class="rf-is-shdw-b"></span>
<span class="rf-is-lst-dec">
- <span class="rf-is-lst-scrl"
id="form:inplaceSelectWithControlsItems"
- style="height: 100px">
- <span id="form:inplaceSelectWithControlsItem0"
class="rf-is-opt">Label#1
+ <span class="rf-is-lst-scrl" style="height: 100px">
+ <span id="form:inplaceSelectWithControlsItems">
+ <span id="form:inplaceSelectWithControlsItem0"
class="rf-is-opt">Label#1
+ </span>
+ <span id="form:inplaceSelectWithControlsItem1"
class="rf-is-opt">Label#2
+ </span>
+ <span id="form:inplaceSelectWithControlsItem2"
class="rf-is-opt">Label#3
+ </span>
+ <span id="form:inplaceSelectWithControlsItem3"
class="rf-is-opt">Label#4
+ </span>
</span>
- <span id="form:inplaceSelectWithControlsItem1"
class="rf-is-opt">Label#2
- </span>
- <span id="form:inplaceSelectWithControlsItem2"
class="rf-is-opt">Label#3
- </span>
- <span id="form:inplaceSelectWithControlsItem3"
class="rf-is-opt">Label#4
- </span>
</span>
</span>
</span>
@@ -58,6 +59,6 @@
</span>
</span>
<script type="text/javascript">
- // ignored
+ //ignore
</script>
</span>
\ No newline at end of file
Show replies by date