4 files changed, 91 insertions, 39 deletions
diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
index 9cd3a55..f42044b 100644
--- a/app/assets/stylesheets/application.scss
+++ b/app/assets/stylesheets/application.scss
@@ -9,15 +9,14 @@
 //
 // import bootstrap.
 //
+@import "bootstrap-sprockets";
 @import "bootstrap";
-@import "bootstrap-responsive";
-// backport bootstrap 3.2 features
-@import "backport";
 
 //
 // LEAP web app specific overrides
 //
 @import "leap";
+@import "twitter";
 
 // And finally bootswatch style itself
 // @import "bootswatch/cerulean/bootswatch";
diff --git a/app/assets/stylesheets/backport.scss b/app/assets/stylesheets/backport.scss
deleted file mode 100644
index cadb035..0000000
--- a/app/assets/stylesheets/backport.scss
+++ /dev/null
@@ -1,24 +0,0 @@
-//
-// Backporting styles from bootstrap 3.2
-//
-
-
-// List options
-
-// Unstyled keeps list items block level, just removes default browser padding and list-style
-.list-unstyled {
-  padding-left: 0;
-  list-style: none;
-}
-
-// Inline turns list items into inline-block
-.list-inline {
-  @extend .list-unstyled;
-  margin-left: -5px;
-
-  > li {
-    display: inline-block;
-    padding-left: 5px;
-    padding-right: 5px;
-  }
-}
diff --git a/app/assets/stylesheets/leap.scss b/app/assets/stylesheets/leap.scss
index abbfc88..8c4d702 100644
--- a/app/assets/stylesheets/leap.scss
+++ b/app/assets/stylesheets/leap.scss
@@ -57,7 +57,6 @@
 
 [class*="-icon-"] {
   display: inline-block;
-  @include ie7-restore-right-whitespace();
   vertical-align: middle;
   background-repeat: no-repeat;
   margin-top: 1px;
@@ -92,8 +91,8 @@
 //
 
 input.large {
-  font-size: $baseFontSize * 1.25;
-  line-height: $baseLineHeight * 1.5;
+  font-size: $font-size-base * 1.25;
+  line-height: $line-height-base * 1.5;
 }
 
 .p {
@@ -120,9 +119,9 @@ input, textarea {
 
 // like a label, but with no background
 .label-clear {
-  background-color: $white;
+  background-color: $body-bg;
   text-shadow: none;
-  color: $black;
+  color: $gray-base;
 }
 
 // force a black icon, even if bootstrap thinks differently
@@ -188,7 +187,7 @@ input, textarea {
     font-weight: bold;
   }
   a {
-    color: $textColor;
+    color: $text-color;
   }
 }
 
@@ -199,7 +198,7 @@ input, textarea {
   }
   .download {
     a.btn {
-      width: 15em;
+      width: 18em;
       font-weight: bold;
       small {
         font-weight: normal;
@@ -228,9 +227,9 @@ input, textarea {
   box-shadow: 0 2px 4px rgba(0,0,0,.1);
   li.active {
     a, a:hover {
-      background-color: $linkColor;
-      color: $white;
-      border-color: darken($linkColor, 0%);
+      background-color: $link-color;
+      color: $body-bg;
+      border-color: darken($link-color, 0%);
       cursor: pointer;
     }
   }
@@ -265,7 +264,7 @@ $footer-height: 100px;
 $footer-border-width: 1px;
 $footer-gutter: 20px; // vertical gap above footer
 $footer-combined: $footer-height + $footer-border-width + $footer-gutter;
-$footer-color: $grayLighter !default;
+$footer-color: $gray-lighter !default;
 
 html, body {
   height: 100%;
@@ -313,7 +312,7 @@ html, body {
     // border-top: $footer-border-width solid darken($footer-color, 10%);
     background-color: $footer-color;
     a {
-      color: $black;
+      color: $gray-base;
       margin: 0 5px;
     }
   }
diff --git a/app/assets/stylesheets/twitter.scss b/app/assets/stylesheets/twitter.scss
new file mode 100644
index 0000000..4419918
--- /dev/null
+++ b/app/assets/stylesheets/twitter.scss
@@ -0,0 +1,78 @@
+.twitter {
+  position: relative;
+}
+
+.twitter_header {
+  font-size: 16px;
+  text-align: left;
+  margin-bottom: 55px;
+  padding: 10px 8px;
+}
+
+.twitter_id {
+  position: absolute;
+}
+
+.twitter_image_frame {
+  display: block;
+  width: 40px;
+  height: 40px;
+  overflow: hidden;
+  position: absolute;
+  left: 0;
+  top: 0;
+  // background-image: url(/Avatar_Pic.png);
+  }
+
+.twitter_image_frame > img {
+  display: block;
+  position: absolute;
+  top: 0;
+  bottom: 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;
+}
+
+.tweet {
+  border-top-style: solid;
+  border-color: lightgrey;
+  padding: 10px 8px;
+}
+
+.tweet_text {
+box-sizing: border-box;
+}
+
+.tweet_text_date {
+  text-align: right;
+  padding-top: 4px;
+  font-size: 12px ;
+}
+
+.twitter_footer {
+  border-top-style: solid;
+  border-color: lightgrey;
+  padding: 10px 8px;
+  font-style: italic;
+  font-size: 12px;
+}
+
+.more_tweets_link {
+  text-align: right;
+  font-size: 12px;
+}