Added colored voting arrows

css/application.css

@@ -129,7 +129,7 @@ input, select {
   font-weight: 800;
   font-style: italic; }
 
-.clearfix:after, .topbar:after, nav.sequence-nav:after, div.book-wrapper section.book nav:after, div.wiki-wrapper section.wiki-body header:after, html body section.main-content:after, div.header-wrapper header:after, div.header-wrapper header hgroup:after, div.header-wrapper header nav ul:after, footer:after, div.leanModal_box#enroll ol:after, div.course-wrapper section.course-content .problem-set:after, div.course-wrapper section.course-content section.problems-wrapper:after, div.course-wrapper section.course-content div#seq_content:after, div.course-wrapper section.course-content ol.vert-mod > li:after, section.course-content div.video-subtitles div.video-wrapper section.video-controls:after, section.course-content div.video-subtitles div.video-wrapper section.video-controls div#slider:after, section.course-content div.video-subtitles div.video-wrapper section.video-controls div.secondary-controls div.speeds ol#video_speeds:after, div#graph-container:after, div#schematic-container:after, div.book-wrapper section.book nav ul:after, div.info-wrapper section.updates ol li:after, div.info-wrapper section.handouts ol li:after, div.profile-wrapper section.course-info > ol > li:after, div#wiki_panel div#wiki_create_form:after {
+.clearfix:after, .topbar:after, nav.sequence-nav:after, div.book-wrapper section.book nav:after, div.wiki-wrapper section.wiki-body header:after, html body section.main-content:after, div.header-wrapper header:after, div.header-wrapper header hgroup:after, div.header-wrapper header nav ul:after, footer:after, div.leanModal_box#enroll ol:after, div.course-wrapper section.course-content .problem-set:after, div.course-wrapper section.course-content section.problems-wrapper:after, div.course-wrapper section.course-content div#seq_content:after, div.course-wrapper section.course-content ol.vert-mod > li:after, section.course-content div.video-subtitles div.video-wrapper section.video-controls:after, section.course-content div.video-subtitles div.video-wrapper section.video-controls div#slider:after, div#graph-container:after, div#schematic-container:after, div.book-wrapper section.book nav ul:after, div.info-wrapper section.updates ol li:after, div.info-wrapper section.handouts ol li:after, div.profile-wrapper section.course-info > ol > li:after, div#wiki_panel div#wiki_create_form:after {
   content: ".";
   display: block;
   height: 0;
@@ -2694,17 +2694,27 @@ section.course-content div.video-subtitles {
           line-height: 46px;
           margin-right: 0;
           -webkit-font-smoothing: antialiased; }
+          section.course-content div.video-subtitles div.video-wrapper section.video-controls div.secondary-controls div.speeds h3, section.course-content div.video-subtitles div.video-wrapper section.video-controls div.secondary-controls div.speeds div#wiki_panel input[type="button"], div#wiki_panel section.course-content div.video-subtitles div.video-wrapper section.video-controls div.secondary-controls div.speeds input[type="button"] {
+            display: -moz-inline-box;
+            -moz-box-orient: vertical;
+            display: inline-block;
+            vertical-align: baseline;
+            zoom: 1;
+            *display: inline;
+            *vertical-align: auto; }
             section.course-content div.video-subtitles div.video-wrapper section.video-controls div.secondary-controls div.speeds h3 a, section.course-content div.video-subtitles div.video-wrapper section.video-controls div.secondary-controls div.speeds div#wiki_panel input[type="button"] a, div#wiki_panel section.course-content div.video-subtitles div.video-wrapper section.video-controls div.secondary-controls div.speeds input[type="button"] a {
               color: #fff;
-            display: block;
-            padding: 0 11.326px; }
+              padding: 0 11.326px;
+              display: -moz-inline-box;
+              -moz-box-orient: vertical;
+              display: inline-block;
+              vertical-align: baseline;
+              zoom: 1;
+              *display: inline;
+              *vertical-align: auto; }
               section.course-content div.video-subtitles div.video-wrapper section.video-controls div.secondary-controls div.speeds h3 a:hover, section.course-content div.video-subtitles div.video-wrapper section.video-controls div.secondary-controls div.speeds div#wiki_panel input[type="button"] a:hover, div#wiki_panel section.course-content div.video-subtitles div.video-wrapper section.video-controls div.secondary-controls div.speeds input[type="button"] a:hover {
-              text-decoration: none;
-              background-color: #444; }
+                text-decoration: none; }
           section.course-content div.video-subtitles div.video-wrapper section.video-controls div.secondary-controls div.speeds ol#video_speeds {
-            background: #333;
-            border: 1px solid #000;
-            font-weight: bold;
             display: -moz-inline-box;
             -moz-box-orient: vertical;
             display: inline-block;
@@ -2712,23 +2722,16 @@ section.course-content div.video-subtitles {
             zoom: 1;
             *display: inline;
             *vertical-align: auto;
-            padding: 0 22.652px;
-            position: absolute;
-            right: 79px;
-            -webkit-box-shadow: inset 0 1px 0 #555555;
-            -moz-box-shadow: inset 0 1px 0 #555555;
-            -ms-box-shadow: inset 0 1px 0 #555555;
-            -o-box-shadow: inset 0 1px 0 #555555;
-            box-shadow: inset 0 1px 0 #555555; }
+            padding-right: 11.326px; }
             section.course-content div.video-subtitles div.video-wrapper section.video-controls div.secondary-controls div.speeds ol#video_speeds li {
               cursor: pointer;
-              float: left;
-              margin-bottom: 0;
-              margin-right: 11.326px; }
-              section.course-content div.video-subtitles div.video-wrapper section.video-controls div.secondary-controls div.speeds ol#video_speeds li:last-child {
-                margin-right: 0; }
-              section.course-content div.video-subtitles div.video-wrapper section.video-controls div.secondary-controls div.speeds ol#video_speeds li:hover {
-                color: #993333; }
+              display: -moz-inline-box;
+              -moz-box-orient: vertical;
+              display: inline-block;
+              vertical-align: baseline;
+              zoom: 1;
+              *display: inline;
+              *vertical-align: auto; }
         section.course-content div.video-subtitles div.video-wrapper section.video-controls div.secondary-controls a.hide-subtitles {
           float: left;
           display: block;
@@ -4947,7 +4950,10 @@ div.discussion-wrapper aside {
     box-sizing: border-box;
     text-align: center;
     padding: 10px;
-    display: block; }
+    display: block;
+    margin-top: 10px; }
+    div.discussion-wrapper aside div.view-profile a:first-child {
+      margin-top: 0; }
     div.discussion-wrapper aside div.view-profile a span {
       font-weight: bold; }
 
@@ -4958,6 +4964,8 @@ div.question-list-header {
   width: 100%; }
   div.question-list-header h1 {
     margin: 0; }
+    div.question-list-header h1 > a.light-button, div.question-list-header h1 > body.askbot section.main-content div.discussion-wrapper div.discussion-content a.tabula-rasa, body.askbot section.main-content div.discussion-wrapper div.discussion-content div.question-list-header h1 > a.tabula-rasa, div.question-list-header h1 > ul.question-list div.post-own-question a, ul.question-list div.post-own-question div.question-list-header h1 > a, div.question-list-header h1 > div#question-list div.post-own-question a, div#question-list div.post-own-question div.question-list-header h1 > a, div.question-list-header h1 > form.answer-form div.preview-toggle a, form.answer-form div.preview-toggle div.question-list-header h1 > a, div.question-list-header h1 > form.question-form div.preview-toggle a, form.question-form div.preview-toggle div.question-list-header h1 > a {
+      float: right; }
   div.question-list-header section.question-list-meta {
     display: block;
     overflow: hidden;
@@ -5178,15 +5186,30 @@ div.question-header div.vote-buttons, div.answer-block div.vote-buttons, div.pag
       -ms-border-radius: 4px;
       -o-border-radius: 4px;
       border-radius: 4px;
-      background-color: #f9f4e1; }
+      background-color: #faf7e9;
+      border: 1px solid #eddfaa;
+      -webkit-box-shadow: inset 0 1px 0px white;
+      -moz-box-shadow: inset 0 1px 0px white;
+      -ms-box-shadow: inset 0 1px 0px white;
+      -o-box-shadow: inset 0 1px 0px white;
+      box-shadow: inset 0 1px 0px white; }
     div.question-header div.vote-buttons ul li.question-img-upvote, div.answer-block div.vote-buttons ul li.question-img-upvote, div.paginator div.vote-buttons ul li.question-img-upvote, div.question-header div.vote-buttons ul li.answer-img-upvote, div.answer-block div.vote-buttons ul li.answer-img-upvote, div.paginator div.vote-buttons ul li.answer-img-upvote {
-      background-image: url(/static/images/askbot/vote-arrow-up.png); }
+      background-image: url(/static/images/askbot/vote-arrow-up.png);
+      -webkit-box-shadow: inset 0 1px 0px rgba(255, 255, 255, 0.5);
+      -moz-box-shadow: inset 0 1px 0px rgba(255, 255, 255, 0.5);
+      -ms-box-shadow: inset 0 1px 0px rgba(255, 255, 255, 0.5);
+      -o-box-shadow: inset 0 1px 0px rgba(255, 255, 255, 0.5);
+      box-shadow: inset 0 1px 0px rgba(255, 255, 255, 0.5); }
       div.question-header div.vote-buttons ul li.question-img-upvote:hover, div.answer-block div.vote-buttons ul li.question-img-upvote:hover, div.paginator div.vote-buttons ul li.question-img-upvote:hover, div.question-header div.vote-buttons ul li.question-img-upvote.on, div.answer-block div.vote-buttons ul li.question-img-upvote.on, div.paginator div.vote-buttons ul li.question-img-upvote.on, div.question-header div.vote-buttons ul li.answer-img-upvote:hover, div.answer-block div.vote-buttons ul li.answer-img-upvote:hover, div.paginator div.vote-buttons ul li.answer-img-upvote:hover, div.question-header div.vote-buttons ul li.answer-img-upvote.on, div.answer-block div.vote-buttons ul li.answer-img-upvote.on, div.paginator div.vote-buttons ul li.answer-img-upvote.on {
-        background-color: #d1e3a8; }
+        background-color: #d1e3a8;
+        border-color: #a8ca5b;
+        background-image: url(/static/images/askbot/vote-arrow-up-activate.png); }
     div.question-header div.vote-buttons ul li.question-img-downvote, div.answer-block div.vote-buttons ul li.question-img-downvote, div.paginator div.vote-buttons ul li.question-img-downvote, div.question-header div.vote-buttons ul li.answer-img-downvote, div.answer-block div.vote-buttons ul li.answer-img-downvote, div.paginator div.vote-buttons ul li.answer-img-downvote {
       background-image: url(/static/images/askbot/vote-arrow-down.png); }
       div.question-header div.vote-buttons ul li.question-img-downvote:hover, div.answer-block div.vote-buttons ul li.question-img-downvote:hover, div.paginator div.vote-buttons ul li.question-img-downvote:hover, div.question-header div.vote-buttons ul li.question-img-downvote.on, div.answer-block div.vote-buttons ul li.question-img-downvote.on, div.paginator div.vote-buttons ul li.question-img-downvote.on, div.question-header div.vote-buttons ul li.answer-img-downvote:hover, div.answer-block div.vote-buttons ul li.answer-img-downvote:hover, div.paginator div.vote-buttons ul li.answer-img-downvote:hover, div.question-header div.vote-buttons ul li.answer-img-downvote.on, div.answer-block div.vote-buttons ul li.answer-img-downvote.on, div.paginator div.vote-buttons ul li.answer-img-downvote.on {
-        background-color: #eac6ad; }
+        background-color: #EAC6AD;
+        border-color: #d58e5c;
+        background-image: url(/static/images/askbot/vote-arrow-down-activate.png); }
 div.question-header div.question-container, div.answer-block div.question-container, div.paginator div.question-container, div.question-header div.answer-block div.answer-container, div.answer-block div.question-header div.answer-container, div.answer-block div.answer-container, div.paginator div.answer-block div.answer-container, div.answer-block div.paginator div.answer-container, div.question-header div.paginator div.answer-container, div.paginator div.question-header div.answer-container, div.answer-block div.paginator div.answer-container, div.paginator div.answer-block div.answer-container, div.paginator div.answer-container {
   display: inline-block;
   float: left;
@@ -5358,7 +5381,7 @@ div.question-header div.question-container, div.answer-block div.question-contai
       margin-top: 5px;
       text-align: right; }
     div.question-header div.question-container div.comments-container div.controls, div.answer-block div.question-container div.comments-container div.controls, div.paginator div.question-container div.comments-container div.controls, div.question-header div.answer-block div.answer-container div.comments-container div.controls, div.answer-block div.question-header div.answer-container div.comments-container div.controls, div.answer-block div.answer-container div.comments-container div.controls, div.paginator div.answer-block div.answer-container div.comments-container div.controls, div.answer-block div.paginator div.answer-container div.comments-container div.controls, div.question-header div.paginator div.answer-container div.comments-container div.controls, div.paginator div.question-header div.answer-container div.comments-container div.controls, div.answer-block div.paginator div.answer-container div.comments-container div.controls, div.paginator div.answer-block div.answer-container div.comments-container div.controls, div.paginator div.answer-container div.comments-container div.controls {
-      border-top: 1px dashed #ddd;
+      border-top: 1px solid #efefef;
       text-align: right; }
       div.question-header div.question-container div.comments-container div.controls a, div.answer-block div.question-container div.comments-container div.controls a, div.paginator div.question-container div.comments-container div.controls a, div.question-header div.answer-block div.answer-container div.comments-container div.controls a, div.answer-block div.question-header div.answer-container div.comments-container div.controls a, div.answer-block div.answer-container div.comments-container div.controls a, div.paginator div.answer-block div.answer-container div.comments-container div.controls a, div.answer-block div.paginator div.answer-container div.comments-container div.controls a, div.question-header div.paginator div.answer-container div.comments-container div.controls a, div.paginator div.question-header div.answer-container div.comments-container div.controls a, div.answer-block div.paginator div.answer-container div.comments-container div.controls a, div.paginator div.answer-block div.answer-container div.comments-container div.controls a, div.paginator div.answer-container div.comments-container div.controls a {
         display: inline-block;
@@ -5380,8 +5403,7 @@ div.share-question {
   padding: 10px 0 10px 7.5%; }
   div.share-question p {
     padding: 0;
-    margin: 0;
-    font-weight: bold; }
+    margin: 0; }
 
 div.answer-controls {
   -webkit-box-sizing: border-box;
@@ -5760,7 +5782,7 @@ body.user-profile-page ul.sub-info {
   body.user-profile-page ul.sub-info > li {
     display: table-cell;
     padding: 1.359%;
-    border-right: 1px solid #ddd;
+    border-right: 1px dashed #efefef;
     -webkit-box-sizing: border-box;
     -moz-box-sizing: border-box;
     -ms-box-sizing: border-box;
@@ -5806,12 +5828,12 @@ body.user-profile-page ul.sub-info {
         padding: 10px 10px 10px 40px; }
         body.user-profile-page ul.sub-info ul.vote-buttons li.up {
           background-color: #d1e3a8;
-          background-image: url(/static/images/askbot/vote-arrow-up.png);
+          background-image: url(/static/images/askbot/vote-arrow-up-activate.png);
           margin-right: 6px; }
           body.user-profile-page ul.sub-info ul.vote-buttons li.up span.vote-count {
             color: #3f6c3e; }
         body.user-profile-page ul.sub-info ul.vote-buttons li.down {
-          background-image: url(/static/images/askbot/vote-arrow-down.png);
+          background-image: url(/static/images/askbot/vote-arrow-down-activate.png);
           background-color: #eac6ad; }
           body.user-profile-page ul.sub-info ul.vote-buttons li.down span.vote-count {
             color: #993333; }

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; }