diff --git a/.sass-cache/d71392d31c3b10df78042d13a0384e71b83fa11e/_base-variables.scssc b/.sass-cache/d71392d31c3b10df78042d13a0384e71b83fa11e/_base-variables.scssc index ff74ffee4b..7794c24f87 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/_courseware.scssc b/.sass-cache/d71392d31c3b10df78042d13a0384e71b83fa11e/_courseware.scssc index b10a49d10a..66a0755085 100644 Binary files a/.sass-cache/d71392d31c3b10df78042d13a0384e71b83fa11e/_courseware.scssc and b/.sass-cache/d71392d31c3b10df78042d13a0384e71b83fa11e/_courseware.scssc differ diff --git a/.sass-cache/d71392d31c3b10df78042d13a0384e71b83fa11e/_font-face.scssc b/.sass-cache/d71392d31c3b10df78042d13a0384e71b83fa11e/_font-face.scssc new file mode 100644 index 0000000000..7cbf7718a2 Binary files /dev/null and b/.sass-cache/d71392d31c3b10df78042d13a0384e71b83fa11e/_font-face.scssc differ diff --git a/.sass-cache/d71392d31c3b10df78042d13a0384e71b83fa11e/_layout.scssc b/.sass-cache/d71392d31c3b10df78042d13a0384e71b83fa11e/_layout.scssc index 1213456810..9f5aa2dcea 100644 Binary files a/.sass-cache/d71392d31c3b10df78042d13a0384e71b83fa11e/_layout.scssc and b/.sass-cache/d71392d31c3b10df78042d13a0384e71b83fa11e/_layout.scssc differ diff --git a/.sass-cache/d71392d31c3b10df78042d13a0384e71b83fa11e/application.scssc b/.sass-cache/d71392d31c3b10df78042d13a0384e71b83fa11e/application.scssc index 1436533955..271c713c9f 100644 Binary files a/.sass-cache/d71392d31c3b10df78042d13a0384e71b83fa11e/application.scssc and b/.sass-cache/d71392d31c3b10df78042d13a0384e71b83fa11e/application.scssc differ diff --git a/homework.html b/homework.html index 6e5a83b15e..86f356dbc6 100644 --- a/homework.html +++ b/homework.html @@ -1,10 +1,14 @@

${ homework['name']}

+
    % for problem in homework['problems']: -

    ${ problem['name'] }

    - ${ problem['html'] } -
    - - +
  1. +

    ${ problem['name'] }

    + ${ problem['html'] } +
    + + +
    2. % endfor +
diff --git a/sass/_base-variables.scss b/sass/_base-variables.scss index 7adc1d1617..d113330199 100644 --- a/sass/_base-variables.scss +++ b/sass/_base-variables.scss @@ -17,7 +17,7 @@ // ---------------------------------------- // // fonts -$body-font-family: "Lucida Grande", "Lucida Sans Unicode", "Lucida Sans", Geneva, Verdana, sans-serif;; +$body-font-family: "Droid Sans", "Lucida Grande", "Lucida Sans Unicode", "Lucida Sans", Geneva, Verdana, sans-serif;; $body-font-size: 14px; // grid diff --git a/sass/_courseware.scss b/sass/_courseware.scss index 8f530e7760..eb5a29de2e 100644 --- a/sass/_courseware.scss +++ b/sass/_courseware.scss @@ -4,7 +4,6 @@ div#accordion { border-right: 1px solid #d3d3d3; display: table-cell; font-family: $body-font-family; - // padding: $body-line-height 0; text-shadow: 0 1px 0 #f6f6f6; vertical-align: top; width: 280px; @@ -33,6 +32,7 @@ div#accordion { &.ui-state-active { background: none; + border-bottom: 1px solid #aaa; border: 0; color: #000; font-weight: bold; @@ -46,8 +46,12 @@ div#accordion { } 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; } @@ -56,6 +60,6 @@ div#accordion { section.course-content { @include box-sizing(border-box); display: table-cell; - padding: $gw-gutter 0 $gw-gutter $gw-gutter; + padding: $gw-gutter; vertical-align: top; } diff --git a/sass/_font-face.scss b/sass/_font-face.scss new file mode 100644 index 0000000000..132e3a0d75 --- /dev/null +++ b/sass/_font-face.scss @@ -0,0 +1,12 @@ +@font-face { + font-family: 'Droid Sans'; + font-style: normal; + font-weight: normal; + src: local('Droid Sans'), local('DroidSans'), url('http://themes.googleusercontent.com/static/fonts/droidsans/v3/s-BiyweUPV0v-yRb-cjciL3hpw3pgy2gAi-Ip7WPMi0.woff') format('woff'); +} +@font-face { + font-family: 'Droid Sans'; + font-style: normal; + font-weight: bold; + src: local('Droid Sans Bold'), local('DroidSans-Bold'), url('http://themes.googleusercontent.com/static/fonts/droidsans/v3/EFpQQyG9GqCrobXxL-KRMXbFhgvWbfSbdVg11QabG8w.woff') format('woff'); +} diff --git a/sass/_layout.scss b/sass/_layout.scss index f3db5139c9..9cd10127cb 100644 --- a/sass/_layout.scss +++ b/sass/_layout.scss @@ -12,23 +12,23 @@ html { @include box-shadow(inset 0 1px 0 lighten($mit-red, 10%), 0 1px 1px #ccc); @include linear-gradient(lighten($mit-red, 5%), darken($mit-red, 5%)); border-bottom: 1px solid darken($mit-red, 10%); - z-index: 99; header { @extend .clearfix; @extend .wrapper; @include box-sizing(border-box); padding: 0 $body-line-height; + text-shadow: 0 -1px 0 darken($mit-red, 10%); h1 { - border-right: 1px solid $mit-red; + border-right: 1px solid darken($mit-red, 5%); font-size: $body-font-size; font-weight: bold; margin: 0 $gw-gutter 0 0; padding: 15px $gw-gutter 15px 0; display: block; float: left; - text-shadow: 0 1px 0 lighten($mit-red, 10%); + color: #fff; } nav { @@ -49,7 +49,12 @@ html { a { color: #fff; - text-shadow: 0 -1px 0 darken($mit-red, 10%); + + &:hover { + color: rgba(#fff, .7); + background-color: none; + text-decoration: none; + } } } } @@ -60,12 +65,11 @@ html { section.main-content { @extend .clearfix; @extend .wrapper; - @include box-shadow(0 0px 1px #ccc); + @include box-shadow(0 1px 0 #fff); @include box-sizing(border-box); background: #fff; border-top: 0; border: 1px solid #ccc; - z-index: 0; } img { diff --git a/sass/application.scss b/sass/application.scss index 77b8cb0fe0..e5169b13a5 100644 --- a/sass/application.scss +++ b/sass/application.scss @@ -1,5 +1,6 @@ @import "bourbon/bourbon"; @import "reset"; +@import "font-face"; // Base layout @import "base-variables", "base-extends", "base"; diff --git a/seq_module.html b/seq_module.html index 6309245dd3..bcb830b9b3 100644 --- a/seq_module.html +++ b/seq_module.html @@ -1,14 +1,13 @@ - - % for t in range(1,1+len(items)): - +
    +
  1.  
    2. +
% endfor - - - - - - -
 






















 
+
Previous
+
Next
+ + +
+ diff --git a/vert_module.html b/vert_module.html index a50c9b2c8e..6205d3f328 100644 --- a/vert_module.html +++ b/vert_module.html @@ -1,7 +1,7 @@ -
+
    % for t in items: -
    - ${t[1]['content']} -
    +
  1. + ${t[1]['content']} +
    2. % endfor -
+