From 63ad756a2daaf06d6e9d4ccaeaec42155b42e754 Mon Sep 17 00:00:00 2001 From: Kyle Fiedler Date: Fri, 6 Jan 2012 15:38:21 -0500 Subject: [PATCH] Added style for video and sequence --HG-- branch : kf-refactor --- .../_courseware.scssc | Bin 8041 -> 14199 bytes .../_layout.scssc | Bin 11351 -> 11711 bytes .../_local.scssc | Bin 7366 -> 7133 bytes .../_theme.scssc | Bin 18276 -> 18271 bytes sass/_courseware.scss | 88 +++++++++++++++++- sass/_layout.scss | 5 +- sass/_local.scss | 4 - sass/_theme.scss | 6 +- seq_module.html | 16 ++-- staticbook.html | 2 +- vert_module.html | 2 +- video.html | 62 ++++++------ 12 files changed, 131 insertions(+), 54 deletions(-) diff --git a/.sass-cache/d71392d31c3b10df78042d13a0384e71b83fa11e/_courseware.scssc b/.sass-cache/d71392d31c3b10df78042d13a0384e71b83fa11e/_courseware.scssc index 59d180664cb050d4a86f9bed659db5a804201b0a..b5d1069c89cff6942faf1a810c6de57237a0665c 100644 GIT binary patch literal 14199 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 Tf#18ACBwk2uJI2mJ;(k7w25Jr delta 1372 zcmZWoU2NM_6z=s(8fQstCykRjv12>c=5#AXw`T| z71AUg_!$Cy;suRqdjN@vjj=orHXacm;9)!fLOdY>llH(1(&)I?NffKR9DU#QIp6)x zxyN5Lemwe)Y*nUOmDQEPWN~_JZQ5R*Dz#eW72952TP@m!wNj-rxw7x1T`qpM|5S*C z+aHBi3G8^8D7Y^sa6Xoicv&39?WD$! zdIo80xF>BA9vh~HMN!AcvA1!0_;GWuzkfxPx^< z!Xgv6A9KkhuAB2}(Jw-Y%YDT}ItT^%gjCu#jgqH#Sr+g>-iLeg5Zbwen(f!2#O3~E zI$eZ|$%CYVUz5+1D$1!^w#qX8Wf}iRfkqIQlPTOxO%Vsbr^ZJdHo)NIqqg_hY#YX2 zVGrYY+u-29$O7CE0UwO)ADih;t?HDX>q5H^i+#8kk0`H^8s1cPD>Y`v;;7_ygs+u7 zw7TdYC?zg;j``~#yr&)}&)^sJ5dUnqY7u#D$von( zqQvFiU{yWD{t31dFL(_d#RF|dI=0Q=F>e7kvKo027qU&#z-CrMP|uSlF7AAiZ+3sh zrZ@a1-q+{UEyCK?z1zULfhI*!H==PD0ciwd<|R_ zbfm=#l3q@Dv`lX3c%f9OQEur^9}vsZIrfVM@4@~Tcfu!dJZMWsLolFfCT<0X+RbK( z1y6X)ti7SGDIr@j8=ASV;e9}pg%w7|xw29xe}`;TMT&o#h@;X#d!l(Y3!bpXguS6I zY)ZD2Xsk|PSE}HLNWwJ+QBKzwG=NJ%itpiZv#og>3!dc&2Sd2_yIIIPIt(@pUGE%~6 zHHD913k&K<(keH-E(@Non}d53cGW>FDHOf2D+ol0(#t!WQ@#9{9Q?5q?ndfBJl(vC z1FctESDE delta 965 zcmYk5&rj1}7{_g0=elle>((*K)^-CNa}(Ld7-In%jXwyNkr09+2DTN!AecBp2#N9P zL4Np+iP3Q2Kw^x>5Mzu76Az-{V&ahlCLTOW;vYcb`))O9FMYo6=kq*y-?!;e{%c_~ z*jdSx3zfct(U;9vE7fw@=*i5MyYuO?kuCIP^66}5wvemla$AFOCcHP>V{`l3%1hPN zOG}G2W3dJ%(2fPx;qqD+k8SOY9k)*_9G~v)?!YG3%1C(4wcxpJQVtdU!?9ELB7dbQ z&Xb_m{=ebjN=yjT+z75ZWbAV{!?IN-L1!KjyHQ}vc>#CqQJnBHcI^{bc8bnzf?KJ# zUB}nXMDfenz*B=P8Bo%{7pmXG3%OU3{{hPa#X zL&6ox4>2mG@sn5a)U6@noCvE$%aKUXnLk8s6l7S5SBovWOqcLE5W;04h)?!7h6F{? ztgR&IEW;4dtm->?DMYc>RKJf<)T)!9vl7*#7;@*a?ou)3k@3wnt;DP%2|AmgqFL4F z*4(7cE90&E7B+mMFhGTNst%weWii#H;KV0m#d8BIq9}|~-a+{&;Ta5iRQwhjyy6!H zgYvVK8-({D=8fQoU&eLs1cn2muu6HH@>M+aXP)>}df3A zN0QMjPAiF`q$K%P_d_YGPJ+%JQ9Xr7FpCFL8=o@u6kbV_N|#k9L1+I` z-K@xN&!ZGn)h@HCs~8@mWq*@iGw$A7n5h}VF}95L;77&!pJ{7OjXW#!)!JOYMt`bz J7n@(${sF3^_n-g( diff --git a/.sass-cache/d71392d31c3b10df78042d13a0384e71b83fa11e/_theme.scssc b/.sass-cache/d71392d31c3b10df78042d13a0384e71b83fa11e/_theme.scssc index 9e07958d19fed826afd7ab0b88b4ce7fc4d235c1..e3e261c1dd1a83bbe59fa13cff6d285e3230cd49 100644 GIT binary patch delta 1816 zcmZ`&T})GF80I@*3#XOZ7A+L%AGV;hrRB7xcoK4$isF#z{K=wOOn(jrMT*!P<6q*P zh9LTe&1J*IC2o4b7%Qk*f@s2w7$Gj%g%^t^W_M~P%dV&2_nq^R9x6A@`@HY_JkR&O z@9Ez|=;aU^URN&*v2-$-j-{Josg_80IxZ($lA%N@m5Ox>-7WEWQ*$U1NhKy)pBwbX zo>pBO>q;(D=0RI3@Wx=bwX@EA^}1~R?9%gec|##bC>ZwI%* zn!9A$MZj(f-kL24d+etkI_tru_=vT!R?Rc@(rl(bPg>!GUF%G0pSVeEz%SZQg%_>Q zR$;MYRQPe#=B2pI?!&?~zk;yB!NQD_%h&@%?2Ib59%h^#>`JlNc)AF?p23@OU}2hD zL0I7{!Zglxxu#Hwu?L-l34cYd+Vh?(#b}WFc)Wr03^2j+zD!_1?w1qUyhSMeti_O$ z`?B)DiuGk%RLJV;RIsL}NOXu!Q3o@A9sKD{Z@4U0b$E)fW;-4gVI*;=I6u@K(t}y= zg#TT&Xc)ftZRM|!A!rM{^&PN}XcRD#xN52}0$TR`e5`X#NDmEG<(`G$BUg=;tA504cb{x@VgX&Ir95h35 zsGa|f*-gUUP;%|G#ttKid!yJ*!|Ra4qGpI4E4D^mw!$>+fX~BS=sw)Qzcct1+t34u zHGRQ9WS-M-ttoAq)p*W=LGbBuPU4&;uo$W|sxeWVg(0C5c1O#XC%v}(E`_WRo(Ox< z@8F2E^N*PAEc8W=R?KN^F_O4XVU6HMb5I_2n3Y5c5m9Ri!EGtXmcWfN2ZuSsQLnAA zO6l-4+Q~m*?sIt28=yVb3eO`}lqHt>dE%a>+_YXl7i1aNMWIIf?sL@ls>rrG(7OqGIZ`RC3!22ucGi#&^0GnD>I{ p+DGEeB zz*`-G%l&S)`2qy`#S?V%h5z4trDgYjKO%K@nM(6+mnpEz6tv6m1vb}BDEl1X4vx8s zhS_i=b2&0w5iSO&&}}l1svQV@rj5w2F^wWz4V~G$Zs6lc=5E)4UGSiFhzQ z4Pj|u8huVK_XWA67!IN@iP=|hw{wa^ci``E0zQg1G!QP#L{fV<3}!fzx!-lO4frkM zZlxKGz>1@Bk8@|5binh`X>4#}i;iZu<|krdkC(=KZ}jmhh(yTChi0+qF^@?|z&8SV@zwoQZKCPaq=CY+PG zE4mlOnwJjoxWucK#>A^q@;Y}A^aj`-KIYwI-kXx=l!gzt$QkAJ#f4->ne=i0G#6Li Y=F~0eClkl>>iRQ}5%Q?Fj;^8q0C0cQKmY&$ diff --git a/sass/_courseware.scss b/sass/_courseware.scss index ada6ac6fd4..6950690489 100644 --- a/sass/_courseware.scss +++ b/sass/_courseware.scss @@ -35,12 +35,12 @@ div.course-wrapper { } &.ui-state-active { + @include box-shadow(none); background: none; - border-bottom: 1px solid #aaa; border: 0; + border-bottom: 1px solid #aaa; color: #000; font-weight: bold; - @include box-shadow(none); a { color: #000; @@ -53,9 +53,9 @@ div.course-wrapper { @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; + border-top: 1px solid #c3c3c3; + border: none; font-size: 12px; margin: 0; @@ -73,5 +73,85 @@ div.course-wrapper { padding: $gw-gutter; vertical-align: top; width: grid-width(9); + + ol.vert-mod { + li { + @extend .clearfix; + } + } + + ol.sequence-nav { + margin-bottom: $body-line-height; + + li { + cursor: pointer; + display: table-cell; + min-width: 30px; + min-height: 30px; + padding: 0 10px; + } + } + + div.video-wrapper { + float: left; + width: 640px; + min-height: 500px; + + section { + ul { + display: inline-block; + + li { + margin-top: 5px; + display: inline-block; + cursor: pointer; + + div { + &:empty { + display: none; + } + } + } + } + + div#slider { + margin: -14px 0 10px 60px; + } + + div#vidtime { + float: left; + } + + div#video_speeds { + float: right; + cursor: pointer; + + span { + &:hover { + color: $mit-red; + } + } + } + } + } + + ol.subtitles { + width: 220px; + margin-left: 20px; + float: left; + + li { + margin-bottom: 8px; + cursor: pointer; + + &.current { + background-color: #f3f3f3; + } + + &:hover { + color: $mit-red; + } + } + } } } diff --git a/sass/_layout.scss b/sass/_layout.scss index 9cd10127cb..4e7dd4fa42 100644 --- a/sass/_layout.scss +++ b/sass/_layout.scss @@ -18,7 +18,6 @@ html { @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 darken($mit-red, 5%); @@ -28,13 +27,15 @@ html { padding: 15px $gw-gutter 15px 0; display: block; float: left; - color: #fff; + color: #000; + text-shadow: 0 1px 0 lighten($mit-red, 10%); } nav { float: left; display: block; margin: 0; + text-shadow: 0 -1px 0 darken($mit-red, 10%); ul { @extend .clearfix; diff --git a/sass/_local.scss b/sass/_local.scss index 7da2a7af07..3f11d9ca57 100644 --- a/sass/_local.scss +++ b/sass/_local.scss @@ -12,10 +12,6 @@ margin-right: 0px; } -#bodyContent { - width: 100%; -} - .bordered { border: 1px solid #AAAAAA; border-style : dotted; } .seq_problem_visited { background-color: #ccccaa;} diff --git a/sass/_theme.scss b/sass/_theme.scss index 21ed3895bf..6aed8d9750 100644 --- a/sass/_theme.scss +++ b/sass/_theme.scss @@ -140,10 +140,6 @@ a:hover { background: transparent url( images/css/page-bg.jpg ) no-repeat center top; } - - - - #container { margin:0 auto; width:800px; @@ -184,7 +180,7 @@ a:hover { #sidebar ul.vmenu { list-style: none; text-align: left; - margin: 7px 0px 8px 0px; + margin: 7px 0px 8px 0px; padding: 0; text-decoration: none; border-top: 1px solid #eeeeee; diff --git a/seq_module.html b/seq_module.html index bcb830b9b3..c2891af8f9 100644 --- a/seq_module.html +++ b/seq_module.html @@ -1,11 +1,13 @@ -% for t in range(1,1+len(items)): -
    -
  1.  
    2. -
-% endfor +
    + + % for t in range(1,1+len(items)): +
  1.  
    2. + % endfor + +
  2. Previous
    3. +
  3. Next
    4. +
-
Previous
-
Next
diff --git a/staticbook.html b/staticbook.html index d08a96727c..af3cade9cb 100644 --- a/staticbook.html +++ b/staticbook.html @@ -48,7 +48,7 @@ function next_page() {