diff --git a/src/main/java/com/commafeed/frontend/pages/WelcomePage.html b/src/main/java/com/commafeed/frontend/pages/WelcomePage.html index 1216e287..d7b1e43e 100644 --- a/src/main/java/com/commafeed/frontend/pages/WelcomePage.html +++ b/src/main/java/com/commafeed/frontend/pages/WelcomePage.html @@ -4,23 +4,23 @@
-
-

- - - -

+
+ Bloat-free feed reader
-

- CommaFeed is a bloat-free feed reader. It aims to replace Google Reader while keeping things simple. -
- - -
- Try out the demo. +

+
+
diff --git a/src/main/java/com/commafeed/frontend/utils/WicketUtils.java b/src/main/java/com/commafeed/frontend/utils/WicketUtils.java index 31da2eed..881e9b20 100644 --- a/src/main/java/com/commafeed/frontend/utils/WicketUtils.java +++ b/src/main/java/com/commafeed/frontend/utils/WicketUtils.java @@ -11,11 +11,20 @@ import org.apache.wicket.markup.head.JavaScriptHeaderItem; import org.apache.wicket.protocol.http.servlet.ServletWebRequest; import org.apache.wicket.request.cycle.RequestCycle; import org.apache.wicket.request.http.WebResponse; +import org.apache.wicket.request.resource.JavaScriptResourceReference; import org.apache.wicket.util.io.IOUtils; import org.apache.wicket.util.template.PackageTextTemplate; public class WicketUtils { + public static void loadJS(IHeaderResponse response, Class klass, + String fileName) { + HeaderItem result = JavaScriptHeaderItem + .forReference(new JavaScriptResourceReference(klass, fileName + + ".js")); + response.render(result); + } + public static void loadJS(IHeaderResponse response, Class klass, String fileName, Map variables) { HeaderItem result = null; diff --git a/src/main/webapp/images/logo.png b/src/main/webapp/images/logo.png index 70fc0a4d..cb17cb87 100644 Binary files a/src/main/webapp/images/logo.png and b/src/main/webapp/images/logo.png differ diff --git a/src/main/webapp/images/logo_2.png b/src/main/webapp/images/logo_2.png new file mode 100644 index 00000000..6a1dbea8 Binary files /dev/null and b/src/main/webapp/images/logo_2.png differ diff --git a/src/main/webapp/images/logo_censored.png b/src/main/webapp/images/logo_censored.png deleted file mode 100644 index cb17cb87..00000000 Binary files a/src/main/webapp/images/logo_censored.png and /dev/null differ diff --git a/src/main/webapp/images/preview.jpg b/src/main/webapp/images/preview.jpg new file mode 100644 index 00000000..65a97e1a Binary files /dev/null and b/src/main/webapp/images/preview.jpg differ diff --git a/src/main/webapp/images/preview.png b/src/main/webapp/images/preview.png deleted file mode 100644 index fb04407e..00000000 Binary files a/src/main/webapp/images/preview.png and /dev/null differ diff --git a/src/main/webapp/sass/generic/_misc.scss b/src/main/webapp/sass/generic/_misc.scss index c978cfdc..877152dd 100644 --- a/src/main/webapp/sass/generic/_misc.scss +++ b/src/main/webapp/sass/generic/_misc.scss @@ -15,8 +15,19 @@ margin: 20px 0 40px 0; } +.welcome .tagline { + color: #B3B3B3; + font-size: 28px; + padding-top: 110px; +} + .welcome .preview { - margin: 40px 0 20px 0; + margin: 20px 0 20px 0; +} + +.welcome .demo { + font-size: 24px; + color: #B3B3B3; } .main .spinner {