summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorluca-marie <ml.kochsiek@fu-berlin.de>2016-08-29 17:39:46 +0200
committerthea <ta.kupler@gmail.com>2016-09-01 12:09:37 +0200
commitea3fc6ffbb8f90aff28ce56fe4432a8d3ff18caa (patch)
tree0cd03af6e30206c272c9fe2b8cd78fdc51c17b24 /app
parente3af6664f997d4dff227fdcd0246eff516520e96 (diff)
Changes mainly on CSS 'fine tuning' and shortening the Twitter API credentials,
- only bearer token is needed to access Twitter API
Diffstat (limited to 'app')
-rw-r--r--app/assets/stylesheets/twitter.scss55
-rw-r--r--app/helpers/twitter_helper.rb2
-rw-r--r--app/views/twitter/_index.html.erb22
3 files changed, 40 insertions, 39 deletions
diff --git a/app/assets/stylesheets/twitter.scss b/app/assets/stylesheets/twitter.scss
index 6b74cf7..b0ce982 100644
--- a/app/assets/stylesheets/twitter.scss
+++ b/app/assets/stylesheets/twitter.scss
@@ -1,21 +1,15 @@
.twitter {
position: relative;
- // top: 0;
- // right: 10px;
- // bottom: 0;
- // overflow: auto;
- // width: 250px;
}
+
.twitter_header {
- padding-top: 8px;
- height: 30px;
- font-size: 20px ;
- text-align: center;
- margin-bottom: 20px;
+ font-size: 20px;
+ text-align: left;
+ margin-bottom: 30px;
}
.twitter_list {
- position: relative;
+ box-sizing: border-box;
}
.tweet:hover {
@@ -25,33 +19,35 @@
.tweet {
border-bottom-style: solid;
border-color: #bfbfbf;
- // display: inline;
- // height: 32px;
- // width: 100%;
- // position: absolute;
- // text-align: center;
+ padding: 10px 8px;
+}
+
+.tweet_title {
+ position: relative;
+ height: 40px;
+ margin-bottom: 10px;
}
.tweet_pic {
display: block;
- float: left;
- width: 28px;
- height: 33px;
- padding-left: 8px;
- padding-top: 8px;
- // background: hsl(0, 0%, 30%);
-}
+ width: 40px;
+ height: 40px;
+ overflow: hidden;
+ position: absolute;
+ left: 0;
+ top: 0;
+ }
.tweet_name {
- padding-left: 45px;
- padding-top: 16px;
- // border-bottom-style: solid;
- // border-color: #00bfff;
+ padding-left: 50px;
+ line-height: 40px;
+ white-space: nowrap;
+ overflow: hidden;
+ text-overflow: ellipsis;
}
.tweet_text {
- padding-left: 8px;
- padding-top: 15px;
+box-sizing: border-box;
}
.tweet_text_date {
@@ -67,7 +63,6 @@
width: 40px;
height: 40px;
overflow: hidden;
- position: relative;
}
.twitter_image_frame > img {
diff --git a/app/helpers/twitter_helper.rb b/app/helpers/twitter_helper.rb
index b01293f..d20b7da 100644
--- a/app/helpers/twitter_helper.rb
+++ b/app/helpers/twitter_helper.rb
@@ -5,8 +5,6 @@ module TwitterHelper
def twitter_client
Twitter::REST::Client.new do |config|
- config.consumer_key = Rails.application.secrets.twitter['consumer_key']
- config.consumer_secret = Rails.application.secrets.twitter['consumer_secret']
config.bearer_token = Rails.application.secrets.twitter['bearer_token']
end
end
diff --git a/app/views/twitter/_index.html.erb b/app/views/twitter/_index.html.erb
index 8ac65be..eba9675 100644
--- a/app/views/twitter/_index.html.erb
+++ b/app/views/twitter/_index.html.erb
@@ -1,26 +1,34 @@
<% if twitter_enabled == true %>
<div class="twitter">
+
<div class="twitter_header">
- Tweets by <%= twitter_name %></p>
+ Tweets by </br><%= twitter_name %></p>
</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 class="tweet_name">
+ @<%= twitter_handle %>
+ </div>
</div>
- <div class="tweet_text">
- <%= " #{e.text}" %>
+
+ <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 class="tweet_text_date">tweeted on <% t = e.created_at%> <%= t.strftime("%m/%d/%y").to_s %>
</div>
+
</div>
<% end %>
</div>
+
<div class="twitter_footer">
To prevent leakage no links are displayed. For more information visit @<%= twitter_name %> on twitter.com.</p>
</div>
+
</div>
<% end %>