diff options
| author | theaamanda <theaamanda@users.noreply.github.com> | 2016-09-06 09:27:07 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-06 09:27:07 +0200 |
| commit | 3b638103ae7c6094d79812f4cbd44bfce320a217 (patch) | |
| tree | 4d94d9d077d2925172d6a4444a0cb54868101d87 /app/views | |
| parent | 3f83e3078043de06270ec0c406a672f9641ff213 (diff) | |
| parent | 92e7b90d619111fdaaf50ab0b8538c39605fe005 (diff) | |
Merge pull request #1 from LoadToCode/marie
Updating the view and CSS, no pic and twitter handle in each tweet;
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/home/_content.html.haml | 14 | ||||
| -rw-r--r-- | app/views/twitter/_index.html.erb | 18 |
2 files changed, 15 insertions, 17 deletions
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' diff --git a/app/views/twitter/_index.html.erb b/app/views/twitter/_index.html.erb index eba9675..2d17aad 100644 --- a/app/views/twitter/_index.html.erb +++ b/app/views/twitter/_index.html.erb @@ -2,20 +2,17 @@ <div class="twitter"> <div class="twitter_header"> - Tweets by </br><%= twitter_name %></p> + <p>These are the most recent tweets by </br><%= twitter_name%></p> + + <div class="twitter_id"> + <div class="twitter_pic twitter_image_frame"><%= image_tag("rails.png") %></div> + <div class="twitter_name"><a href="https://twitter.com/loadtocode">@<%= twitter_handle %></a></div> + </div> </div> <div class="twitter_list"> <% tweets.each do |e| %> <div class="tweet"> - - <div class="tweet_title"> - <div class="tweet_pic twitter_image_frame"><%= image_tag("team-loadtocode-Loading_icon.gif") %></div> - <div class="tweet_name"> - @<%= twitter_handle %> - </div> - </div> - <div class="tweet_text"><%= " #{e.text}" %> </div> @@ -29,6 +26,5 @@ <div class="twitter_footer"> To prevent leakage no links are displayed. For more information visit @<%= twitter_name %> on twitter.com.</p> </div> - - </div> +</div> <% end %> |