diff options
| -rw-r--r-- | app/assets/images/Twitter_Logo_Blue.png | bin | 0 -> 4298 bytes | |||
| -rw-r--r-- | app/assets/images/Twitter_Logo_White_On_Blue.png | bin | 0 -> 4861 bytes | |||
| -rw-r--r-- | app/assets/images/rails.png | bin | 6646 -> 0 bytes | |||
| -rw-r--r-- | app/assets/images/team-loadtocode-Loading_icon.gif | bin | 17490 -> 0 bytes | |||
| -rw-r--r-- | app/assets/stylesheets/twitter.scss | 32 | ||||
| -rw-r--r-- | app/views/home/_content.html.haml | 4 | ||||
| -rw-r--r-- | app/views/twitter/_index.html.erb | 25 |
7 files changed, 36 insertions, 25 deletions
diff --git a/app/assets/images/Twitter_Logo_Blue.png b/app/assets/images/Twitter_Logo_Blue.png Binary files differnew file mode 100644 index 0000000..b5eebc8 --- /dev/null +++ b/app/assets/images/Twitter_Logo_Blue.png diff --git a/app/assets/images/Twitter_Logo_White_On_Blue.png b/app/assets/images/Twitter_Logo_White_On_Blue.png Binary files differnew file mode 100644 index 0000000..25ba09f --- /dev/null +++ b/app/assets/images/Twitter_Logo_White_On_Blue.png diff --git a/app/assets/images/rails.png b/app/assets/images/rails.png Binary files differdeleted file mode 100644 index d5edc04..0000000 --- a/app/assets/images/rails.png +++ /dev/null diff --git a/app/assets/images/team-loadtocode-Loading_icon.gif b/app/assets/images/team-loadtocode-Loading_icon.gif Binary files differdeleted file mode 100644 index a718bd8..0000000 --- a/app/assets/images/team-loadtocode-Loading_icon.gif +++ /dev/null diff --git a/app/assets/stylesheets/twitter.scss b/app/assets/stylesheets/twitter.scss index 89cdecf..b2481db 100644 --- a/app/assets/stylesheets/twitter.scss +++ b/app/assets/stylesheets/twitter.scss @@ -3,9 +3,10 @@ } .twitter_header { - font-size: 20px; + font-size: 16px; text-align: left; - margin-bottom: 80px; + margin-bottom: 55px; + padding: 10px 8px; } .twitter_id { @@ -25,28 +26,29 @@ .twitter_image_frame { width: 40px; height: 40px; - overflow: hidden; + overflow: hidden } -.twitter_name { - padding-left: 65px; - line-height: 40px; - white-space: nowrap; - overflow: hidden; - text-overflow: ellipsis; - font-size: 20px; -} - .twitter_image_frame > img { display: block; position: absolute; top: 0; bottom: 0; - left: 0; + left: 30; width: 100%; margin: auto; } +.twitter_name { + padding-left: 55px; + line-height: 20px; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + font-size: 16px; +} + +// Body = displays tweets .twitter_list { box-sizing: border-box; } @@ -70,5 +72,7 @@ box-sizing: border-box; .twitter_footer { border-top-style: solid; border-color: lightgrey; - padding-top: 8px; + padding: 10px 8px; + font-style: italic; + font-size: 12px; } 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' diff --git a/app/views/twitter/_index.html.erb b/app/views/twitter/_index.html.erb index ac10aa4..ba618b3 100644 --- a/app/views/twitter/_index.html.erb +++ b/app/views/twitter/_index.html.erb @@ -1,30 +1,35 @@ <% if twitter_enabled == true %> <div class="twitter"> - <div class="twitter_header"> - <p>These are the most recent tweets by </br><%= 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"><%= 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_id"> - <div class="twitter_pic twitter_image_frame"><%= image_tag("rails.png") %></div> + <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> - </div> + </div> --> <div class="twitter_list"> <% twitter_timeline.each do |e| %> <div class="tweet"> <div class="tweet_text"><%= " #{e.text}" %> </div> - <div class="tweet_text_date">tweeted on <% t = e.created_at%> <%= t.strftime("%m/%d/%y").to_s %> </div> - </div> <% end %> - </div> + </div> - <div class="twitter_footer"> - To prevent leakage no links are displayed. For more information visit @<%= twitter_name %> on twitter.com.</p> - </div> + <div class="twitter_footer"> + <p>This feed uses a Ruby interface to access the Twitter API. Within LEAP Twitter does not track you.</p> + </div> </div> <% end %> |
