Skip to content

Commit f0e8b87

Browse files
committed
Merge commit 'd4166e9ebf2cafa71c380f6e88ef22d841376641' into button-params
2 parents 371d680 + d4166e9 commit f0e8b87

31 files changed

+5034
-5380
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,4 @@
77
*~
88
/.classpath
99
/.project
10+
.vscode/

pom.xml

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<groupId>org.primefaces</groupId>
1212
<artifactId>primefaces</artifactId>
1313
<packaging>jar</packaging>
14-
<version>6.2-SNAPSHOT</version>
14+
<version>6.2.RC1</version>
1515
<name>primefaces</name>
1616
<url>http://www.primefaces.org</url>
1717

@@ -687,8 +687,24 @@
687687
</plugin>
688688

689689
</plugins>
690+
691+
<extensions>
692+
<extension>
693+
<groupId>org.apache.maven.wagon</groupId>
694+
<artifactId>wagon-ssh</artifactId>
695+
<version>1.0</version>
696+
</extension>
697+
</extensions>
690698
</build>
691699

700+
<distributionManagement>
701+
<repository>
702+
<id>prime-repo</id>
703+
<name>PrimeFaces Maven Repository</name>
704+
<url>sftp://primefaces.org/var/www/repository</url>
705+
</repository>
706+
</distributionManagement>
707+
692708
<profiles>
693709
<profile>
694710
<id>release</id>

src/main/java/org/primefaces/mobile/renderkit/HeadRenderer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ public void encodeBegin(FacesContext context, UIComponent component) throws IOEx
6262
renderCSS(context, "mobile/primefaces-mobile.css", "primefaces");
6363

6464
if (cc.isFontAwesomeEnabled()) {
65-
renderCSS(context, "fa/fontawesome-all.css", "primefaces");
65+
renderCSS(context, "fa/font-awesome.css", "primefaces");
6666
}
6767

6868
renderJS(context, "jquery/jquery.js", "primefaces");

src/main/java/org/primefaces/renderkit/HeadRenderer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ public void encodeBegin(FacesContext context, UIComponent component) throws IOEx
8282
}
8383

8484
if (cc.isFontAwesomeEnabled()) {
85-
encodeCSS(context, "primefaces", "fa/fontawesome-all.css");
85+
encodeCSS(context, "primefaces", "fa/font-awesome.css");
8686
}
8787

8888
//Middle facet

src/main/resources/META-INF/resources/primefaces/core/core.css

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -97,14 +97,8 @@ ui-overlay-visible * {
9797
}
9898

9999
/* FontAwesome */
100-
.ui-widget .ui-icon.fa,
101-
.ui-icon.fa,
102-
.ui-widget .ui-icon.fab,
103-
.ui-icon.fab,
104-
.ui-widget .ui-icon.far,
105-
.ui-icon.far,
106-
.ui-widget .ui-icon.fas,
107-
.ui-icon.fas {
100+
.ui-widget .ui-icon.fa,
101+
.ui-icon.fa {
108102
background: none repeat scroll 0 0 transparent !important;
109103
text-indent: 0px !important;
110104
}
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

0 commit comments

Comments
 (0)