Merged in with default

--HG--
branch : kf-captions

6002x-faq.html

@@ -26,7 +26,7 @@ someone else already signed up with that username. Try a different,
 more unique username. For example, try adding a random number to the
 end.</p>
 
-<a name="othercourses">
+<a name="othercourses" ></a>
 <h2> I am interested in a different subject. What other courses do
 you offer? </h2>
 
@@ -34,7 +34,7 @@ you offer? </h2>
 range of courses in the future, at present, 6.002x is the only course
 available.</p>
 
-<a name="start">
+<a name="start" ></a>
 <h2>How will I know that the course has started?</h2>
 
 <p> The course will start on March 5. Check the website
@@ -43,20 +43,20 @@ the course website 6.002x.mitx.mit.edu on or slightly before March 5
 so you can login, begin to get familiar with the site and start the
 course.</p>
 
-<a name="login">
+<a name="login" ></a>
 <h2> Why is there no log-in button?</h2>
 
 <p> You will not be able to log into the course until either the
 starting date, or shortly before.</p>
 
-<a name="schedule">
+<a name="schedule" ></a>
 <h2> Does the class have a schedule?</h2>
 
 <p> The lectures are on-line videos, and may be watched at your own
 pace and schedule. The course will have fixed deadlines for homework
 assignments and exams. </p>
 
-<a name="enrollissues">
+<a name="enrollissues" ></a>
 <h2> I just enrolled for the course. I have not received any form
 of acknowledgement that I have enrolled.</h2>
 
@@ -74,13 +74,13 @@ most common issues are:
 to do anything about the old account, if any. If it is not activated
 through the link in the e-mail, it will disappear later.
 
-<a name="howdropcourse">
+<a name="howdropcourse" ></a>
 <h2> How do I drop the course?</h2>
 
 <p> You do not have to do anything. You can simply stop working on the
 course at any time you choose to do so.</p>
 
-<a name="ifdropcourse">
+<a name="ifdropcourse" ></a>
 <h2>What happens if I drop the course?</h2>
 
 <p> For the prototype course, learners achieving grades of "A," "B,"
@@ -92,7 +92,7 @@ will be disclosed outside of MITx.  You can also choose to opt for a
 no record at any time.  However, the posts you make while enrolled in
 the class will remain visible. </p>
 
-<a name="whatismitx">
+<a name="whatismitx" ></a>
 <h2>
 What is <i>MITx</i>?</h2>
 
@@ -121,7 +121,7 @@ education. The launch of <i>MITx</i> represents a next step forward in that
 effort.
 </p>
 
-<a name="differentcampus">
+<a name="differentcampus" ></a>
 <h2>
 What is 6.002x, and how is it different from the on-campus version of
 6.002?
@@ -151,7 +151,7 @@ version of 6.002.
 professors Anant Agarwal and Jeffrey H. Lang for 6.002.
 </p>
 
-<a name="howenroll">
+<a name="howenroll" ></a>
 <h2>
 How do I enroll in 6.002x?
 </h2>
@@ -160,7 +160,7 @@ To enroll, visit <a href="http://mitx.mit.edu">http://mitx.mit.edu</a>
 and sign up.
 </p>
 
-<a name="whenavailable">
+<a name="whenavailable" ></a>
 <h2>
 When will the course be available online?
 </h2>
@@ -169,7 +169,7 @@ When will the course be available online?
 6.002x will become available online on Monday, March 5.
 </p>
 
-<a name="timeline">
+<a name="timeline" ></a>
 <h2>
 Do I need to follow a set timeline in completing 6.002x?
 </h2>
@@ -181,7 +181,7 @@ final exam will be given within a specific range of days. However,
 faster-paced learners can proceed multiple weeks ahead if they choose.
 </p>
 
-<a name="workrequired">
+<a name="workrequired" ></a>
 <h2>
 How much time is required to complete the course?
 </h2>
@@ -191,7 +191,7 @@ course. However, the time taken by individual students might vary
 considerably depending on background and skill.
 </p>
 
-<a name="instructors">
+<a name="instructors" ></a>
 <h2>
 Who are the instructors for 6.002x?
 </h2>
@@ -201,7 +201,7 @@ Gerald Sussman and Piotr Mitros. The team also includes several
 teaching assistants (TAs).
 </p>
 
-<a name="worklike">
+<a name="worklike" ></a>
 <h2>
 What is the work like in 6.002x?
 </h2>
@@ -223,7 +223,7 @@ videos. Lab and homework exercises will round out the week. Tutorials
 are also provided as additional reference material.
 </p>
 
-<a name="questionsduringcourse">
+<a name="questionsduringcourse" ></a>
 <h2>
 What if I have a question during the course?
 </h2>
@@ -234,7 +234,7 @@ documents, FAQs, tutorials and videos on using the various components
 of the course will also be provided.
 </p>
 
-<a name="collaboration">
+<a name="collaboration" ></a>
 <h2>
 Will 6.002x offer any means for collaboration among online learners?
 </h2>
@@ -243,7 +243,7 @@ Yes. 6.002x will offer modest support for collaborative work through a
 prototype wiki and discussion forum.
 </p>
 
-<a name="prereqs">
+<a name="prereqs" ></a>
 <h2>
 Are there prerequisites to take the course?
 </h2>
@@ -266,7 +266,7 @@ remedial differential equations component for students with weaker
 math backgrounds.
 </p>
 
-<a name="cost">
+<a name="cost" ></a>
 <h2>
 How much does the course cost?
 </h2>
@@ -277,7 +277,7 @@ credential for a modest fee. For this prototype course, the fee for a
 credential will be waived. 
 </p>
 
-<a name="credential">
+<a name="credential" ></a>
 <h2>
 What is a credential?
 </h2>
@@ -290,7 +290,7 @@ testing center or otherwise have your identity certified in order to
 receive this certificate.
 </p>
 
-<a name="whograding">
+<a name="whograding" ></a>
 <h2>
 Who is grading the course?
 </h2>
@@ -299,7 +299,7 @@ Who is grading the course?
 including practice exercises, homework assignments, labs and exams.
 </p>
 
-<a name="whatpassing">
+<a name="whatpassing" ></a>
 <h2>
 What is a passing grade?
 </h2>
@@ -310,7 +310,7 @@ affecting a student&rsquo;s grade and the grade thresholds will be
 posted on the course website when the course comes online.
 </p>
 
-<a name="textbook">
+<a name="textbook" ></a>
 <h2>
 Do I need to buy a textbook? 
 </h2>
@@ -325,7 +325,7 @@ copyright for the book is owned by Elsevier. The book can be purchased
 on <a href="http://www.amazon.com/exec/obidos/ASIN/1558607358/ref=nosim/mitopencourse-20" target="_blank">Amazon</a>.
 </p>
 
-<a name="technicalrequirements">
+<a name="technicalrequirements" ></a>
 <h2>
 Do I need to have special software to access 6.002x?
 </h2>
@@ -343,14 +343,17 @@ other browsers and tablets, but portions of the functionality will be
 unavailable.
 </p>
 
-<a name="futurecourses">
+<a name="futurecourses" ></a>
 <h2>
 When will the next courses become available and what topics will they be on?
 </h2>
 <p>
  Additional courses will be announced
  on <a href="http://mitx.mit.edu">mitx.mit.edu</a> as they become
- available. We expect this will happen in fall 2012.
+ available. We expect this will happen in fall 2012. We also have
+ accounts
+ on <a href="https://twitter.com/#!/MyMITx">Twitter</a>, <a href="http://www.facebook.com/pages/MITx/378592442151504">Facebook</a>,
+ and <a href="http://www.linkedin.com/groups/Friends-Alumni-MITx-4316538">LinkedIn</a>.
 </p>
 </div>
 </section>

sass/discussion/_modals.scss

@@ -10,6 +10,7 @@
   padding-bottom: 10px;
   position: absolute;
   text-align: center;
+  z-index: 1;
 
   h3 {
     background: $mit-red;

sass/discussion/_question-view.scss

@@ -181,6 +181,7 @@ div.question-header {
           aside.comment-controls {
             background: none;
             border: none;
+            @include box-shadow(none);
             display: inline-block;
             margin-top: -8px;
             padding:0 2% 0 0;