diff options
| author | Marie <ml.kochsiek@fu-berlin.de> | 2016-09-14 16:38:51 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-14 16:38:51 +0000 |
| commit | d72c87cb94213c9a507596f2103773969d1cbd30 (patch) | |
| tree | 7b13646448e64e560101493eeac1a03c3a25dbd8 /app/views | |
| parent | 42459748e9e8e30a9cc0c64eaf4b8e10814d2dc2 (diff) | |
| parent | 22478d315af3590d2a344eb1aa8cf2aec0730506 (diff) | |
Merge pull request #14 from LoadToCode/develop
Taking it all from branch develop and push it to branch temp_1_marie
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/home/index.html.haml | 2 | ||||
| -rw-r--r-- | app/views/twitter/_index.html.erb | 19 |
2 files changed, 6 insertions, 15 deletions
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 diff --git a/app/views/twitter/_index.html.erb b/app/views/twitter/_index.html.erb index ba618b3..a7ebd1b 100644 --- a/app/views/twitter/_index.html.erb +++ b/app/views/twitter/_index.html.erb @@ -1,24 +1,15 @@ <% if twitter_enabled == true %> <div class="twitter"> - <div class="twitter_header"> - <div class="twitter_id"> - <div class="twitter_pic twitter_image_frame"><%= image_tag("Twitter_Logo_White_On_Blue.png") %></div> - <div class="twitter_name"><%= twitter_name%><br><a href="https://twitter.com/loadtocode">@<%= twitter_handle %></a></div> - </div> - </div> - - <!-- <div class="twitter_header"> - <p>These are the most recent tweets by <%= twitter_name%></p> - + <div class="twitter_header"> <div class="twitter_id"> - <div class="twitter_pic twitter_image_frame"><%= image_tag("Twitter_Logo_White_On_Blue.png") %></div> - <div class="twitter_name"><a href="https://twitter.com/loadtocode">@<%= twitter_handle %></a></div> + <div class="twitter_image_frame"><%= image_tag("Twitter_Logo_Blue.png") %></div> + <div class="twitter_name"><%= twitter_name%><br><a href="https://twitter.com/loadtocode">@<%= twitter_handle %></a></div> </div> - </div> --> + </div> <div class="twitter_list"> - <% twitter_timeline.each do |e| %> + <% tweets.each do |e| %> <div class="tweet"> <div class="tweet_text"><%= " #{e.text}" %> </div> |