merge css

--HG--
branch : static-ernie-html5-buttontoggle

css/application.css

@@ -129,20 +129,20 @@ 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, body.askbot .secondary-nav nav:after, html body div.header-wrapper header:after, html body div.header-wrapper header hgroup:after, html body div.header-wrapper header nav ul:after, html body section.main-content:after, html 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-wrapper section.video-controls:after, section.course-content div.video-wrapper section.video-controls div#slider: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-wrapper div#wiki_panel div#wiki_create_form:after, body.askbot footer div.footer-wrapper:after {
+.clearfix:after, .topbar:after, nav.sequence-nav:after, div.book-wrapper section.book nav:after, div.wiki-wrapper section.wiki-body header:after, body.askbot .secondary-nav nav:after, html body div.header-wrapper header:after, html body div.header-wrapper header hgroup:after, html body div.header-wrapper header nav ul:after, html body section.main-content:after, html 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-wrapper section.video-controls:after, section.course-content div.video-wrapper section.video-controls div#slider: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-wrapper div#wiki_panel div#wiki_create_form:after {
   content: ".";
   display: block;
   height: 0;
   clear: both;
   visibility: hidden; }
 
-.wrapper, html body div.header-wrapper header, html body section.main-content, html footer, section.activation, body.askbot .secondary-nav nav, body.askbot footer div.footer-wrapper {
+.wrapper, html body div.header-wrapper header, html body section.main-content, html footer, section.activation, body.askbot .secondary-nav nav {
   margin: 0 auto;
   max-width: 1400px;
   min-width: 810px;
   width: 100%;
   text-align: left; }
-  .wrapper div.table-wrapper, html body div.header-wrapper header div.table-wrapper, html body section.main-content div.table-wrapper, html footer div.table-wrapper, section.activation div.table-wrapper, body.askbot .secondary-nav nav div.table-wrapper, body.askbot footer div.footer-wrapper div.table-wrapper, .wrapper div.course-wrapper, html body div.header-wrapper header div.course-wrapper, html body section.main-content div.course-wrapper, html footer div.course-wrapper, section.activation div.course-wrapper, body.askbot .secondary-nav nav div.course-wrapper, body.askbot footer div.footer-wrapper div.course-wrapper, .wrapper div.book-wrapper, html body div.header-wrapper header div.book-wrapper, html body section.main-content div.book-wrapper, html footer div.book-wrapper, section.activation div.book-wrapper, body.askbot .secondary-nav nav div.book-wrapper, body.askbot footer div.footer-wrapper div.book-wrapper, .wrapper div.info-wrapper, html body div.header-wrapper header div.info-wrapper, html body section.main-content div.info-wrapper, html footer div.info-wrapper, section.activation div.info-wrapper, body.askbot .secondary-nav nav div.info-wrapper, body.askbot footer div.footer-wrapper div.info-wrapper, .wrapper div.profile-wrapper, html body div.header-wrapper header div.profile-wrapper, html body section.main-content div.profile-wrapper, html footer div.profile-wrapper, section.activation div.profile-wrapper, body.askbot .secondary-nav nav div.profile-wrapper, body.askbot footer div.footer-wrapper div.profile-wrapper, .wrapper body.askbot section.main-content div.discussion-wrapper, body.askbot section.main-content .wrapper div.discussion-wrapper, html body.askbot div.header-wrapper header section.main-content div.discussion-wrapper, html body.askbot section.main-content div.header-wrapper header div.discussion-wrapper, html body.askbot section.main-content div.discussion-wrapper, html footer body.askbot section.main-content div.discussion-wrapper, body.askbot section.main-content html footer div.discussion-wrapper, section.activation body.askbot section.main-content div.discussion-wrapper, body.askbot section.main-content section.activation div.discussion-wrapper, body.askbot .secondary-nav nav section.main-content div.discussion-wrapper, body.askbot section.main-content .secondary-nav nav div.discussion-wrapper, body.askbot footer div.footer-wrapper section.main-content div.discussion-wrapper, body.askbot section.main-content footer div.footer-wrapper div.discussion-wrapper {
+  .wrapper div.table-wrapper, html body div.header-wrapper header div.table-wrapper, html body section.main-content div.table-wrapper, html footer div.table-wrapper, section.activation div.table-wrapper, body.askbot .secondary-nav nav div.table-wrapper, .wrapper div.course-wrapper, html body div.header-wrapper header div.course-wrapper, html body section.main-content div.course-wrapper, html footer div.course-wrapper, section.activation div.course-wrapper, body.askbot .secondary-nav nav div.course-wrapper, .wrapper div.book-wrapper, html body div.header-wrapper header div.book-wrapper, html body section.main-content div.book-wrapper, html footer div.book-wrapper, section.activation div.book-wrapper, body.askbot .secondary-nav nav div.book-wrapper, .wrapper div.info-wrapper, html body div.header-wrapper header div.info-wrapper, html body section.main-content div.info-wrapper, html footer div.info-wrapper, section.activation div.info-wrapper, body.askbot .secondary-nav nav div.info-wrapper, .wrapper div.profile-wrapper, html body div.header-wrapper header div.profile-wrapper, html body section.main-content div.profile-wrapper, html footer div.profile-wrapper, section.activation div.profile-wrapper, body.askbot .secondary-nav nav div.profile-wrapper, .wrapper body.askbot section.main-content div.discussion-wrapper, body.askbot section.main-content .wrapper div.discussion-wrapper, html body.askbot div.header-wrapper header section.main-content div.discussion-wrapper, html body.askbot section.main-content div.header-wrapper header div.discussion-wrapper, html body.askbot section.main-content div.discussion-wrapper, html footer body.askbot section.main-content div.discussion-wrapper, body.askbot section.main-content html footer div.discussion-wrapper, section.activation body.askbot section.main-content div.discussion-wrapper, body.askbot section.main-content section.activation div.discussion-wrapper, body.askbot .secondary-nav nav section.main-content div.discussion-wrapper, body.askbot section.main-content .secondary-nav nav div.discussion-wrapper {
     display: table;
     width: 100%; }
 
@@ -3377,6 +3377,11 @@ body.askbot section.main-content div.discussion-wrapper aside {
   -ms-box-shadow: inset 1px 0 0 #f6f6f6;
   -o-box-shadow: inset 1px 0 0 #f6f6f6;
   box-shadow: inset 1px 0 0 #f6f6f6;
+  -webkit-border-radius: 0 4px 4px 0;
+  -moz-border-radius: 0 4px 4px 0;
+  -ms-border-radius: 0 4px 4px 0;
+  -o-border-radius: 0 4px 4px 0;
+  border-radius: 0 4px 4px 0;
   border-left: 1px solid #d3d3d3;
   border-right: 1px solid #f6f6f6;
   padding: 2.024%;
@@ -3390,23 +3395,6 @@ body.askbot section.main-content div.discussion-wrapper aside {
     width: 76%; }
   body.askbot section.main-content div.discussion-wrapper aside #displayTagFilterControl {
     margin-top: 10px; }
-body.askbot footer {
-  margin: 0 auto;
-  padding: 0; }
-  body.askbot footer div.footer-wrapper {
-    -webkit-box-shadow: 0 1px 0 white;
-    -moz-box-shadow: 0 1px 0 white;
-    -ms-box-shadow: 0 1px 0 white;
-    -o-box-shadow: 0 1px 0 white;
-    box-shadow: 0 1px 0 white;
-    -webkit-box-sizing: border-box;
-    -moz-box-sizing: border-box;
-    -ms-box-sizing: border-box;
-    -o-box-sizing: border-box;
-    box-sizing: border-box;
-    background-color: #000;
-    border-top: 0;
-    padding: 1.012%; }
 
 div.question-controls, div.answer-controls {
   display: block;
@@ -3787,7 +3775,9 @@ div.answer-block {
   div.answer-block img.answer-img-accept {
     margin: 10px 0px 10px 16px; }
   div.answer-block div.answered-by-owner {
-    color: #4d1919; }
+    color: #993333; }
+    div.answer-block div.answered-by-owner div.comments-container {
+      color: #555; }
 
 div.answer-own {
   border-top: 1px solid #eee;
@@ -3802,7 +3792,8 @@ div.answer-actions {
   div.answer-actions span.sep {
     color: #ddd; }
   div.answer-actions a {
-    text-decoration: none; }
+    text-decoration: none;
+    cursor: pointer; }
   div.answer-actions a.question-edit, div.answer-actions a.permant-link {
     color: #999; }
 

css/marketing.css

@@ -143,6 +143,9 @@ input, select {
 
 .subpage > div, section.copyright > div, section.tos > div, section.privacy-policy > div, section.honor-code > div {
   padding-left: 34.171%; }
+  @media screen and (max-width: 940px) {
+    .subpage > div, section.copyright > div, section.tos > div, section.privacy-policy > div, section.honor-code > div {
+      padding-left: 0; } }
   .subpage > div p, section.copyright > div p, section.tos > div p, section.privacy-policy > div p, section.honor-code > div p {
     margin-bottom: 25.888px; }
   .subpage > div h1, section.copyright > div h1, section.tos > div h1, section.privacy-policy > div h1, section.honor-code > div h1 {