Merge pull request #549 from ashawley/fix-548-smaller-twitter-feed

Fix #548 too big Twitter feed

Author: sjrd

_layouts/frontpage.html

@@ -220,7 +220,7 @@ <h2 class="twitterhdr"><span>Scala on Twitter</span></h2>
     <div class="row">
       <div class="span12">
         <div id="tweets" class="tweets">
-          <a class="twitter-timeline" data-tweet-limit="4" data-chrome="noheader nofooter noborders" href="https://twitter.com/scala_lang">Tweets by scala_lang</a> <script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
+          <a class="twitter-timeline" data-tweet-limit="4" data-chrome="noheader nofooter noborders" data-width="520" href="https://twitter.com/scala_lang">Tweets by scala_lang</a> <script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
         </div>
         <br/>&nbsp;
         <div class="see-more-tweets">See more tweets, or</div>

resources/js/main.js

@@ -129,40 +129,6 @@ $(document).ready(function(){
     $(".shadow").css('display','block');
   }
 
-  // tweets
-  $(function(){
-    $("#tweets").tweetMachine('', {
-      backendScript: 'https://www.scala-lang.org/webscripts/ajax/getFromTwitter.php?callback=?',
-      endpoint: 'statuses/user_timeline',
-      user_name: 'scala_lang',
-      include_retweets: true,
-      exclude_replies: false,
-      limit: 4,
-      autoRefresh: false,
-      tweetFormat: '\
-        <div class="tweet-container">\
-          <div class="tweet">\
-            <p class="text content"></p>\
-          </div>\
-          <div class="caret-container">\
-            <div class="caret-divider">\
-              <div class="caret-outer"></div>\
-              <div class="caret-inner"></div>\
-            </div>\
-          </div>\
-          <div class="raw bottom-anchored">\
-            <div class="avatar-wrapper">\
-              <img class="avatar" width="50" height="50" src="" />\
-            </div>\
-            <span class="tweet-username">\
-              <a href="" class="username" rel="external"></a>\
-            </span>\
-          </div>\
-        </div>\
-      '
-    });
-  });
-
 });
 
 <!-- prettyprint js to prepend generated pre/code tags -->