summaryrefslogtreecommitdiff
path: root/app/views/home
diff options
context:
space:
mode:
Diffstat (limited to 'app/views/home')
-rw-r--r--app/views/home/_content.html.haml6
-rw-r--r--app/views/home/index.html.haml3
2 files changed, 6 insertions, 3 deletions
diff --git a/app/views/home/_content.html.haml b/app/views/home/_content.html.haml
index 67e4533..725c391 100644
--- a/app/views/home/_content.html.haml
+++ b/app/views/home/_content.html.haml
@@ -1,10 +1,12 @@
-.row
+.left.column
%h1= t(:welcome, :provider => APP_CONFIG[:domain])
.p=t(:welcome_message_html)
-.row
= home_page_buttons
+.right.column
+ = render :partial => 'twitter/index'
+
- if Rails.env == 'development'
.row
%hr
diff --git a/app/views/home/index.html.haml b/app/views/home/index.html.haml
index 147cacd..7f07460 100644
--- a/app/views/home/index.html.haml
+++ b/app/views/home/index.html.haml
@@ -3,7 +3,8 @@
#main
.container-fluid
= render 'home/content'
+
#push
-# #push is used for sticky footer in bootstrap 2. remove when upgrading to bootstrap 3
#footer
- = render 'layouts/footer' \ No newline at end of file
+ = render 'layouts/footer'