From b98d833762340f600c29bd3116ad44305b2e5657 Mon Sep 17 00:00:00 2001 From: Kyle Fiedler Date: Thu, 5 Jan 2012 21:39:55 -0500 Subject: [PATCH] Added some slight style and new typeface --HG-- branch : kf-refactor --- .../_base-variables.scssc | Bin 4640 -> 4689 bytes .../_courseware.scssc | Bin 6499 -> 6959 bytes .../_font-face.scssc | Bin 0 -> 2340 bytes .../_layout.scssc | Bin 11033 -> 11351 bytes .../application.scssc | Bin 1031 -> 1090 bytes homework.html | 14 ++++++++----- sass/_base-variables.scss | 2 +- sass/_courseware.scss | 8 ++++++-- sass/_font-face.scss | 12 +++++++++++ sass/_layout.scss | 16 +++++++++------ sass/application.scss | 1 + seq_module.html | 19 +++++++++--------- vert_module.html | 10 ++++----- 13 files changed, 53 insertions(+), 29 deletions(-) create mode 100644 .sass-cache/d71392d31c3b10df78042d13a0384e71b83fa11e/_font-face.scssc create mode 100644 sass/_font-face.scss diff --git a/.sass-cache/d71392d31c3b10df78042d13a0384e71b83fa11e/_base-variables.scssc b/.sass-cache/d71392d31c3b10df78042d13a0384e71b83fa11e/_base-variables.scssc index ff74ffee4b19dc5d628c89fecfad87c48f2f4f39..7794c24f87b2d473307f979fa65c26af9b264c7d 100644 GIT binary patch delta 120 zcmZ3Wa#3Z1n1)G;p{0SDMM_eVxj~YdnTdt5c~YW*iAiFLp=oNOVVZ@hrFn86Sz2OZqH&^GQfjh+d9sP6Wuk>avc*Qb mm#mWm*kmU=vPo>NXA|dOnZvBFKXHQc=DmEOjGGk%44D8JQy6~$ diff --git a/.sass-cache/d71392d31c3b10df78042d13a0384e71b83fa11e/_courseware.scssc b/.sass-cache/d71392d31c3b10df78042d13a0384e71b83fa11e/_courseware.scssc index b10a49d10af1f0951f654cb4b354e658fef5bad7..66a0755085c7e97ebdc011328fa7d166d22bf180 100644 GIT binary patch delta 1322 zcmZux&rcgy5at>DY_ET=F~;j(EH+@EC9G{QF|RS3n4}mrJrNPfhji^VbR~i<3=(aW zOVw66L{+6xq_mZC>LH3$kqG6IOAa~Zm_H$k!X;ALb0wn8+chyp(MoT>nSJxkr}@Ty zlRGHlck#avylDRYfnu~s;*XY-n-C$PfMS zxBXk~MIXw?A+!V*crzrwmZZFb_f@^IaI*w5DnB+7~;V^|gq5j$rLMB(crGBmdP@ zey!7Yf_;Kw7Y0y`6xbqJ_%$%OvBHbzd2tV-Rd17p-At^cg0<$3-q@Mh(R5?4jb5&? z;VNyiq?<|T{RsLls~Kb|aKEY2JIJyNJ}dzM{D1_Ae+0jz((P@Eiq{}!{BtY&&XLow-fmzHg1q3Ho=dKK~MU0{5N}= zYiS8JW1M*!-UZU|hZuk*Ux@Ekv}mdO!ox(a%-?v>YHUr_s%uRlj)ka5 zVR}xo$y-{DoYhQ{Rj$>yl{lt~Cd_FzNL!ZRqs0kNEN74dK3Vd}2|QKc-FRRjXwpxU zGP04c{aN7_RY5F#rSd~8iSLm3(UmG%;i@BtI1rr|Mm*g_WFw<{+05lNXAPVNm+7jQZ->PpoQA9MJ7jCyAV8EVPvS;IQ9^e6VllXdfPx13D?N^ksIc zk3jx!*E*htT{RMcEs`BxitxVU6nplFvFyMoPa?9pt~WZ4pgE9p=UQByE6Bl0ZvmYJ zhsRG1(&V|&5cP;ihU;$5DdQ7ln&PeDCX-`iNS>B)`$lDbu1NKLOF=ki$jlltC5PNp z*BiA`Q(Xv}-}b@>&&z-){`Vyw?0FZ>@N@7LnEBIigMVlj;=)*UCsy5VHq}k|#fwz? Gm;VL;Z~vMA diff --git a/.sass-cache/d71392d31c3b10df78042d13a0384e71b83fa11e/_font-face.scssc b/.sass-cache/d71392d31c3b10df78042d13a0384e71b83fa11e/_font-face.scssc new file mode 100644 index 0000000000000000000000000000000000000000..7cbf7718a242991874aa05dad2646166d66dfb42 GIT binary patch literal 2340 zcmcgtTW`}a6rK?3(zIJQ#%+L5v7>+vg6gLbi=qz&kk#i!x6(JfSu14HUR$U3O%uGNd9t<77aY zCs`c@DZFz57~Y*=E^16QsT3048|A_KS&ZAN^7#>#an4eDGf2EEL=0**(ZxN?s{y4! zh|f7@u2h^Hd)1}A8W%_qx27h?Yo1aGmsi*N%^I)lkz|119>1&iE6J%-aX-1_sM(DN z%{WLlgXg5uinre%zb5tSfcpOR<)$qcd?kc*q?tjhJ53R>pd- z{2b_?i+=wgJ~>GacMre3VAT2W^{Ddd^z{elpd0kxJAT{o-UW@u333j11{XztW#7Lj z`b+t66+RgAxe6bSzo!MB=Bul zLKP=2IaHBet2U>!Qt2^mg+yw7>=0!i|(o%yHGgG*&NDLJ{ssU%l3%`5LBOV6X1PZ|C?Pq*JET{tR-EP3n zOaloG!e7U`;33PQcKC&zbGKs=M~NT43UTlm+X6RR`{8HS2lsga3Gf{sGp%R5N~~X* z5LvUnK$AeyLa+B7Hh>7Zg9vd1;J)`3eCk$F7}ne&vLc3W4%7217mmq|AV@s)2%Yee z?-sjDX)>klR)iBWV)v+{k2>}$^KEaS)`!$FOdSL{GYnjfMk+sX7_m?2PKxe4flhvw zb9u2l<4jB59_20LrdFoifjge?j>}L&m$DlhigHO?*YcZ2Sy2|VWv#U7A{mr}Rvs0$ zq1`AL9voCW`E`;4`{)UtgZv7kX3MKdD~;-SN+pqm&!J|j+YPN!a3|rxzO=-YS94jS zZVAUSE(4!rFrUPI+YIh6qJQxKT?XlrEILU#Ogm@bZWi-;C^;~8`uT6HLDz8)`KPj4 zG^68b$(*$?d!cD`5%xoq%quo) z5u}c*;pKW3F;vHG%CZpL>o|#CHS4}iHThpVq{+0&6%t`J-06Ou?i$z+ACnn>%$@UP zu&3C7L%749?##h-uh8jcR_y6s0bgqyS^?;sk*?GWB8KYtnhL5SXT}AQ6KBzzFcFyv zXX}HBp*r?yu!Z20$RwAutIgt(B^zFWe4>iC0FtH?U16L!TY>_uB3!%c*X z^%P>Lj%So&AvhjgKySlJG>z6wZP)6fiJ>}zjU?Jaz)F+7C0o$7nzmvM>NU6wTat+O zD|e+25WEz79|mPNd@1+C53wW!V!p=F?gSj`egq%N{)(>$(2hqu^x2P(xc$P8DCUiI z^7e>y{Nr7^uJ?%psRTYEux=)84jr!}A_ei#R4QUM5`L3A;7|D;J9K?ZOp5fp1eD@D Qe31yiH}SbjSK@E<9~ttai~s-t delta 1304 zcmZWpOK%cU6y_q1JO*1{Qz);QfkLUGv=l47(Narmsn$oWN*qz?01;nQZPNPw0h+Yt zL=&5;8{^Vwh>2U5CYrj?xN@NjS3Y9g8I9gMfK2KvPQLTF-}&a;llv}v=fDEjSt!Kh zSWkRYU!kWrQ79F9y5&T^FE7j8@%ZMcVoWY2Hzo5W`N`JsYGkaIR=?2+4i;M^CL^*J zqvbP&;v9nwlbEaEHa+Gt;+kX+Huz<4Q3<_DRn`#H2`0Ib{JqSaKD8Cmp=hc^97Rzk+g?UYBjKA zo`peu1bM61*M?Vtm5rhxd}wh%gmDlwzyye0U^&>R$27ybiT%yCnS)9@9t(sk2!h!L zpDeSjmnn6aQWL~T1{e^0)$3LrGA+@}dYW0PF4}Ua^*Ign&;UWSbhGHMh8!4~KGIAd z&3uGY+!z?y1WGER_OlLxPO?E_7uY>CN(3bpK}nUMBo##B&zy0@!DnX$4Z>kp*gr@~ zZCXPAKVl>^+_#0$Hf5$m@Wa)Q(xj`ao!r=(>Dpz5mC>egXGYY=rstrY3GS|W-Acs> z6;Z+K448}I^_L7dT1GGN25L4^6Du>Md0Hj4hMU)xRxWc`sc1%r;kYgg^Bj*x;HW!| zw!;JWc-v^L+sd_qihZ3SqcD&kg`e)--ks`gB2G#x(<#&tlswzfI6U$U8FtlA?S!A6 zW8#GR6me48EA&(YH72%Cnb;&1?%2OVxZ=ZEj)wuC4;_FbzQdM-*jUzJH}=#w^l4A+D)v8b*kPD=Zo);16$ z>EW@J2b0)|O3*82;HuC9H^hE;Ay`{Yt4L{?9wJC3t?NWxPq`_r*o0F}I01VCJesba z4ctN&Uis?pOFvJZ6kW${Sni1FgQv?g(R0ND*h0(fOmS`|dj5F6P?_zAy+MEVOXx0w wZy`M_b|iF^1NKJjup@B*oCe#CW2e zI-|(Mv>pX(b}nlUPbI#z{Jav~w8Z38HfzohYqn?xYc2z8?o5t}Z=)HxCVMh!GICEY zW>g1~vl-=qCUY^VGV)J0U{Yojm>j~S#3(qqoXLPuc=8G+1xAs{ pCz%v@M6G!oxU9K6m6&)KCx2nm5pu}PEyyn_QBZ>0J6V?b6#yoOF{l6l delta 147 zcmX@a(ateJOd~PbBq`ZE&A`CY(%jhC$kN=xAjvG%)XdN{E!o)6*w8ZB$kH&$#Au?O zI-~H!w4TZ0jA4wNlk*rg8M!9UU{nW^2N>mn<$@>}ECvz~VG4f8|m 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 -
+