Skip to content

Commit

Permalink
-- update to fontawesome 4.6.3
Browse files Browse the repository at this point in the history
  • Loading branch information
julkuh committed Jul 27, 2016
1 parent 94c0e1a commit 9f7633b
Show file tree
Hide file tree
Showing 11 changed files with 152 additions and 25 deletions.
10 changes: 5 additions & 5 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>de.conterra.devnet</groupId>
<artifactId>ct-mapapps-fontawesome</artifactId>
<version>1.0.1-SNAPSHOT</version>
<version>3.0.2-SNAPSHOT</version>
<packaging>jar</packaging>
<!-- DISABLE repositories and pluginRepositories if inside the con terra! -->
<repositories>
Expand Down Expand Up @@ -251,7 +251,7 @@
<!-- add here properties which are used in plugin configuration resolution -->
<properties>
<!-- deployment of map.apps installation -->
<mapapps.remote.base>http://vsdev1114.esri-de.com/ct-mapapps-webapp-3.2.1</mapapps.remote.base>
<mapapps.remote.base>http://vsdev1114.esri-de.com/ct-mapapps-webapp-3.5.2</mapapps.remote.base>
</properties>
</configuration>
</plugin>
Expand Down Expand Up @@ -466,10 +466,10 @@
<!-- dojo custom build parameters -->
<js.build.outputPath>${project.build.directory}/${project.artifactId}/js</js.build.outputPath>
<!-- mapapps.version -->
<mapapps.version>3.2.1</mapapps.version>
<mapapps.version>3.5.2</mapapps.version>
<!-- java lib versions -->
<ct.jsregistry.version>1.0.9</ct.jsregistry.version>
<ct.jsrt-test.version>1.0.6</ct.jsrt-test.version>
<ct.jsregistry.version>1.0.15</ct.jsregistry.version>
<ct.jsrt-test.version>1.0.7</ct.jsrt-test.version>

<!-- the default app, replaced in the *.html files to switch app names-->
<default.app.name>sample</default.app.name>
Expand Down
4 changes: 4 additions & 0 deletions src/main/js/apps/sample/app.json
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,10 @@
"activateOnStartup": true
}
},
{
"id": "tool0",
"iconClass": "fa-font-awesome"
},
{
"id": "tool1",
"iconClass": "fa-coffee"
Expand Down
98 changes: 97 additions & 1 deletion src/main/js/bundles/dn_fontawesome/css/font-awesome.css
Original file line number Diff line number Diff line change
Expand Up @@ -194,6 +194,8 @@
.fa-inverse {
color: #ffffff;
}
/* Font Awesome uses the Unicode Private Use Area (PUA) to ensure screen
readers do not read off random characters that represent icons */
/* Font Awesome uses the Unicode Private Use Area (PUA) to ensure screen
readers do not read off random characters that represent icons */
.fa-glass:before {
Expand Down Expand Up @@ -1399,7 +1401,7 @@
.fa-digg:before {
content: "\f1a6";
}
.fa-pied-piper:before {
.fa-pied-piper-pp:before {
content: "\f1a7";
}
.fa-pied-piper-alt:before {
Expand Down Expand Up @@ -1525,6 +1527,7 @@
content: "\f1ce";
}
.fa-ra:before,
.fa-resistance:before,
.fa-rebel:before {
content: "\f1d0";
}
Expand Down Expand Up @@ -2100,3 +2103,96 @@
.fa-percent:before {
content: "\f295";
}
.fa-gitlab:before {
content: "\f296";
}
.fa-wpbeginner:before {
content: "\f297";
}
.fa-wpforms:before {
content: "\f298";
}
.fa-envira:before {
content: "\f299";
}
.fa-universal-access:before {
content: "\f29a";
}
.fa-wheelchair-alt:before {
content: "\f29b";
}
.fa-question-circle-o:before {
content: "\f29c";
}
.fa-blind:before {
content: "\f29d";
}
.fa-audio-description:before {
content: "\f29e";
}
.fa-volume-control-phone:before {
content: "\f2a0";
}
.fa-braille:before {
content: "\f2a1";
}
.fa-assistive-listening-systems:before {
content: "\f2a2";
}
.fa-asl-interpreting:before,
.fa-american-sign-language-interpreting:before {
content: "\f2a3";
}
.fa-deafness:before,
.fa-hard-of-hearing:before,
.fa-deaf:before {
content: "\f2a4";
}
.fa-glide:before {
content: "\f2a5";
}
.fa-glide-g:before {
content: "\f2a6";
}
.fa-signing:before,
.fa-sign-language:before {
content: "\f2a7";
}
.fa-low-vision:before {
content: "\f2a8";
}
.fa-viadeo:before {
content: "\f2a9";
}
.fa-viadeo-square:before {
content: "\f2aa";
}
.fa-snapchat:before {
content: "\f2ab";
}
.fa-snapchat-ghost:before {
content: "\f2ac";
}
.fa-snapchat-square:before {
content: "\f2ad";
}
.fa-pied-piper:before {
content: "\f2ae";
}
.fa-first-order:before {
content: "\f2b0";
}
.fa-yoast:before {
content: "\f2b1";
}
.fa-themeisle:before {
content: "\f2b2";
}
.fa-google-plus-circle:before,
.fa-google-plus-official:before {
content: "\f2b3";
}
.fa-fa:before,
.fa-font-awesome:before {
content: "\f2b4";
}
5 changes: 1 addition & 4 deletions src/main/js/bundles/dn_fontawesome/css/font-awesome.min.css

Large diffs are not rendered by default.

Binary file modified src/main/js/bundles/dn_fontawesome/fonts/FontAwesome.otf
Binary file not shown.
Binary file modified src/main/js/bundles/dn_fontawesome/fonts/fontawesome-webfont.eot
Binary file not shown.
58 changes: 44 additions & 14 deletions src/main/js/bundles/dn_fontawesome/fonts/fontawesome-webfont.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/main/js/bundles/dn_fontawesome/fonts/fontawesome-webfont.ttf
Binary file not shown.
Binary file not shown.
Binary file not shown.
2 changes: 1 addition & 1 deletion src/main/js/bundles/dn_fontawesome/manifest.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"Bundle-SymbolicName": "dn_fontawesome",
"Bundle-Version": "3.0.1",
"Bundle-Version": "3.0.2",
"Bundle-Name": "${bundleName}",
"Bundle-Description": "${bundleDescription}",
"Product-Name": "con terra Developer Network",
Expand Down

0 comments on commit 9f7633b

Please sign in to comment.