From 1c54c1cb9192d53b658e98a5ed775d851adb1108 Mon Sep 17 00:00:00 2001
From: Tony Nie <nieziran1996@gmail.com>
Date: Thu, 8 Oct 2015 00:00:49 -0700
Subject: [PATCH] added a simple floating twitter feed

---
 website/static/website/css/main_style.css | 9 +++++++++
 website/templates/website/index.html      | 6 ++++++
 2 files changed, 15 insertions(+)

diff --git a/website/static/website/css/main_style.css b/website/static/website/css/main_style.css
index b7b5678..641caa3 100644
--- a/website/static/website/css/main_style.css
+++ b/website/static/website/css/main_style.css
@@ -19,6 +19,15 @@ a {
   margin: 0px auto 30px auto;
 }
 
+#side-feed-wrapper {
+    position: fixed;
+    top: 50px;
+    bottom: 0;
+    right: 0;
+    width: 300px;
+    z-index: 2;
+}
+
 #main-content-wrapper {
   margin-top: 50px;
   min-height: 300px;
diff --git a/website/templates/website/index.html b/website/templates/website/index.html
index f25f119..d741636 100644
--- a/website/templates/website/index.html
+++ b/website/templates/website/index.html
@@ -61,6 +61,12 @@ <h2 class="fadeInMoveDown slide-text">We extend membership to all prospective ma
 <!-- MAIN -->
 <div id="main-wrapper">
   <div id="main-inner-wrapper">
+
+    <div id="side-feed-wrapper">
+      <a class="twitter-timeline" href="https://twitter.com/berkeleyUPE" data-widget-id="652011314588487680">Tweets by @berkeleyUPE</a>
+      <script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+"://platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");</script>
+    </div>
+
     <div id="content-wrapper">
       <div id="content-header-wrapper">
         <h1>Upholding academic excellence</h1>