diff --git a/.sass-cache/d71392d31c3b10df78042d13a0384e71b83fa11e/_base-extends.scssc b/.sass-cache/d71392d31c3b10df78042d13a0384e71b83fa11e/_base-extends.scssc index 9be0315739..1c1088f366 100644 Binary files a/.sass-cache/d71392d31c3b10df78042d13a0384e71b83fa11e/_base-extends.scssc and b/.sass-cache/d71392d31c3b10df78042d13a0384e71b83fa11e/_base-extends.scssc differ diff --git a/.sass-cache/d71392d31c3b10df78042d13a0384e71b83fa11e/_base-variables.scssc b/.sass-cache/d71392d31c3b10df78042d13a0384e71b83fa11e/_base-variables.scssc index 7794c24f87..7975d6b23b 100644 Binary files a/.sass-cache/d71392d31c3b10df78042d13a0384e71b83fa11e/_base-variables.scssc and b/.sass-cache/d71392d31c3b10df78042d13a0384e71b83fa11e/_base-variables.scssc differ diff --git a/.sass-cache/d71392d31c3b10df78042d13a0384e71b83fa11e/_base.scssc b/.sass-cache/d71392d31c3b10df78042d13a0384e71b83fa11e/_base.scssc index ee4e461374..c9b948a6b2 100644 Binary files a/.sass-cache/d71392d31c3b10df78042d13a0384e71b83fa11e/_base.scssc and b/.sass-cache/d71392d31c3b10df78042d13a0384e71b83fa11e/_base.scssc differ diff --git a/.sass-cache/d71392d31c3b10df78042d13a0384e71b83fa11e/_courseware.scssc b/.sass-cache/d71392d31c3b10df78042d13a0384e71b83fa11e/_courseware.scssc index 66a0755085..59d180664c 100644 Binary files a/.sass-cache/d71392d31c3b10df78042d13a0384e71b83fa11e/_courseware.scssc and b/.sass-cache/d71392d31c3b10df78042d13a0384e71b83fa11e/_courseware.scssc differ diff --git a/.sass-cache/d71392d31c3b10df78042d13a0384e71b83fa11e/_profile.scssc b/.sass-cache/d71392d31c3b10df78042d13a0384e71b83fa11e/_profile.scssc index fed2c7989d..ec62964b12 100644 Binary files a/.sass-cache/d71392d31c3b10df78042d13a0384e71b83fa11e/_profile.scssc and b/.sass-cache/d71392d31c3b10df78042d13a0384e71b83fa11e/_profile.scssc differ diff --git a/.sass-cache/d71392d31c3b10df78042d13a0384e71b83fa11e/_textbook.scssc b/.sass-cache/d71392d31c3b10df78042d13a0384e71b83fa11e/_textbook.scssc index 739a0931c4..bf2de32d12 100644 Binary files a/.sass-cache/d71392d31c3b10df78042d13a0384e71b83fa11e/_textbook.scssc and b/.sass-cache/d71392d31c3b10df78042d13a0384e71b83fa11e/_textbook.scssc differ diff --git a/courseware.html b/courseware.html index 3937ead715..98ee9028c3 100644 --- a/courseware.html +++ b/courseware.html @@ -25,11 +25,13 @@ $('#hide_acc').click(function() { <%include file="navigation.html" />
-
- ${accordion} -
+
+
+ ${accordion} +
-
- ${content} -
+
+ ${content} +
+
diff --git a/help.html b/help.html index 8812418e67..8b1abcff84 100644 --- a/help.html +++ b/help.html @@ -2,7 +2,7 @@ <%include file="navigation.html" /> -
+

Help

If you need help, first try asking a question in the forums and in the IRC channel (irc.mitx.org, channel #6002). As the semester starts, we will add a Frequently Asked Questions section.

diff --git a/profile.html b/profile.html index 9bcbe4a27b..aa1b015c3a 100644 --- a/profile.html +++ b/profile.html @@ -68,51 +68,52 @@ $(function() { <%include file="navigation.html" />
- +
+

Course Progress

-
-

Course Progress

+ - +
    + % for hw in homeworks: +
  1. +

    ${ hw['chapter'] }

    +

    ${ hw['section'] }

    -
      - % for hw in homeworks: -
    1. -

      ${ hw['chapter'] }

      -

      ${ hw['section'] }

      - -
        - % for score in hw['scores']: -
      • ${ score[0] }/${ score[1] }
      • - % endfor -
      -
    2. - % endfor -
    -
+
    + % for score in hw['scores']: +
  • ${ score[0] }/${ score[1] }
  • + % endfor +
+ + % endfor + +
+
diff --git a/sass/_base-extends.scss b/sass/_base-extends.scss index 80d84d53e3..e24b3c2c93 100644 --- a/sass/_base-extends.scss +++ b/sass/_base-extends.scss @@ -6,20 +6,27 @@ visibility: hidden; } -.sidebar { - width: grid-width(4); - float: left; - margin-right: $gw-gutter; -} - -.content { - width: grid-width(8); - float: left; -} - .wrapper { - margin: 0 auto; - max-width: $max-width; - width: grid-width(12); - text-align: left; + margin: 0 auto; + max-width: $max-width; + width: grid-width(12); + text-align: left; +} + +.button { + @include box-shadow(inset 0 1px 0 lighten($mit-red, 10%), 0 0 3px #ccc); + @include linear-gradient(lighten($mit-red, 5%), darken($mit-red, 5%)); + @include border-radius(3px); + border: 1px solid darken($mit-red, 10%); + padding: 10px 15px; + color: #fff; + font: bold $body-font-size $body-font-family; + text-shadow: 0 1px 0 darken($mit-red, 10%); + cursor: pointer; + + &:hover, &:focus { + @include box-shadow(inset 0 1px 0 lighten($mit-red, 20%), 0 0 3px #ccc); + @include linear-gradient(lighten($mit-red, 10%), darken($mit-red, 5%)); + border: 1px solid darken($mit-red, 20%); + } } diff --git a/sass/_base-variables.scss b/sass/_base-variables.scss index d113330199..356869ada3 100644 --- a/sass/_base-variables.scss +++ b/sass/_base-variables.scss @@ -8,11 +8,6 @@ @return $base-line-height * $amount; } -@mixin border-box { - @include box-sizing(border-box); -} - - // Variables // ---------------------------------------- // @@ -22,8 +17,8 @@ $body-font-size: 14px; // grid $columns: 12; -$column-width: golden-ratio($body-font-size, 4); -$gutter-width: golden-ratio($body-font-size, 1); +$column-width: 80px; +$gutter-width: 25px; $max-width: ($columns * $column-width) + (($columns - 1) * $gutter-width); $gw-column: perc($column-width); @@ -31,7 +26,7 @@ $gw-gutter: perc($gutter-width); $body-line-height: golden-ratio($body-font-size, 1); // color -$light-gray: #f3f3f3; +$light-gray: #ddd; $dark-gray: #333; $mit-red: #993333; diff --git a/sass/_base.scss b/sass/_base.scss index 4d847f041d..95f3c30136 100644 --- a/sass/_base.scss +++ b/sass/_base.scss @@ -1,3 +1,33 @@ +h1 { + +} + +h2 { + +} + +h3 { + +} + p { margin-bottom: $body-line-height; } + +#{$all-text-inputs}, textarea { + @include border-radius(3px); + @include box-shadow(0 -1px 0 #fff); + @include linear-gradient(#eee, #fff); + border: 1px solid #bbb; + font: $body-font-size $body-font-family; + padding: 8px; + + &:focus { + border-color: $mit-red; + } +} + +input[type="submit"], input[type="button"], button { + // @extend .button; +} + diff --git a/sass/_courseware.scss b/sass/_courseware.scss index eb5a29de2e..ada6ac6fd4 100644 --- a/sass/_courseware.scss +++ b/sass/_courseware.scss @@ -1,65 +1,77 @@ -div#accordion { - @include box-shadow( inset -1px 0 0 #f6f6f6); - background: #e3e3e3; - border-right: 1px solid #d3d3d3; - display: table-cell; - font-family: $body-font-family; - text-shadow: 0 1px 0 #f6f6f6; - vertical-align: top; - width: 280px; +div.course-wrapper { + display: table; + width: 100%; - h3 { - &.ui-accordion-header { - color: #000; + div#accordion { + @include box-shadow( inset -1px 0 0 #f6f6f6); + background: #e3e3e3; + border-right: 1px solid #d3d3d3; + display: table-cell; + font-family: $body-font-family; + text-shadow: 0 1px 0 #f6f6f6; + vertical-align: top; + width: grid-width(3); - a { - font-size: $body-font-size; - color: lighten($text-color, 10%); - } - - &.ui-state-default { - background: none; - font-weight: normal; - border: none; - border-bottom: 1px solid #d3d3d3; - @include box-shadow(0 1px 0 #eee); - } - - &.ui-state-hover { - border: none; - border-bottom: 1px solid #d3d3d3; - } - - &.ui-state-active { - background: none; - border-bottom: 1px solid #aaa; - border: 0; + h3 { + &.ui-accordion-header { color: #000; - font-weight: bold; - @include box-shadow(none); a { + font-size: $body-font-size; + color: lighten($text-color, 10%); + } + + &.ui-state-default { + background: none; + font-weight: normal; + border: none; + border-bottom: 1px solid #d3d3d3; + @include box-shadow(0 1px 0 #eee); + } + + &.ui-state-hover { + border: none; + border-bottom: 1px solid #d3d3d3; + } + + &.ui-state-active { + background: none; + border-bottom: 1px solid #aaa; + border: 0; color: #000; + font-weight: bold; + @include box-shadow(none); + + a { + color: #000; + } + } + } + } + + ul.ui-accordion-content { + @include border-radius(0); + @include box-shadow( inset -1px 0 0 #e6e6e6); + background: #d6d6d6; + border: none; + border-top: 1px solid #c3c3c3; + border-bottom: 1px solid #c3c3c3; + font-size: 12px; + margin: 0; + + li { + &.active { + font-weight: bold; } } } } - ul.ui-accordion-content { - @include border-radius(0); - @include box-shadow( inset -1px 0 0 #e6e6e6); - background: #d6d6d6; - border: none; - border-top: 1px solid #c3c3c3; - border-bottom: 1px solid #c3c3c3; - font-size: 12px; - margin: 0; + section.course-content { + @include box-sizing(border-box); + display: table-cell; + padding: $gw-gutter; + vertical-align: top; + width: grid-width(9); } } - -section.course-content { - @include box-sizing(border-box); - display: table-cell; - padding: $gw-gutter; - vertical-align: top; -} diff --git a/sass/_profile.scss b/sass/_profile.scss index a8c9f60dc1..093b7acd1e 100644 --- a/sass/_profile.scss +++ b/sass/_profile.scss @@ -1,17 +1,28 @@ -section.user-info { - width: grid-width(6); - float: left; - margin-right: $gw-gutter; -} +div.profile-wrapper { + display: table; -section.course-info { - width: grid-width(6); - float: left; + section.user-info { + @include box-sizing(border-box); + margin-right: $gw-gutter; + padding: $body-line-height; + width: grid-width(6); + background: #e3e3e3; + border-right: 1px solid #d3d3d3; + text-shadow: 0 1px 0 #f6f6f6; + display: table-cell; + } - ul { - li { - display: inline-block; - padding-right: 1em; + section.course-info { + @include box-sizing(border-box); + padding: $body-line-height; + width: grid-width(6); + display: table-cell; + + ul { + li { + display: inline-block; + padding-right: 1em; + } } } } diff --git a/sass/_textbook.scss b/sass/_textbook.scss index c4466c0f6c..f4f6f514c7 100644 --- a/sass/_textbook.scss +++ b/sass/_textbook.scss @@ -1,11 +1,69 @@ -ul#booknav { - @extend .sidebar; -} +div.book-wrapper { + display: table; -section.book { - @extend .content; + ul#booknav { + @include box-shadow( inset -1px 0 0 #f6f6f6); + @include box-sizing(border-box); + background: #e3e3e3; + border-right: 1px solid #d3d3d3; + font-family: $body-font-family; + padding: $body-line-height; + text-shadow: 0 1px 0 #f6f6f6; + vertical-align: top; + width: grid-width(3); + min-width: 240px; + display: table-cell; - img { - border: 1px solid $border-color; + li { + ul { + background: none; + } + } + } + + section.book { + @include box-sizing(border-box); + padding: $body-line-height; + vertical-align: top; + width: grid-width(9) + $gw-gutter; + display: table-cell; + + nav { + background: #F6EFD4; + border-bottom: 1px solid darken(#F6EFD4, 10%); + margin: (-$body-line-height) (-$body-line-height) $body-line-height; + + ul { + @extend .clearfix; + li { + padding: 15px; + + &.last { + float: left; + } + + &.next { + float: right; + } + + a { + font-size: 12px; + text-transform: uppercase; + color: darken(#F6EFD4, 80%); + text-shadow: 0 1px 0 #fff; + + &:hover { + color: darken(#F6EFD4, 60%); + } + } + } + } + } + + section.page { + img { + border: 1px solid $border-color; + } + } } } diff --git a/staticbook.html b/staticbook.html index 5c4f792b01..d08a96727c 100644 --- a/staticbook.html +++ b/staticbook.html @@ -37,24 +37,27 @@ function next_page() { <%include file="navigation.html" />
-
    - <%include file="book_toc.html" /> -
+
+
    + <%include file="book_toc.html" /> +
-
- +
-
- +
+ + + +
-
+