From e1e98d0229b8b79de2105515f0312903a23dc335 Mon Sep 17 00:00:00 2001 From: luca-marie Date: Wed, 24 Aug 2016 15:23:07 +0200 Subject: Update with Twitter --- app/views/home/_content.html.haml | 6 ++++-- app/views/home/index.html.haml | 3 ++- 2 files changed, 6 insertions(+), 3 deletions(-) (limited to 'app/views/home') 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' -- cgit v1.2.3 From fecc0e9e1985be2d3767664453d4776ac20897c0 Mon Sep 17 00:00:00 2001 From: luca-marie Date: Thu, 25 Aug 2016 20:50:12 +0200 Subject: Twitter controller now as helper, some more styling in CSS, bug fix --- app/views/home/_content.html.haml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'app/views/home') diff --git a/app/views/home/_content.html.haml b/app/views/home/_content.html.haml index 725c391..6efd2d0 100644 --- a/app/views/home/_content.html.haml +++ b/app/views/home/_content.html.haml @@ -1,14 +1,15 @@ -.left.column +.row %h1= t(:welcome, :provider => APP_CONFIG[:domain]) .p=t(:welcome_message_html) - = home_page_buttons - -.right.column - = render :partial => 'twitter/index' +.row + .col-md-9 + = home_page_buttons + .col-md-3 + = render 'twitter/index' - if Rails.env == 'development' .row %hr %p - = link_to "make donation", new_payment_path if APP_CONFIG[:payment].present? += link_to "make donation", new_payment_path if APP_CONFIG[:payment].present? -- cgit v1.2.3 From e3af6664f997d4dff227fdcd0246eff516520e96 Mon Sep 17 00:00:00 2001 From: luca-marie Date: Fri, 26 Aug 2016 18:02:55 +0200 Subject: Adding config/config.yml file into .gitignore, cleaning up smaller typos --- app/views/home/_content.html.haml | 10 +++++----- app/views/home/index.html.haml | 1 - 2 files changed, 5 insertions(+), 6 deletions(-) (limited to 'app/views/home') diff --git a/app/views/home/_content.html.haml b/app/views/home/_content.html.haml index 6efd2d0..a299295 100644 --- a/app/views/home/_content.html.haml +++ b/app/views/home/_content.html.haml @@ -8,8 +8,8 @@ .col-md-3 = render 'twitter/index' - - if Rails.env == 'development' - .row - %hr - %p -= link_to "make donation", new_payment_path if APP_CONFIG[:payment].present? + - if Rails.env == 'development' + .row + %hr + %p + = link_to "make donation", new_payment_path if APP_CONFIG[:payment].present? diff --git a/app/views/home/index.html.haml b/app/views/home/index.html.haml index 7f07460..5e33e62 100644 --- a/app/views/home/index.html.haml +++ b/app/views/home/index.html.haml @@ -3,7 +3,6 @@ #main .container-fluid = render 'home/content' - #push -# #push is used for sticky footer in bootstrap 2. remove when upgrading to bootstrap 3 #footer -- cgit v1.2.3 From 92e7b90d619111fdaaf50ab0b8538c39605fe005 Mon Sep 17 00:00:00 2001 From: luca-marie Date: Thu, 1 Sep 2016 12:17:05 +0200 Subject: Updating the view and CSS, no pic and twitter handle in each tweet; Displaying only 3 most tweets --- app/views/home/_content.html.haml | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'app/views/home') diff --git a/app/views/home/_content.html.haml b/app/views/home/_content.html.haml index a299295..ecd8524 100644 --- a/app/views/home/_content.html.haml +++ b/app/views/home/_content.html.haml @@ -1,11 +1,13 @@ -.row - %h1= t(:welcome, :provider => APP_CONFIG[:domain]) - .p=t(:welcome_message_html) +.col-md-9 + .row + %h1= t(:welcome, :provider => APP_CONFIG[:domain]) + .p=t(:welcome_message_html) -.row - .col-md-9 + .row = home_page_buttons - .col-md-3 + +.col-md-3 + .row = render 'twitter/index' - if Rails.env == 'development' -- cgit v1.2.3 From 42459748e9e8e30a9cc0c64eaf4b8e10814d2dc2 Mon Sep 17 00:00:00 2001 From: luca-marie Date: Fri, 9 Sep 2016 13:19:51 +0200 Subject: Added changes in css, view and main view file, as well as default avatar is now set as twitter official logo (added 2 official twitter logo images; changed footer text. --- app/views/home/_content.html.haml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'app/views/home') diff --git a/app/views/home/_content.html.haml b/app/views/home/_content.html.haml index ecd8524..5341189 100644 --- a/app/views/home/_content.html.haml +++ b/app/views/home/_content.html.haml @@ -1,4 +1,4 @@ -.col-md-9 +.col-md-8 .row %h1= t(:welcome, :provider => APP_CONFIG[:domain]) .p=t(:welcome_message_html) @@ -6,6 +6,8 @@ .row = home_page_buttons +.col-md-1 + .col-md-3 .row = render 'twitter/index' -- cgit v1.2.3 From 8d825a904f4d84e388a5af2c873b06b344512795 Mon Sep 17 00:00:00 2001 From: thea Date: Tue, 13 Sep 2016 14:59:46 +0200 Subject: reseted index.html.haml old state --- app/views/home/index.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/views/home') diff --git a/app/views/home/index.html.haml b/app/views/home/index.html.haml index 5e33e62..147cacd 100644 --- a/app/views/home/index.html.haml +++ b/app/views/home/index.html.haml @@ -6,4 +6,4 @@ #push -# #push is used for sticky footer in bootstrap 2. remove when upgrading to bootstrap 3 #footer - = render 'layouts/footer' + = render 'layouts/footer' \ No newline at end of file -- cgit v1.2.3