diff options
| author | Marie <ml.kochsiek@fu-berlin.de> | 2016-09-13 11:22:17 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-13 11:22:17 +0000 |
| commit | 90f956127daeba0bcfb3232e9e1bf86eebd8ced6 (patch) | |
| tree | d215db9e2bade3b49beb9f3c1e8b1ca064f62f0f | |
| parent | 8fd3aae30e7bfae18d99d936ef5428e8046ab58a (diff) | |
| parent | b26c4a45e3f4a82b30972c4b283a98a874bea216 (diff) | |
Merge pull request #9 from LoadToCode/marie
Update on CSS and view code, one Twitter img deleted
| -rw-r--r-- | app/assets/images/Twitter_Logo_White_On_Blue.png | bin | 4861 -> 0 bytes | |||
| -rw-r--r-- | app/assets/stylesheets/twitter.scss | 8 | ||||
| -rw-r--r-- | app/views/twitter/_index.html.erb | 17 |
3 files changed, 5 insertions, 20 deletions
diff --git a/app/assets/images/Twitter_Logo_White_On_Blue.png b/app/assets/images/Twitter_Logo_White_On_Blue.png Binary files differdeleted file mode 100644 index 25ba09f..0000000 --- a/app/assets/images/Twitter_Logo_White_On_Blue.png +++ /dev/null diff --git a/app/assets/stylesheets/twitter.scss b/app/assets/stylesheets/twitter.scss index b2481db..b2233d0 100644 --- a/app/assets/stylesheets/twitter.scss +++ b/app/assets/stylesheets/twitter.scss @@ -13,7 +13,7 @@ position: absolute; } -.twitter_pic { +.twitter_image_frame { display: block; width: 40px; height: 40px; @@ -23,12 +23,6 @@ top: 0; } -.twitter_image_frame { - width: 40px; - height: 40px; - overflow: hidden - } - .twitter_image_frame > img { display: block; position: absolute; diff --git a/app/views/twitter/_index.html.erb b/app/views/twitter/_index.html.erb index ba618b3..e31117e 100644 --- a/app/views/twitter/_index.html.erb +++ b/app/views/twitter/_index.html.erb @@ -1,21 +1,12 @@ <% 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| %> |
