Merge branch 'release/1.0' into dormsbee/copy_edits_2

Conflicts:
	lms/templates/university_profile/mitx.html

lms/static/sass/_course_about.scss

@@ -25,8 +25,9 @@
       @include clearfix;
       margin: 0 auto;
       max-width: 1200px;
+      min-width: 760px;
       position: relative;
-      width: grid-width(12);
+      width: 100%;
       z-index: 2;
 
 

lms/static/sass/_courses.scss

@@ -15,6 +15,7 @@
       height: 120px;
       margin: 0 auto;
       max-width: 1200px;
+      min-width: 760px;
       padding-top: 200px;
       position: relative;
       text-align: center;

lms/static/sass/_home.scss

@@ -19,7 +19,8 @@
       margin: 0 auto;
       padding: 200px 10px 0px;
       position: relative;
-      width: grid-width(12);
+      max-width: 1200px;
+      min-width: 760px;
     }
 
     .title {

lms/static/sass/_password_reset.scss

@@ -6,7 +6,7 @@
   @include box-shadow(0 5px 50px 0 rgba(0,0,0, 0.3));
   margin: 120px auto 0;
   padding: 0px 40px 40px;
-  width: grid-width(5);
+  width: flex-grid(5);
 
   header {
     margin-bottom: 30px;

lms/static/sass/base/_base.scss

@@ -83,7 +83,7 @@ a:link, a:visited {
   @include clearfix;
   margin: 0 auto 0;
   padding: 0px 10px;
-  width: grid-width(12);
+  max-width: grid-width(12);
 }
 
 span.edx {

lms/static/sass/shared/_footer.scss

@@ -15,7 +15,8 @@ footer {
     max-width: 1200px;
     margin: 0 auto;
     padding: 30px 10px 0;
-    width: grid-width(12);
+    max-width: grid-width(12);
+    min-width: 760px;
 
     .top {
       border-bottom: 1px solid rgb(200,200,200);

lms/static/sass/shared/_header.scss

@@ -13,7 +13,8 @@ header.global {
     margin: 0 auto;
     max-width: 1200px;
     padding: 14px 10px 0px;
-    width: grid-width(12);
+    max-width: grid-width(12);
+    min-width: 760px;
   }
 
   h1.logo {

lms/templates/index.html

@@ -19,15 +19,15 @@
 
           <div class="secondary-actions">
             <div class="social-sharing">
-              <div class="sharing-message">Share with friends and family!</div>
-              <a href="#" class="share">
+              <div class="sharing-message">Stay up to date with all edX has to offer!</div>
+              <a href="https://twitter.com/edXOnline" class="share">
                 <img src="${static.url('images/social/twitter-sharing.png')}">
               </a>
-              <a href="#" class="share">
+              <a href="http://www.facebook.com/EdxOnline" class="share">
                 <img src="${static.url('images/social/facebook-sharing.png')}">
               </a>
-              <a href="#" class="share">
-                <img src="${static.url('images/social/email-sharing.png')}">
+              <a href="https://plus.google.com/108235383044095082735/posts" class="share">
+                <img src="${static.url('images/social/google-plus-sharing.png')}">
               </a>
             </div>
           </div>
@@ -36,7 +36,7 @@
 
         <a href="#video-modal" class="media" rel="leanModal">
           <div class="hero">
-            <img src="${static.url('images/courses/space3.jpg')}" />
+            <img src="${static.url('images/courses/edx_hp_video_thumbsmall.jpg')}" />
             <div class="play-intro"></div>
           </div>
         </a>

lms/templates/portal/course_about.html

@@ -68,13 +68,12 @@
         <header>
           <div class="social-sharing">
             <div class="sharing-message">Share with friends and family!</div>
-            <a href="#" class="share">
+            <a href="http://twitter.com/intent/tweet?text=I+just+registered+for+${course.number}+${get_course_about_section(course, 'title')}+through+@edxonline:+http://edx.org/${reverse('about_course', args=[course.id])}" class="share">
               <img src="${static.url('images/social/twitter-sharing.png')}">
             </a>
-            <a href="#" class="share">
-              <img src="${static.url('images/social/facebook-sharing.png')}">
+            <a href="http://www.facebook.com/EdxOnline" class="share"> <img src="${static.url('images/social/facebook-sharing.png')}">
             </a>
-            <a href="#" class="share">
+            <a href="mailto:?subject=Take%20a%20course%20with%20edX%20online&body=I%20just%20registered%20for%20${course.number}%20${get_course_about_section(course, 'title')}%20through%20edX:+http://edx.org/${reverse('about_course', args=[course.id])}" class="share">
               <img src="${static.url('images/social/email-sharing.png')}">
             </a>
           </div>

lms/templates/university_profile/berkeleyx.html

@@ -16,7 +16,7 @@
 </%block>
 
 <%block name="university_description">
-    <p>The University of California, Berkeley was chartered in 1868 and its flagship campus — envisioned as a "City of Learning" — was established at Berkeley, on San Francisco Bay. Berkeley Faculty consists of 1,582 fulltime and 500 part-time faculty members dispersed among more than 130 academic departments and more than 80 interdisciplinary research units.  28 Nobel prizes have been awarded to Berkeley Alumni. There are 8 Nobel Laureates, 32 MacArthur Fellows, and 4 Pulitzer Prize winners among the current faculty.</p>
+    <p>The University of California, Berkeley was chartered in 1868 and its flagship campus — envisioned as a "City of Learning" — was established at Berkeley, on San Francisco Bay. Berkeley Faculty consists of 1,582 fulltime and 500 part-time faculty members dispersed among more than 130 academic departments and more than 80 interdisciplinary research units.  28 Nobel prizes have been awarded to Berkeley Alumni. There are eight Nobel Laureates, 32 MacArthur Fellows, and four Pulitzer Prize winners among the current faculty.</p>
 </%block>
 
 ${parent.body()}