Author: nbelaevski
Date: 2010-10-04 15:43:13 -0400 (Mon, 04 Oct 2010)
New Revision: 19437
Removed:
trunk/core/impl/src/main/java/org/richfaces/renderkit/html/images/TabHeaderGradient.java
trunk/core/impl/src/main/java/org/richfaces/renderkit/html/images/TopTabHeaderGradient.java
Modified:
trunk/ui/dist/richfaces-components-ui/pom.xml
trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/tabPanel.ecss
Log:
https://jira.jboss.org/browse/RF-9405
https://jira.jboss.org/browse/RF-8779
Deleted:
trunk/core/impl/src/main/java/org/richfaces/renderkit/html/images/TabHeaderGradient.java
===================================================================
---
trunk/core/impl/src/main/java/org/richfaces/renderkit/html/images/TabHeaderGradient.java 2010-10-04
19:32:49 UTC (rev 19436)
+++
trunk/core/impl/src/main/java/org/richfaces/renderkit/html/images/TabHeaderGradient.java 2010-10-04
19:43:13 UTC (rev 19437)
@@ -1,41 +0,0 @@
-/**
- * License Agreement.
- *
- * Rich Faces - Natural Ajax for Java Server Faces (JSF)
- *
- * Copyright (C) 2007 Exadel, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License version 2.1 as published by the Free Software Foundation.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-package org.richfaces.renderkit.html.images;
-
-import org.richfaces.renderkit.html.BaseGradient;
-import org.richfaces.skin.Skin;
-
-import javax.faces.context.FacesContext;
-
-/**
- * @author akolonitsky
- * @since Sep 30, 2010
- */
-public class TabHeaderGradient extends BaseGradient {
-
- @Override
- protected void initializeProperties(FacesContext context, Skin skin) {
- super.initializeProperties(context, skin);
- setBaseColorParam(Skin.GENERAL_BACKGROUND_COLOR);
- setGradientColorParam(Skin.TAB_BACKGROUND_COLOR);
- }
-}
Deleted:
trunk/core/impl/src/main/java/org/richfaces/renderkit/html/images/TopTabHeaderGradient.java
===================================================================
---
trunk/core/impl/src/main/java/org/richfaces/renderkit/html/images/TopTabHeaderGradient.java 2010-10-04
19:32:49 UTC (rev 19436)
+++
trunk/core/impl/src/main/java/org/richfaces/renderkit/html/images/TopTabHeaderGradient.java 2010-10-04
19:43:13 UTC (rev 19437)
@@ -1,41 +0,0 @@
-/**
- * License Agreement.
- *
- * Rich Faces - Natural Ajax for Java Server Faces (JSF)
- *
- * Copyright (C) 2007 Exadel, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License version 2.1 as published by the Free Software Foundation.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-package org.richfaces.renderkit.html.images;
-
-import org.richfaces.renderkit.html.BaseGradient;
-import org.richfaces.skin.Skin;
-
-import javax.faces.context.FacesContext;
-
-/**
- * @author akolonitsky
- * @since Sep 30, 2010
- */
-public class TopTabHeaderGradient extends BaseGradient {
-
- @Override
- protected void initializeProperties(FacesContext context, Skin skin) {
- super.initializeProperties(context, skin);
- setBaseColorParam(Skin.TAB_BACKGROUND_COLOR);
- setGradientColorParam(Skin.GENERAL_BACKGROUND_COLOR);
- }
-}
Modified: trunk/ui/dist/richfaces-components-ui/pom.xml
===================================================================
--- trunk/ui/dist/richfaces-components-ui/pom.xml 2010-10-04 19:32:49 UTC (rev 19436)
+++ trunk/ui/dist/richfaces-components-ui/pom.xml 2010-10-04 19:43:13 UTC (rev 19437)
@@ -137,6 +137,9 @@
</taglibs>
</transformer>
<transformer
implementation="org.richfaces.build.shade.resource.FacesConfigXmlResourceTransformer"
/>
+ <transformer
implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
+
<resource>META-INF/richfaces/resource-mappings.properties</resource>
+ </transformer>
</transformers>
</configuration>
</execution>
Modified:
trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/tabPanel.ecss
===================================================================
---
trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/tabPanel.ecss 2010-10-04
19:32:49 UTC (rev 19436)
+++
trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/tabPanel.ecss 2010-10-04
19:43:13 UTC (rev 19437)
@@ -4,7 +4,7 @@
cursor : pointer;
padding : 0px 5px 3px 5px;
vertical-align : top;
- background-image:
"url(#{resource['org.richfaces.renderkit.html.images.TabHeaderGradient']})";
+ background-image:
"url(#{resource['org.richfaces.images:tabBg.png']})";
background-position: top;
background-repeat: repeat-x;
background-color: "#{richSkin.tabBackgroundColor}";
@@ -16,7 +16,7 @@
border-bottom: 0px;
font-weight: bold;
vertical-align: top;
- background-image:
"url(#{resource['org.richfaces.renderkit.html.images.TopTabHeaderGradient']})";
+ background-image:
"url(#{resource['org.richfaces.images:actTabBg.png']})";
background-position: top;
background-repeat: repeat-x;
background-color: "#{richSkin.additionalBackgroundColor}";
@@ -32,10 +32,15 @@
}
.rf-tb-hdr-tabline-vis {
- background:url("tabline_bg.gif") repeat-x scroll center top #EEF4FB;
- border-color:#A6A6A6 #A6A6A6 -moz-use-text-color;
- border-style:solid solid none;
- border-width:1px 1px 0;
+ background:url("tabline_bg.gif") repeat-x scroll center top;
+ background-color: "#{richSkin.additionalBackgroundColor}";
+
+ border-color: "#{richSkin.panelBorderColor}";
+ border-style: solid;
+ border-width: 1px;
+
+ border-bottom-width: 0px;
+
padding-top: 2px;
overflow: hidden;
height: 25px;
@@ -68,7 +73,7 @@
}
.rf-tb-hdr-scrl_l {
- background:
"url(#{resource['org.richfaces.renderkit.html.images.TopTabHeaderGradient']})
top repeat-x #{richSkin.additionalBackgroundColor}";
+ background: "url(#{resource['org.richfaces.images:actTabBg.png']}) top
repeat-x #{richSkin.additionalBackgroundColor}";
position: absolute;
top: 1px;
left: 1px;
@@ -83,7 +88,7 @@
}
.rf-tb-hdr-scrl_r {
- background:
"url(#{resource['org.richfaces.renderkit.html.images.TopTabHeaderGradient']})
top repeat-x #{richSkin.additionalBackgroundColor}";
+ background: "url(#{resource['org.richfaces.images:actTabBg.png']}) top
repeat-x #{richSkin.additionalBackgroundColor}";
position: absolute;
top: 1px;
right: 17px;
@@ -98,7 +103,7 @@
}
.rf-tb-hdr-tablst {
- background:
"url(#{resource['org.richfaces.renderkit.html.images.TopTabHeaderGradient']})
top repeat-x #{richSkin.additionalBackgroundColor}";
+ background: "url(#{resource['org.richfaces.images:actTabBg.png']}) top
repeat-x #{richSkin.additionalBackgroundColor}";
position: absolute;
top: 1px;
right: 1px;