diff --git a/cms/static/img/hiw-feature1.png b/cms/static/img/hiw-feature1.png index 381b182a1b..c372dc7a8a 100644 Binary files a/cms/static/img/hiw-feature1.png and b/cms/static/img/hiw-feature1.png differ diff --git a/cms/static/img/hiw-feature2.png b/cms/static/img/hiw-feature2.png new file mode 100644 index 0000000000..8edfbcff3a Binary files /dev/null and b/cms/static/img/hiw-feature2.png differ diff --git a/cms/static/img/hiw-feature3.png b/cms/static/img/hiw-feature3.png new file mode 100644 index 0000000000..4dd1a5f758 Binary files /dev/null and b/cms/static/img/hiw-feature3.png differ diff --git a/cms/static/img/thumb-hiw-feature2.png b/cms/static/img/thumb-hiw-feature2.png new file mode 100644 index 0000000000..a549c7d2de Binary files /dev/null and b/cms/static/img/thumb-hiw-feature2.png differ diff --git a/cms/static/img/thumb-hiw-feature3.png b/cms/static/img/thumb-hiw-feature3.png new file mode 100644 index 0000000000..24185b323e Binary files /dev/null and b/cms/static/img/thumb-hiw-feature3.png differ diff --git a/cms/static/sass/_header.scss b/cms/static/sass/_header.scss index 85f7f9eb19..e0648279a6 100644 --- a/cms/static/sass/_header.scss +++ b/cms/static/sass/_header.scss @@ -128,6 +128,7 @@ .label-prefix { display: block; @include font-size(11); + font-weight: 400; } .ss-icon { @@ -346,7 +347,7 @@ display: inline-block; vertical-align: middle; margin: 0 $baseline 0 0; - font-weight: 600; + font-weight: 500; &:last-child { margin-right: 0; @@ -392,6 +393,18 @@ } +// active/current nav states +body.howitworks .nav-not-signedin-hiw, +body.signin .nav-not-signedin-signin, +body.signup .nav-not-signedin-signup, +body.course.outline .nav-course-courseware +{ + + a { + color: $blue; + } +} + // js enabled .js { diff --git a/cms/static/sass/_index.scss b/cms/static/sass/_index.scss index 08bb7b746a..04e353fd1b 100644 --- a/cms/static/sass/_index.scss +++ b/cms/static/sass/_index.scss @@ -162,7 +162,7 @@ .ss-icon { @include font-size(18); - @include border-radius(2px); + @include border-top-radius(3px); display: inline-block; padding: ($baseline/4) ($baseline/2); background: $blue; @@ -232,18 +232,17 @@ .title { @include font-size(16); margin: 0 0 ($baseline/4) 0; - font-weight: 600; + font-weight: 500; color: $gray-d3; } &:hover { @include box-shadow(0 1px ($baseline/10) $shadow-l1); - background: $blue; - color: $blue-l3; + background: $blue-l5; top: -($baseline/5); .title, strong { - color: $white; + color: $blue; } } @@ -334,4 +333,66 @@ } } } + + // js dependant + &.js { + + .content-modal { + @include border-bottom-radius(2px); + @include box-sizing(border-box); + @include box-shadow(0 2px 4px $shadow-d1); + position: relative; + display: none; + width: 700px; + overflow: hidden; + border: 1px solid $gray-d1; + padding: ($baseline); + background: $white; + + .action-modal-close { + @include transition(top .25s ease-in-out); + @include border-bottom-radius(3px); + position: absolute; + top: -3px; + right: $baseline; + padding: ($baseline/4) ($baseline/2) 0 ($baseline/2); + background: $gray-l3; + text-align: center; + + .label { + @include text-sr(); + } + + .ss-icon { + @include font-size(18); + color: $white; + } + + &:hover { + background: $blue; + top: 0; + } + } + + img { + @include box-sizing(border-box); + width: 100%; + padding: ($baseline/10); + border: 1px solid $gray-l4; + } + + .title { + @include font-size(18); + margin: 0 0 ($baseline/2) 0; + font-weight: 600; + color: $gray-d3; + } + + .description { + @include font-size(13); + margin-top: ($baseline/2); + color: $gray-l1; + } + } + } } diff --git a/cms/static/sass/_modal.scss b/cms/static/sass/_modal.scss index 854d1e1045..f9fbf81a8f 100644 --- a/cms/static/sass/_modal.scss +++ b/cms/static/sass/_modal.scss @@ -54,4 +54,16 @@ @include white-button; margin-top: 13px; } +} + +// lean modal alternative +#lean_overlay { + position: fixed; + z-index: 10000; + top: 0px; + left: 0px; + display: none; + height: 100%; + width: 100%; + background: $black; } \ No newline at end of file diff --git a/cms/static/sass/_subsection.scss b/cms/static/sass/_subsection.scss index 32c983ee3a..a39c0d757a 100644 --- a/cms/static/sass/_subsection.scss +++ b/cms/static/sass/_subsection.scss @@ -1,3 +1,11 @@ +.subsection .main-wrapper { + margin: 40px; +} + +.subsection .inner-wrapper { + @include clearfix(); +} + .subsection-body { padding: 32px 40px; @include clearfix; diff --git a/cms/static/sass/_unit.scss b/cms/static/sass/_unit.scss index d8ca1117e9..5199c92a0e 100644 --- a/cms/static/sass/_unit.scss +++ b/cms/static/sass/_unit.scss @@ -1,5 +1,5 @@ -.unit .main-wrapper, -.subsection .main-wrapper { +.unit .main-wrapper { + @include clearfix(); margin: 40px; } diff --git a/cms/templates/edit_subsection.html b/cms/templates/edit_subsection.html index e57f3550e7..7d20d449ff 100644 --- a/cms/templates/edit_subsection.html +++ b/cms/templates/edit_subsection.html @@ -98,6 +98,7 @@ + <%block name="jsextra"> diff --git a/cms/templates/howitworks.html b/cms/templates/howitworks.html index e799143287..28b67142df 100644 --- a/cms/templates/howitworks.html +++ b/cms/templates/howitworks.html @@ -59,7 +59,7 @@
  • - Studio Keeps Your Learning Sequences and Lectures, Together + Studio Keeps Your Learning Sequences and Lectures, Together
    Studio Keeps Your Learning Sequences and Lectures, Together
    @@ -93,7 +93,7 @@
  • - Studio Gives You Simple, Fast, and Incremental Publishing. With Friends. + Studio Gives You Simple, Fast, and Incremental Publishing. With Friends.
    Studio Gives You Simple, Fast, and Incremental Publishing. With Friends.
    @@ -144,27 +144,55 @@ - +

    Feature #3

    +
    + +
    Integer posuere erat a ante venenatis dapibus posuere velit aliquet. Morbi leo risus, porta ac consectetur ac, vestibulum at eros.
    +
    + +     + ␡ + close modal + + <%block name="jsextra"> diff --git a/cms/templates/widgets/header.html b/cms/templates/widgets/header.html index 62954b8211..8c3ea9fc72 100644 --- a/cms/templates/widgets/header.html +++ b/cms/templates/widgets/header.html @@ -78,6 +78,7 @@
    @@ -89,8 +90,8 @@