Skip to content

Commit

Permalink
Item13972: update and extend fontawesome icons
Browse files Browse the repository at this point in the history
  • Loading branch information
MichaelDaum committed Feb 23, 2016
1 parent b17c63e commit 0829481
Show file tree
Hide file tree
Showing 13 changed files with 1,902 additions and 44 deletions.
223 changes: 220 additions & 3 deletions JQueryPlugin/data/System/JQueryFontAwesome.txt

Large diffs are not rendered by default.

5 changes: 4 additions & 1 deletion JQueryPlugin/data/System/VarJQICON.txt
@@ -1,4 +1,4 @@
%META:TOPICINFO{author="ProjectContributor" date="1434650530" format="1.1" version="1"}%
%META:TOPICINFO{author="ProjectContributor" comment="" date="1456220586" format="1.1" version="1"}%
%META:TOPICPARENT{name="Macros"}%
---+ JQICON -- render an image
Renders an icon image as found on an _icon search path_. The icon search path is [[%SCRIPTURLPATH{"configure"}%][configured]] Extensions tab, JQueryPlugin sub-tab in ={JQueryPlugin}{IconSearchPath}= and
Expand All @@ -11,6 +11,7 @@ Renders an icon image as found on an _icon search path_. The icon search path is
| *Parameter* | *Description* | *Default* |
| ="name"= | name of the icon to display | |
| =class= | additional css class for the img tag | |
| =animate= | can be one of bounce, burst, flash, float, horizontal, passing, pulse, ring, shake, spin, tada, vertical, wrench |
| =alt= | | alt attribute |
| =title= | title attribute | |
| =style= | css style format to be added to the image element |
Expand All @@ -31,6 +32,7 @@ Example for famfamfam icons:<verbatim class="tml">
%JQICON{"lightbulb"}%
%JQICON{"camera"}%
%JQICON{"date"}%
%JQICON{"heart" animate="bounce"}%
</verbatim> Produces:
%JQICON{"tick" alt="alternative content" title="this is a tick icon"}%
%JQICON{"cross"}%
Expand All @@ -39,6 +41,7 @@ Example for famfamfam icons:<verbatim class="tml">
%JQICON{"lightbulb"}%
%JQICON{"camera"}%
%JQICON{"date"}%
%JQICON{"heart" animate="bounce"}%
Example for font-awesome icons:<verbatim class="tml">
%JQICON{"fa-pagelines" style="font-size:1em;color:#00BF00"}%
%JQICON{"fa-pagelines" style="font-size:2em;color:#0FAF0F"}%
Expand Down
2 changes: 1 addition & 1 deletion JQueryPlugin/data/System/VarJQICONPATH.txt
@@ -1,4 +1,4 @@
%META:TOPICINFO{author="ProjectContributor" date="1434650530" format="1.1" version="1"}%
%META:TOPICINFO{author="ProjectContributor" date="1456220586" format="1.1" version="1"}%
%META:TOPICPARENT{name="Macros"}%
---+ JQICONPATH -- render the urlpath to an image
This is a shortcut for
Expand Down
4 changes: 2 additions & 2 deletions JQueryPlugin/lib/Foswiki/Plugins/JQueryPlugin/FONTAWESOME.pm
Expand Up @@ -28,10 +28,10 @@ sub new {
my $this = bless(
$class->SUPER::new(
name => 'FontAwesome',
version => '4.2.0',
version => '4.5.0',
author => 'Dave Gandy',
homepage => 'http://fontawesome.io',
css => ['fontawesome.css'],
css => [ 'fontawesome.css', 'icon-animate.css' ],
),
$class
);
Expand Down
Binary file not shown.
51 changes: 49 additions & 2 deletions JQueryPlugin/pub/System/JQueryPlugin/plugins/fontawesome/Makefile
@@ -1,4 +1,51 @@
FOSWIKI_ROOT?=~/foswiki/trunk/core
TARGET=fontawesome.css
FOSWIKI_ROOT?=~/foswiki/core
TARGET=\
fontawesome.css \
icon-animate.css \
FontAwesome.otf \
fontawesome-webfont.eot \
fontawesome-webfont.svg \
fontawesome-webfont.ttf \
fontawesome-webfont.woff \
fontawesome-webfont.woff2

FONTAWESOME_GIT=fontawesome-git
FONTAWESOME_ANIMATION_GIT=fontawesome-animation-git

-include $(FOSWIKI_ROOT)/pub/System/JQueryPlugin/Makefile.include

git: git-fontawesome git-fontawesome-animation

git-fontawesome:
git clone https://github.com/FortAwesome/Font-Awesome.git $@

git-fontawesome-animation:
git clone https://github.com/l-lin/font-awesome-animation.git $@

ifneq (,$(wildcard git-fontawesome))
icon-animate.uncompressed.css: git-fontawesome-animation/dist/font-awesome-animation.css
cat $^ |sed 's/..\/fonts\///g' > $@
endif

ifneq (,$(wildcard git-fontawesome))
fontawesome.uncompressed.css: git-fontawesome/css/font-awesome.css
cat $^ |sed 's/..\/fonts\///g' > $@

%.otf: fontawesome-git/fonts/%.otf
cp $< $@

%.eot: fontawesome-git/fonts/%.eot
cp $< $@

%.svg: fontawesome-git/fonts/%.svg
cp $< $@

%.ttf: fontawesome-git/fonts/%.ttf
cp $< $@

%.woff: fontawesome-git/fonts/%.woff
cp $< $@

%.woff2: fontawesome-git/fonts/%.woff2
cp $< $@
endif
Binary file not shown.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file not shown.
Binary file not shown.

0 comments on commit 0829481

Please sign in to comment.