From 3173d70aace8f458c7def2ea59a3c8ec5ce0d1ff Mon Sep 17 00:00:00 2001
From: pixeldesu <pixeldesu@nerdwerks.org>
Date: Sat, 13 Dec 2014 17:52:58 +0100
Subject: [PATCH] added new frontpage design
---
app/assets/stylesheets/base.css.scss | 5 +++++
app/views/static/_front.html.haml | 29 ++++++++++++++++++++++++++++
app/views/static/index.html.haml | 13 +------------
3 files changed, 35 insertions(+), 12 deletions(-)
create mode 100644 app/views/static/_front.html.haml
diff --git a/app/assets/stylesheets/base.css.scss b/app/assets/stylesheets/base.css.scss
index 9cb23168..13fe25dd 100644
--- a/app/assets/stylesheets/base.css.scss
+++ b/app/assets/stylesheets/base.css.scss
@@ -27,4 +27,9 @@ body {
#load-more-btn {
margin-bottom: 1.5em;
+}
+
+.j2-jumbo {
+ background-color: darken($navbar-inverse-bg, 10%);
+ color: #fff;
}
\ No newline at end of file
diff --git a/app/views/static/_front.html.haml b/app/views/static/_front.html.haml
new file mode 100644
index 00000000..2d17ef41
--- /dev/null
+++ b/app/views/static/_front.html.haml
@@ -0,0 +1,29 @@
+.jumbotron.j2-jumbo.text-center
+ .container
+ = render 'layouts/messages'
+ %h1 justask
+ %p Ask questions, give answers and learn more about your friends.
+ %p
+ %a.btn.btn-primary.btn-lg{href: url_for(new_user_registration_path)}
+ Register now
+ %small
+ Already a member?
+ = link_to 'Sign in', new_user_session_path
+ %h2 Features
+ .row
+ .col-md-4.col-sm-4.col-xs-12
+ %h3
+ Ask and receive questions
+ %p
+ With justask you can ask users questions and receive some from other users or unregistered people! Need to know something more? Keep the discussion ongoing with comments!
+ .col-md-4.col-sm-4.col-xs-12
+ %h3
+ Follow users and get followed
+ %p
+ Following users will allow you to get a personalized feed of all people you want to know more about! Also, you can send a question to all your followers at once!
+ .col-md-4.col-sm-4.col-xs-12
+ %h3
+ Sharing to other networks
+ %p
+ Want to share the answer you just wrote to a question you think more people should know about? With the simple press of a button your answer is shared where you want!
+ = render "shared/links"
\ No newline at end of file
diff --git a/app/views/static/index.html.haml b/app/views/static/index.html.haml
index 35df07d2..9df8f294 100644
--- a/app/views/static/index.html.haml
+++ b/app/views/static/index.html.haml
@@ -55,15 +55,4 @@
Load more
.visible-xs= render 'shared/links'
- else
- .jumbotron
- .container
- = render 'layouts/messages'
- %h1 Hi!
- %p Ask questions, give answers and learn more about your friends.
- %p
- %a.btn.btn-primary.btn-lg{href: url_for(new_user_registration_path)}
- Register now
- %small
- Already a member?
- = link_to 'Sign in', new_user_session_path
- = render "shared/links"
\ No newline at end of file
+ = render 'static/front'
\ No newline at end of file