Merge branch 'master' into pmitros/name-change
Conflicts: static/css/application.css static/css/marketing.css
This commit is contained in:
Kyle Fiedler
@@ -117,7 +117,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, html body section.outside-app:after, div.header-wrapper header:after, div.header-wrapper header hgroup:after, div.header-wrapper header nav ul:after, footer:after, li.calc-main div#calculator_wrapper form: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 nav.sequence-bottom ul: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 header:after, div.profile-wrapper section.course-info > ol > li:after, div#wiki_panel div#wiki_create_form:after, div.wiki-wrapper section.wiki-body:after, ul.badge-list li.badge: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, html body section.outside-app:after, div.header-wrapper header:after, div.header-wrapper header hgroup:after, div.header-wrapper header nav ul:after, footer:after, li.calc-main div#calculator_wrapper form:after, li.calc-main div#calculator_wrapper form div.input-wrapper: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 nav.sequence-bottom ul: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 header:after, div.profile-wrapper section.course-info > ol > li:after, div#wiki_panel div#wiki_create_form:after, div.wiki-wrapper section.wiki-body:after, ul.badge-list li.badge:after {
|
||||
content: ".";
|
||||
display: block;
|
||||
height: 0;
|
||||
@@ -449,8 +449,7 @@ html body section.main-content, html body section.outside-app {
|
||||
-webkit-box-sizing: border-box;
|
||||
-moz-box-sizing: border-box;
|
||||
box-sizing: border-box;
|
||||
margin-top: 3px;
|
||||
overflow: hidden; }
|
||||
margin-top: 3px; }
|
||||
@media print {
|
||||
html body section.main-content, html body section.outside-app {
|
||||
border-bottom: 0;
|
||||
@@ -665,7 +664,7 @@ footer nav ul.social li.linkedin a {
|
||||
background: url("/static/images/linkedin.png") 0 0 no-repeat; }
|
||||
|
||||
li.calc-main {
|
||||
bottom: 0;
|
||||
bottom: -36px;
|
||||
left: 0;
|
||||
position: fixed;
|
||||
width: 100%; }
|
||||
@@ -692,32 +691,20 @@ li.calc-main a.calc {
|
||||
*vertical-align: auto;
|
||||
padding: 8px 12px;
|
||||
width: 16px;
|
||||
height: 20px; }
|
||||
height: 20px;
|
||||
position: relative;
|
||||
top: -36px; }
|
||||
li.calc-main a.calc:hover {
|
||||
opacity: .8; }
|
||||
li.calc-main a.calc.closed {
|
||||
background-image: url("/static/images/close-calc-icon.png"); }
|
||||
li.calc-main div#calculator_wrapper {
|
||||
background: rgba(17, 17, 17, 0.9);
|
||||
position: relative;
|
||||
top: -36px;
|
||||
clear: both; }
|
||||
li.calc-main div#calculator_wrapper form {
|
||||
padding: 22.652px; }
|
||||
li.calc-main div#calculator_wrapper form input#calculator_input {
|
||||
border: none;
|
||||
-webkit-box-shadow: none;
|
||||
-moz-box-shadow: none;
|
||||
box-shadow: none;
|
||||
-webkit-box-sizing: border-box;
|
||||
-moz-box-sizing: border-box;
|
||||
box-sizing: border-box;
|
||||
font-size: 16px;
|
||||
padding: 10px;
|
||||
width: 61.741%;
|
||||
margin: 0;
|
||||
float: left; }
|
||||
li.calc-main div#calculator_wrapper form input#calculator_input:focus {
|
||||
outline: none;
|
||||
border: none; }
|
||||
li.calc-main div#calculator_wrapper form input#calculator_button {
|
||||
background: #111;
|
||||
border: 1px solid #000;
|
||||
@@ -758,14 +745,82 @@ li.calc-main div#calculator_wrapper form input#calculator_output {
|
||||
margin: 1px 0 0;
|
||||
padding: 10px;
|
||||
width: 31.984%; }
|
||||
li.calc-main div#calculator_wrapper dl {
|
||||
display: none; }
|
||||
li.calc-main div#calculator_wrapper dl dt {
|
||||
li.calc-main div#calculator_wrapper form div.input-wrapper {
|
||||
position: relative;
|
||||
width: 61.741%;
|
||||
margin: 0;
|
||||
float: left; }
|
||||
li.calc-main div#calculator_wrapper form div.input-wrapper input#calculator_input {
|
||||
border: none;
|
||||
-webkit-box-shadow: none;
|
||||
-moz-box-shadow: none;
|
||||
box-shadow: none;
|
||||
-webkit-box-sizing: border-box;
|
||||
-moz-box-sizing: border-box;
|
||||
box-sizing: border-box;
|
||||
font-size: 16px;
|
||||
padding: 10px;
|
||||
width: 100%; }
|
||||
li.calc-main div#calculator_wrapper form div.input-wrapper input#calculator_input:focus {
|
||||
outline: none;
|
||||
border: none; }
|
||||
li.calc-main div#calculator_wrapper form div.input-wrapper div.help-wrapper {
|
||||
position: absolute;
|
||||
right: 8px;
|
||||
top: 15px; }
|
||||
li.calc-main div#calculator_wrapper form div.input-wrapper div.help-wrapper a {
|
||||
text-indent: -9999px;
|
||||
overflow: hidden;
|
||||
display: block;
|
||||
width: 17px;
|
||||
height: 17px;
|
||||
background: url("/static/images/info-icon.png") center center no-repeat; }
|
||||
li.calc-main div#calculator_wrapper form div.input-wrapper div.help-wrapper dl {
|
||||
background: #fff;
|
||||
-webkit-border-radius: 3px;
|
||||
-moz-border-radius: 3px;
|
||||
-ms-border-radius: 3px;
|
||||
-o-border-radius: 3px;
|
||||
border-radius: 3px;
|
||||
-webkit-box-shadow: 0 0 3px #999999;
|
||||
-moz-box-shadow: 0 0 3px #999999;
|
||||
box-shadow: 0 0 3px #999999;
|
||||
color: #333;
|
||||
opacity: 0;
|
||||
padding: 10px;
|
||||
position: absolute;
|
||||
right: -40px;
|
||||
top: -110px;
|
||||
width: 500px;
|
||||
-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; }
|
||||
li.calc-main div#calculator_wrapper form div.input-wrapper div.help-wrapper dl.shown {
|
||||
opacity: 1;
|
||||
top: -115px; }
|
||||
li.calc-main div#calculator_wrapper form div.input-wrapper div.help-wrapper dl dt {
|
||||
clear: both;
|
||||
float: left;
|
||||
font-weight: bold;
|
||||
padding-right: 11.326px; }
|
||||
li.calc-main div#calculator_wrapper dl dd {
|
||||
li.calc-main div#calculator_wrapper form div.input-wrapper div.help-wrapper dl dd {
|
||||
float: left; }
|
||||
|
||||
#lean_overlay {
|
||||
@@ -2900,14 +2955,25 @@ section.course-content div.video-subtitles.closed ol.subtitles {
|
||||
height: 0; }
|
||||
|
||||
nav.sequence-nav {
|
||||
margin-bottom: 22.652px; }
|
||||
nav.sequence-nav ol {
|
||||
display: table-row;
|
||||
float: left;
|
||||
width: 90.611%;
|
||||
-webkit-box-sizing: border-box;
|
||||
-moz-box-sizing: border-box;
|
||||
box-sizing: border-box;
|
||||
margin-bottom: 22.652px;
|
||||
position: relative; }
|
||||
nav.sequence-nav ol {
|
||||
border-bottom: 1px solid #e4d080;
|
||||
-webkit-box-sizing: border-box;
|
||||
-moz-box-sizing: border-box;
|
||||
box-sizing: border-box;
|
||||
display: table;
|
||||
padding-right: 8.696%;
|
||||
width: 100%; }
|
||||
nav.sequence-nav ol li {
|
||||
display: table-cell; }
|
||||
border-left: 1px solid #e4d080;
|
||||
display: table-cell;
|
||||
min-width: 20px; }
|
||||
nav.sequence-nav ol li:first-child {
|
||||
border-left: none; }
|
||||
nav.sequence-nav ol li .inactive, nav.sequence-nav ol li a.seq_video_inactive, nav.sequence-nav ol li a.seq_other_inactive, nav.sequence-nav ol li a.seq_vertical_inactive, nav.sequence-nav ol li a.seq_problem_inactive {
|
||||
background-repeat: no-repeat; }
|
||||
nav.sequence-nav ol li .inactive:hover, nav.sequence-nav ol li a.seq_video_inactive:hover, nav.sequence-nav ol li a.seq_other_inactive:hover, nav.sequence-nav ol li a.seq_vertical_inactive:hover, nav.sequence-nav ol li a.seq_problem_inactive:hover {
|
||||
@@ -2922,25 +2988,21 @@ nav.sequence-nav ol li .visited:hover, nav.sequence-nav ol li a.seq_video_visite
|
||||
background-color: #f6efd4;
|
||||
background-position: center center; }
|
||||
nav.sequence-nav ol li .active, nav.sequence-nav ol div.header-wrapper header nav.courseware li.courseware a, div.header-wrapper header nav.courseware nav.sequence-nav ol li.courseware a, nav.sequence-nav ol div.header-wrapper header nav.book li.book a, div.header-wrapper header nav.book nav.sequence-nav ol li.book a, nav.sequence-nav ol div.header-wrapper header nav.info li.info a, div.header-wrapper header nav.info nav.sequence-nav ol li.info a, nav.sequence-nav ol div.header-wrapper header nav.discussion li.discussion a, div.header-wrapper header nav.discussion nav.sequence-nav ol li.discussion a, nav.sequence-nav ol div.header-wrapper header nav.wiki li.wiki a, div.header-wrapper header nav.wiki nav.sequence-nav ol li.wiki a, nav.sequence-nav ol div.header-wrapper header nav.profile li.profile a, div.header-wrapper header nav.profile nav.sequence-nav ol li.profile a, nav.sequence-nav ol li section.course-index div#accordion h3.ui-accordion-header.ui-state-active, section.course-index div#accordion nav.sequence-nav ol li h3.ui-accordion-header.ui-state-active, nav.sequence-nav ol li section.course-index div#accordion div#wiki_panel input.ui-accordion-header.ui-state-active[type="button"], section.course-index div#accordion div#wiki_panel nav.sequence-nav ol li input.ui-accordion-header.ui-state-active[type="button"], nav.sequence-nav ol li div#wiki_panel section.course-index div#accordion input.ui-accordion-header.ui-state-active[type="button"], div#wiki_panel section.course-index div#accordion nav.sequence-nav ol li input.ui-accordion-header.ui-state-active[type="button"], nav.sequence-nav ol li a.seq_video_active, nav.sequence-nav ol li a.seq_other_active, nav.sequence-nav ol li a.seq_vertical_active, nav.sequence-nav ol li a.seq_problem_active {
|
||||
background-color: #fff;
|
||||
background-repeat: no-repeat;
|
||||
-webkit-box-shadow: 0 1px 0 white;
|
||||
-moz-box-shadow: 0 1px 0 white;
|
||||
box-shadow: 0 1px 0 white;
|
||||
background-color: #fff;
|
||||
background-repeat: no-repeat; }
|
||||
box-shadow: 0 1px 0 white; }
|
||||
nav.sequence-nav ol li .active:hover, nav.sequence-nav ol div.header-wrapper header nav.courseware li.courseware a:hover, div.header-wrapper header nav.courseware nav.sequence-nav ol li.courseware a:hover, nav.sequence-nav ol div.header-wrapper header nav.book li.book a:hover, div.header-wrapper header nav.book nav.sequence-nav ol li.book a:hover, nav.sequence-nav ol div.header-wrapper header nav.info li.info a:hover, div.header-wrapper header nav.info nav.sequence-nav ol li.info a:hover, nav.sequence-nav ol div.header-wrapper header nav.discussion li.discussion a:hover, div.header-wrapper header nav.discussion nav.sequence-nav ol li.discussion a:hover, nav.sequence-nav ol div.header-wrapper header nav.wiki li.wiki a:hover, div.header-wrapper header nav.wiki nav.sequence-nav ol li.wiki a:hover, nav.sequence-nav ol div.header-wrapper header nav.profile li.profile a:hover, div.header-wrapper header nav.profile nav.sequence-nav ol li.profile a:hover, nav.sequence-nav ol li section.course-index div#accordion h3.ui-accordion-header.ui-state-active:hover, section.course-index div#accordion nav.sequence-nav ol li h3.ui-accordion-header.ui-state-active:hover, nav.sequence-nav ol li section.course-index div#accordion div#wiki_panel input.ui-accordion-header.ui-state-active[type="button"]:hover, section.course-index div#accordion div#wiki_panel nav.sequence-nav ol li input.ui-accordion-header.ui-state-active[type="button"]:hover, nav.sequence-nav ol li div#wiki_panel section.course-index div#accordion input.ui-accordion-header.ui-state-active[type="button"]:hover, div#wiki_panel section.course-index div#accordion nav.sequence-nav ol li input.ui-accordion-header.ui-state-active[type="button"]:hover, nav.sequence-nav ol li a.seq_video_active:hover, nav.sequence-nav ol li a.seq_other_active:hover, nav.sequence-nav ol li a.seq_vertical_active:hover, nav.sequence-nav ol li a.seq_problem_active:hover {
|
||||
background-color: #fff;
|
||||
background-position: center; }
|
||||
nav.sequence-nav ol li a {
|
||||
-webkit-box-shadow: 1px 0 0 white;
|
||||
-moz-box-shadow: 1px 0 0 white;
|
||||
box-shadow: 1px 0 0 white;
|
||||
background-position: center center;
|
||||
border: none;
|
||||
border-right: 1px solid #eddfaa;
|
||||
cursor: pointer;
|
||||
padding: 15px 4px 14px;
|
||||
width: 28px;
|
||||
display: block;
|
||||
height: 17px;
|
||||
padding: 15px 0 14px;
|
||||
-webkit-transition-property: all;
|
||||
-moz-transition-property: all;
|
||||
-ms-transition-property: all;
|
||||
@@ -2960,7 +3022,8 @@ nav.sequence-nav ol li a {
|
||||
-moz-transition-delay: 0;
|
||||
-ms-transition-delay: 0;
|
||||
-o-transition-delay: 0;
|
||||
transition-delay: 0; }
|
||||
transition-delay: 0;
|
||||
width: 100%; }
|
||||
nav.sequence-nav ol li a.seq_video_inactive {
|
||||
background-image: url("/static/images/sequence-nav/video-icon-normal.png");
|
||||
background-position: center; }
|
||||
@@ -3020,8 +3083,8 @@ nav.sequence-nav ol li p {
|
||||
white-space: pre-wrap;
|
||||
z-index: 99; }
|
||||
nav.sequence-nav ol li p.shown {
|
||||
opacity: 1;
|
||||
margin-top: 4px; }
|
||||
margin-top: 4px;
|
||||
opacity: 1; }
|
||||
nav.sequence-nav ol li p:empty {
|
||||
background: none; }
|
||||
nav.sequence-nav ol li p:empty::after {
|
||||
@@ -3031,9 +3094,9 @@ nav.sequence-nav ol li p::after {
|
||||
content: " ";
|
||||
display: block;
|
||||
height: 10px;
|
||||
left: 18px;
|
||||
position: absolute;
|
||||
top: -5px;
|
||||
left: 18px;
|
||||
-webkit-transform: rotate(45deg);
|
||||
-moz-transform: rotate(45deg);
|
||||
-ms-transform: rotate(45deg);
|
||||
@@ -3041,30 +3104,33 @@ nav.sequence-nav ol li p::after {
|
||||
transform: rotate(45deg);
|
||||
width: 10px; }
|
||||
nav.sequence-nav ul {
|
||||
float: right;
|
||||
margin-right: 1px;
|
||||
width: 8.696%;
|
||||
display: table-row; }
|
||||
position: absolute;
|
||||
right: 0;
|
||||
top: 0;
|
||||
width: 8.696%; }
|
||||
nav.sequence-nav ul li {
|
||||
display: table-cell; }
|
||||
float: left;
|
||||
width: 50%; }
|
||||
nav.sequence-nav ul li.prev a, nav.sequence-nav ul li.next a {
|
||||
-webkit-box-shadow: inset 1px 0 0 #faf7e9;
|
||||
-moz-box-shadow: inset 1px 0 0 #faf7e9;
|
||||
box-shadow: inset 1px 0 0 #faf7e9;
|
||||
background-color: #f2e7bf;
|
||||
background-position: center center;
|
||||
background-repeat: no-repeat;
|
||||
border-left: 1px solid #e4d080;
|
||||
-webkit-box-shadow: inset 1px 0 0 #faf7e9;
|
||||
-moz-box-shadow: inset 1px 0 0 #faf7e9;
|
||||
box-shadow: inset 1px 0 0 #faf7e9;
|
||||
-webkit-box-sizing: border-box;
|
||||
-moz-box-sizing: border-box;
|
||||
box-sizing: border-box;
|
||||
cursor: pointer;
|
||||
padding: 0 4px;
|
||||
text-indent: -9999px;
|
||||
width: 38px;
|
||||
display: block; }
|
||||
display: block;
|
||||
text-indent: -9999px; }
|
||||
nav.sequence-nav ul li.prev a:hover, nav.sequence-nav ul li.next a:hover {
|
||||
text-decoration: none;
|
||||
background-color: none;
|
||||
color: #7e691a;
|
||||
text-decoration: none;
|
||||
background-color: none; }
|
||||
text-decoration: none; }
|
||||
nav.sequence-nav ul li.prev a.disabled, nav.sequence-nav ul li.next a.disabled {
|
||||
cursor: normal;
|
||||
opacity: .4; }
|
||||
@@ -3077,16 +3143,13 @@ nav.sequence-nav ul li.next a {
|
||||
nav.sequence-nav ul li.next a:hover {
|
||||
background-color: none; }
|
||||
|
||||
section.course-content {
|
||||
position: relative; }
|
||||
section.course-content div#seq_content {
|
||||
margin-bottom: 60px; }
|
||||
section.course-content nav.sequence-bottom {
|
||||
position: absolute;
|
||||
bottom: 0;
|
||||
right: 50%;
|
||||
margin-right: -53px; }
|
||||
bottom: -22.652px;
|
||||
position: relative; }
|
||||
section.course-content nav.sequence-bottom ul {
|
||||
background-color: #f2e7bf;
|
||||
background-color: #f2e7bf;
|
||||
border: 1px solid #e4d080;
|
||||
border-bottom: 0;
|
||||
@@ -3095,12 +3158,12 @@ section.course-content nav.sequence-bottom ul {
|
||||
-ms-border-radius: 3px 3px 0 0;
|
||||
-o-border-radius: 3px 3px 0 0;
|
||||
border-radius: 3px 3px 0 0;
|
||||
overflow: hidden;
|
||||
width: 106px;
|
||||
background-color: #f2e7bf;
|
||||
-webkit-box-shadow: inset 0 0 0 1px #faf7e9;
|
||||
-moz-box-shadow: inset 0 0 0 1px #faf7e9;
|
||||
box-shadow: inset 0 0 0 1px #faf7e9; }
|
||||
box-shadow: inset 0 0 0 1px #faf7e9;
|
||||
margin: 0 auto;
|
||||
overflow: hidden;
|
||||
width: 106px; }
|
||||
section.course-content nav.sequence-bottom ul li {
|
||||
float: left; }
|
||||
section.course-content nav.sequence-bottom ul li.prev, section.course-content nav.sequence-bottom ul li.next {
|
||||
@@ -3110,10 +3173,9 @@ section.course-content nav.sequence-bottom ul li.prev a, section.course-content
|
||||
background-repeat: no-repeat;
|
||||
border-bottom: none;
|
||||
display: block;
|
||||
display: block;
|
||||
padding: 16.989px 4px;
|
||||
text-indent: -9999px;
|
||||
width: 45px;
|
||||
display: block;
|
||||
-webkit-transition-property: all;
|
||||
-moz-transition-property: all;
|
||||
-ms-transition-property: all;
|
||||
@@ -3133,7 +3195,8 @@ section.course-content nav.sequence-bottom ul li.prev a, section.course-content
|
||||
-moz-transition-delay: 0;
|
||||
-ms-transition-delay: 0;
|
||||
-o-transition-delay: 0;
|
||||
transition-delay: 0; }
|
||||
transition-delay: 0;
|
||||
width: 45px; }
|
||||
section.course-content nav.sequence-bottom ul li.prev a:hover, section.course-content nav.sequence-bottom ul li.next a:hover {
|
||||
background-color: #eddfaa;
|
||||
color: #7e691a;
|
||||
@@ -3287,6 +3350,11 @@ div.info-wrapper section.updates > ol > li {
|
||||
padding-bottom: 11.326px;
|
||||
margin-bottom: 11.326px;
|
||||
border-bottom: 1px solid #e3e3e3; }
|
||||
div.info-wrapper section.updates > ol > li:first-child {
|
||||
padding: 11.326px;
|
||||
margin: 0 -11.326px 22.652px;
|
||||
background: #f6efd4;
|
||||
border-bottom: 1px solid #eddfaa; }
|
||||
div.info-wrapper section.updates > ol > li h2 {
|
||||
float: left;
|
||||
width: 20.109%;
|
||||
|
||||
Reference in New Issue
Block a user