Added colored voting arrows

css/marketing.css

@@ -5,7 +5,6 @@ Last Updated: 2010-09-17
 Author: Richard Clark - http://richclarkdesign.com 
 Twitter: @rich_clark
 */
-<<<<<<< mine
 html, body, div, span, object, iframe,
 h1, h2, h3, h4, h5, h6, p, blockquote, pre,
 abbr, address, cite, code,
@@ -18,9 +17,6 @@ table, caption, tbody, tfoot, thead, tr, th, td,
 article, aside, canvas, details, figcaption, figure,
 footer, header, hgroup, menu, nav, section, summary,
 time, mark, audio, video {
-=======
-html, body, div, span, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pre, abbr, address, cite, code, del, dfn, em, img, ins, kbd, q, samp, small, strong, var, b, i, dl, dt, dd, ol, ul, li, fieldset, form, label, legend, table, caption, tbody, tfoot, thead, tr, th, td, article, aside, canvas, details, figcaption, figure, footer, header, hgroup, menu, nav, section, summary, time, mark, audio, video {
->>>>>>> theirs
   margin: 0;
   padding: 0;
   border: 0;
@@ -416,7 +412,6 @@ header.announcement {
 footer {
   padding-top: 0; }
   footer div.footer-wrapper {
-<<<<<<< mine
     border-top: 1px solid #e5e5e5;
     padding: 25.888px 0;
     background: url("/static/images/marketing/mit-logo.png") right center no-repeat; }
@@ -511,97 +506,6 @@ footer {
             background: url("/static/images/marketing/facebook.png") 0 0 no-repeat; }
           footer div.footer-wrapper ul.social li.linkedin a {
             background: url("/static/images/marketing/linkedin.png") 0 0 no-repeat; }
-=======
-    background-position: left bottom;
-    padding-bottom: 77.664px; } }
-footer div.footer-wrapper a {
-  color: #888;
-  text-decoration: none;
-  -webkit-transition-property: all;
-  -moz-transition-property: all;
-  -ms-transition-property: all;
-  -o-transition-property: all;
-  transition-property: all;
-  -webkit-transition-duration: 0.15s;
-  -moz-transition-duration: 0.15s;
-  -ms-transition-duration: 0.15s;
-  -o-transition-duration: 0.15s;
-  transition-duration: 0.15s;
-  -webkit-transition-timing-function: ease-out;
-  -moz-transition-timing-function: ease-out;
-  -ms-transition-timing-function: ease-out;
-  -o-transition-timing-function: ease-out;
-  transition-timing-function: ease-out;
-  -webkit-transition-delay: 0;
-  -moz-transition-delay: 0;
-  -ms-transition-delay: 0;
-  -o-transition-delay: 0;
-  transition-delay: 0; }
-footer div.footer-wrapper a:hover, footer div.footer-wrapper a:focus {
-  color: #666; }
-footer div.footer-wrapper p {
-  display: -moz-inline-box;
-  -moz-box-orient: vertical;
-  display: inline-block;
-  vertical-align: baseline;
-  zoom: 1;
-  *display: inline;
-  *vertical-align: auto;
-  margin-right: 25.888px; }
-footer div.footer-wrapper ul {
-  display: -moz-inline-box;
-  -moz-box-orient: vertical;
-  display: inline-block;
-  vertical-align: baseline;
-  zoom: 1;
-  *display: inline;
-  *vertical-align: auto; }
-@media screen and (max-width: 780px) {
-  footer div.footer-wrapper ul {
-    margin-top: 25.888px; } }
-footer div.footer-wrapper ul li {
-  display: -moz-inline-box;
-  -moz-box-orient: vertical;
-  display: inline-block;
-  vertical-align: baseline;
-  zoom: 1;
-  *display: inline;
-  *vertical-align: auto;
-  margin-bottom: 0; }
-footer div.footer-wrapper ul li:after {
-  content: ' |';
-  display: inline;
-  color: #ccc; }
-footer div.footer-wrapper ul li:last-child:after {
-  content: none; }
-footer div.footer-wrapper ul.social {
-  float: right;
-  margin-right: 60px;
-  position: relative;
-  top: -5px; }
-@media screen and (max-width: 780px) {
-  footer div.footer-wrapper ul.social {
-    float: none; } }
-footer div.footer-wrapper ul.social li {
-  float: left;
-  margin-right: 12.944px; }
-footer div.footer-wrapper ul.social li:after {
-  content: none;
-  display: none; }
-footer div.footer-wrapper ul.social li a {
-  display: block;
-  height: 29px;
-  width: 28px;
-  text-indent: -9999px; }
-footer div.footer-wrapper ul.social li a:hover {
-  opacity: .8; }
-footer div.footer-wrapper ul.social li.twitter a {
-  background: url("/static/images/marketing/twitter.png") 0 0 no-repeat; }
-footer div.footer-wrapper ul.social li.facebook a {
-  background: url("/static/images/marketing/facebook.png") 0 0 no-repeat; }
-footer div.footer-wrapper ul.social li.linkedin a {
-  background: url("/static/images/marketing/linkedin.png") 0 0 no-repeat; }
->>>>>>> theirs
 
 section.index-content section {
   float: left; }