From 405d68168bd5a0d3d85f567503af4f6ebe0eac5b Mon Sep 17 00:00:00 2001 From: Athou Date: Sun, 14 Apr 2013 19:02:24 +0200 Subject: [PATCH] use fontawesome --- .../commafeed/frontend/pages/HomePage.java | 4 ++++ .../fontawesome/FontAwesomeReference.java | 23 +++++++++++++++++++ src/main/webapp/css/app.css | 6 ----- src/main/webapp/templates/_subscribe.html | 2 +- 4 files changed, 28 insertions(+), 7 deletions(-) create mode 100644 src/main/java/com/commafeed/frontend/references/fontawesome/FontAwesomeReference.java diff --git a/src/main/java/com/commafeed/frontend/pages/HomePage.java b/src/main/java/com/commafeed/frontend/pages/HomePage.java index f331a39c..fe721cc0 100644 --- a/src/main/java/com/commafeed/frontend/pages/HomePage.java +++ b/src/main/java/com/commafeed/frontend/pages/HomePage.java @@ -20,6 +20,8 @@ import com.commafeed.frontend.references.angularui.AngularUIReference; import com.commafeed.frontend.references.angularuibootstrap.AngularUIBootstrapReference; import com.commafeed.frontend.references.angularuistate.AngularUIStateReference; import com.commafeed.frontend.references.codemirror.CodeMirrorCssReference; +import com.commafeed.frontend.references.codemirror.CodeMirrorReference; +import com.commafeed.frontend.references.fontawesome.FontAwesomeReference; import com.commafeed.frontend.references.mousetrap.MouseTrapReference; import com.commafeed.frontend.references.nggrid.NGGridReference; import com.commafeed.frontend.references.nginfinitescroll.NGInfiniteScrollReference; @@ -48,7 +50,9 @@ public class HomePage extends BasePage { SpinJSReference.renderHead(response); MouseTrapReference.renderHead(response); NGGridReference.renderHead(response); + CodeMirrorReference.renderHead(response); CodeMirrorCssReference.renderHead(response); + FontAwesomeReference.renderHead(response); response.render(JavaScriptHeaderItem.forUrl("js/main.js")); response.render(JavaScriptHeaderItem.forUrl("js/controllers.js")); diff --git a/src/main/java/com/commafeed/frontend/references/fontawesome/FontAwesomeReference.java b/src/main/java/com/commafeed/frontend/references/fontawesome/FontAwesomeReference.java new file mode 100644 index 00000000..66e74f2e --- /dev/null +++ b/src/main/java/com/commafeed/frontend/references/fontawesome/FontAwesomeReference.java @@ -0,0 +1,23 @@ +package com.commafeed.frontend.references.fontawesome; + +import org.apache.wicket.markup.head.CssHeaderItem; +import org.apache.wicket.markup.head.IHeaderResponse; +import org.apache.wicket.request.Url; +import org.apache.wicket.request.resource.UrlResourceReference; + +public class FontAwesomeReference extends UrlResourceReference { + + private static final long serialVersionUID = 1L; + + public static final FontAwesomeReference INSTANCE = new FontAwesomeReference(); + + public FontAwesomeReference() { + super( + Url.parse("https://netdna.bootstrapcdn.com/font-awesome/3.0.2/css/font-awesome.css")); + } + + public static void renderHead(final IHeaderResponse response) { + response.render(CssHeaderItem.forReference(INSTANCE)); + } + +} diff --git a/src/main/webapp/css/app.css b/src/main/webapp/css/app.css index 1101fbba..b44fb12b 100644 --- a/src/main/webapp/css/app.css +++ b/src/main/webapp/css/app.css @@ -1,9 +1,3 @@ -@import url(http://weloveiconfonts.com/api/?family=openwebicons); - -[class*="openwebicons-"]:before { - font-family: 'OpenWeb Icons', sans-serif; -} - .pointer { cursor: pointer; } diff --git a/src/main/webapp/templates/_subscribe.html b/src/main/webapp/templates/_subscribe.html index b8a542b9..dd3bedcb 100644 --- a/src/main/webapp/templates/_subscribe.html +++ b/src/main/webapp/templates/_subscribe.html @@ -1,6 +1,6 @@
- +