From 17d072711b8379a4302780f970a839950794feef Mon Sep 17 00:00:00 2001 From: Kyle Fiedler Date: Tue, 7 Aug 2012 16:10:00 -0400 Subject: [PATCH 1/6] Make the sidebar links more standard, and remove some of their styling --- lms/static/images/ui-icons_222222_256x240.png | Bin 0 -> 4369 bytes lms/static/sass/course/_info.scss | 60 +++++++++++------- lms/static/sass/course/_textbook.scss | 54 ++++++++-------- lms/static/sass/course/base/_extends.scss | 39 +++++++++--- .../sass/course/courseware/_sidebar.scss | 36 +++++++---- lms/static/sass/course/wiki/_sidebar.scss | 35 ++-------- 6 files changed, 123 insertions(+), 101 deletions(-) create mode 100755 lms/static/images/ui-icons_222222_256x240.png diff --git a/lms/static/images/ui-icons_222222_256x240.png b/lms/static/images/ui-icons_222222_256x240.png new file mode 100755 index 0000000000000000000000000000000000000000..b273ff111d219c9b9a8b96d57683d0075fb7871a GIT binary patch literal 4369 zcmd^?`8O2)_s3^phOrG}UnfiUEn8(9QW1?MNkxXVDEpFin2{xWrLx5kBC;k~GmPmYTG^FX}c% zlGE{DS1Q;~I7-6ze&TN@+F-xsI6sd%SwK#*O5K|pDRZqEy< zJg0Nd8F@!OxqElm`~U#piM22@u@8B<moyKE%ct`B(jysxK+1m?G)UyIFs1t0}L zemGR&?jGaM1YQblj?v&@0iXS#fi-VbR9zLEnHLP?xQ|=%Ihrc7^yPWR!tW$yH!zrw z#I2}_!JnT^(qk)VgJr`NGdPtT^dmQIZc%=6nTAyJDXk+^3}wUOilJuwq>s=T_!9V) zr1)DT6VQ2~rgd@!Jlrte3}}m~j}juCS`J4(d-5+e-3@EzzTJNCE2z)w(kJ90z*QE) zBtnV@4mM>jTrZZ*$01SnGov0&=A-JrX5Ge%Pce1Vj}=5YQqBD^W@n4KmFxxpFK`uH zP;(xKV+6VJ2|g+?_Lct7`uElL<&jzGS8Gfva2+=8A@#V+xsAj9|Dkg)vL5yhX@~B= zN2KZSAUD%QH`x>H+@Ou(D1~Pyv#0nc&$!1kI?IO01yw3jD0@80qvc?T*Nr8?-%rC8 z@5$|WY?Hqp`ixmEkzeJTz_`_wsSRi1%Zivd`#+T{Aib6-rf$}M8sz6v zb6ERbr-SniO2wbOv!M4)nb}6UVzoVZEh5kQWh_5x4rYy3c!871NeaM(_p=4(kbS6U#x<*k8Wg^KHs2ttCz<+pBxQ$Z zQMv;kVm5_fF_vH`Mzrq$Y&6u?j6~ftIV0Yg)Nw7JysIN_ z-_n*K_v1c&D}-1{NbBwS2h#m1y0a5RiEcYil+58$8IDh49bPnzE7R8In6P%V{2IZU z7#clr=V4yyrRe@oXNqbqo^^LvlLE?%8XaI&N(Np90-psU}7kqmbWk zZ;YBwJNnNs$~d!mx9oMGyT( znaBoj0d}gpQ^aRr?6nW)$4god*`@Uh2e+YpS@0(Mw{|z|6ko3NbTvDiCu3YO+)egL z>uW(^ahKFj>iJ-JF!^KhKQyPTznJa;xyHYwxJgr16&Wid_9)-%*mEwo{B_|M9t@S1 zf@T@q?b2Qgl!~_(Roe;fdK)y|XG0;ls;ZbT)w-aOVttk#daQcY7$cpY496H*`m@+L zeP#$&yRbBjFWv}B)|5-1v=(66M_;V1SWv6MHnO}}1=vby&9l+gaP?|pXwp0AFDe#L z&MRJ^*qX6wgxhA_`*o=LGZ>G_NTX%AKHPz4bO^R72ZYK}ale3lffDgM8H!Wrw{B7A z{?c_|dh2J*y8b04c37OmqUw;#;G<* z@nz@dV`;7&^$)e!B}cd5tl0{g(Q>5_7H^@bEJi7;fQ4B$NGZerH#Ae1#8WDTH`iB&) zC6Et3BYY#mcJxh&)b2C^{aLq~psFN)Q1SucCaBaBUr%5PYX{~-q{KGEh)*;n;?75k z=hq%i^I}rd;z-#YyI`8-OfMpWz5kgJE3I!3ean6=UZi!BxG7i(YBk? z02HM7wS0)Wni{dWbQMRtd-A)_Az!t>F;IwWf~!*)-Az4}yryNkz&9)w>ElA80Oc`6 zHo#9H!Y3*Qx9n@Jn)!w6G^hb;e_n8zpIyXCN`JFkPc)^Q?2MsLNFhMgrcZI-<#1ne zjH;KFf?4eAT9mQZ}ZfHLGA#d%s;SZK4p0FwZT2S^{ zQ2BG1xJsbK6?yrHTjJi|5C0u=!|r!?*4FL%y%3q#(d+e>b_2I9!*iI!30}42Ia0bq zUf`Z?LGSEvtz8s``Tg5o_CP(FbR0X$FlE0yCnB7suDPmI2=yOg^*2#cY9o`X z;NY-3VBHZjnVcGS){GZ98{e+lq~O$u6pEcgd0CrnIsWffN1MbCZDH<7c^hv+Z0Ucf0{w zSzi^qKuUHD9Dgp0EAGg@@$zr32dQx>N=ws`MESEsmzgT2&L;?MSTo&ky&!-JR3g~1 zPGTt515X)wr+Bx(G9lWd;@Y3^Vl}50Wb&6-Tiy;HPS0drF`rC}qYq22K4)G#AoD0X zYw$E+Bz@Zr^50MAwu@$?%f9$r4WHH?*2|67&FXFhXBrVFGmg)6?h3^-1?t;UzH0*I zNVf9wQLNLnG2@q>6CGm>&y|lC`iCFfYd}9i%+xkl^5oBJ?<;aneCfcHqJh7Yl5uLS z9Fx-(kMdcNyZejXh22N{mCw_rX1O!cOE&3>e(ZH81PR95wQC37En4O{w;{3q9n1t&;p)D%&Z%Nw$gSPa!nz8Slh7=ko2am)XARwOWw zpsz0~K!s{(dM$NB=(A=kkp>T(*yU6<_dwIx>cH4+LWl282hXa6-EUq>R3t?G2623< z*RwTN%-fgBmD{fu*ejNn)1@KG?Sg*8z3hYtkQJQjB6 zQ|x>wA=o$=O)+nLmgTXW3_6diA;b4EY{*i*R%6dO2EMg z@6g?M3rpbnfB@hOdUeb96=~I?OIA3@BWAGmTwiQ{x5Cqq<8c10L!P zd@Qk^BseTX%$Q7^s}5n%HB|)gKx}H$d8Sb$bBnq9-AglT2dGR2(+I;_fL|R4p$odJ zllfb0NqI)7=^z~qAm1V{(PkpxXsQ#4*NH9yYZ`Vf@)?#ueGgtCmGGY|9U#v|hRdg- zQ%0#cGIfXCd{Y)JB~qykO;KPvHu|5Ck&(Hn%DF~cct@}j+87xhs2ew;fLm5#2+mb| z8{9e*YI(u|gt|{x1G+U=DA3y)9s2w7@cvQ($ZJIA)x$e~5_3LKFV~ASci8W}jF&VeJoPDUy(BB>ExJpck;%;!`0AAo zAcHgcnT8%OX&UW_n|%{2B|<6Wp2MMGvd5`T2KKv;ltt_~H+w00x6+SlAD`{K4!9zx z*1?EpQ%Lwiik){3n{-+YNrT;fH_niD_Ng9|58@m8RsKFVF!6pk@qxa{BH-&8tsim0 zdAQ(GyC^9ane7_KW*#^vMIoeQdpJqmPp%%px3GIftbwESu#+vPyI*YTuJ6+4`z{s? zpkv~0x4c_PFH`-tqafw5)>4AuQ78SkZ!$8}INLK;Egr;2tS18hEO5=t;QDmZ-qu?I zG+=DN`nR72Xto{{bJp||`k}-2G;5#xg8E~xgz22)^_Z;=K|4@(E&5J)SY2of=olcw z5)@L)_Ntcm!*5nEy0M9v0`S33;pO4TN;>4(Z+19p_0>u#e-vE zXCU(6gAvu~I7Cw(xd%0e59MNLw^U37ZDbsBrj%eDCexw8a3G`nTcXVNL6{B7Hj@i& zbVB{;ApEtHk76q08DJ48dSxd$C(;$K6=FpU<~l9pVoT9arW^Vu{%Bcn4`eIpkOVC| z$)AKYG_`ypM{0@BUb3^9lqi_c?ONH|4UJMJWDowMVjacycX7}9g={O7swOB+{;+?; zjBo!9?+nd)ie#x5IbFW-zBOo0c4q@9wGVt5;pNt`=-~Zgcw#*`m($6ibxtZ`H=e=} zF#GZ~5$%AUn};8U#tRem0J(JTR}d4vR(dgK2ML~lZsPhayJ2h1%sD4FVst| zKF)+@`iNzLRjg4=K8@**0=5cE>%?FDc({I^+g9USk<8$&^qD~@%W0i4b|yMG*p4`N zh}I!ltTRI8Ex$+@V{02Br%xq#O?UlhO{r8WsaZnZCZq0MK9%AXU%MDLT;3=0A9(BV z9VxxxJd7jo$hw3q;3o?yBLmA=azBUrd9>-<_ANs0n3?-Ic*6&ytb@H~?0E(*d>T5n z-HiH2jsDf6uWhID%#n>SzOqrFCPDfUcu5QPd?<(=w6pv1BE#nsxS{n!UnC9qAha1< z;3cpZ9A-e$+Y)%b;w@!!YRA9p%Kf9IHGGg^{+p`mh;q8i7}&e@V3EQaMsItEMS&=X plT@$;k0WcB_jb;cn%_Idz4HO$QU*abf4}+wi?e96N>fbq{{i|W0@(ln literal 0 HcmV?d00001 diff --git a/lms/static/sass/course/_info.scss b/lms/static/sass/course/_info.scss index 6b217f2285..1dac5354b6 100644 --- a/lms/static/sass/course/_info.scss +++ b/lms/static/sass/course/_info.scss @@ -80,38 +80,54 @@ div.info-wrapper { } ol { - background: none; - list-style: none; - padding-left: 0; - margin: 0; - li { - @extend .clearfix; - background: none; - border-bottom: 1px solid $border-color; - @include box-sizing(border-box); - padding: em(7) lh(.75); - position: relative; - font-size: 1em; + a { + display: block; + padding-left: lh(.5); + padding-right: 0; + } &.expandable, &.collapsable { h4 { font-weight: normal; font-size: 1em; - padding-left: 18px; + padding: lh(.25) 0 lh(.25) lh(1.5); + } + } + + &.multiple { + padding: lh(.5) 0 lh(.5) lh(.5); + + a { + @include inline-block; + padding: 0; + + &:hover { + background: transparent; + } } } ul { background: none; - margin: em(7) (-(lh(.75))) 0; + margin: 0; li { border-bottom: 0; border-top: 1px solid $border-color; @include box-shadow(inset 0 1px 0 #eee); font-size: 1em; + padding: lh(.5) 0 lh(.5) lh(.5); + + a { + @include inline-block; + padding: 0; + + &:hover { + background: transparent; + } + } } } @@ -119,23 +135,26 @@ div.info-wrapper { background-image: url('../images/treeview-default.gif'); display: block; height: 100%; - left: lh(.75); margin-left: 0; - max-height: 20px; + max-height: 30px; position: absolute; width: 100%; &:hover { opacity: 0.6; filter: alpha(opacity=60); + + + h4 { + background-color: #e3e3e3; + } } &.expandable-hitarea { - background-position: -80px 1px; + background-position: -72px 7px; } &.collapsable-hitarea { - background-position: -64px -21px; + background-position: -55px -15px; } } @@ -170,11 +189,6 @@ div.info-wrapper { } } } - - a { - @include inline-block(); - line-height: lh(); - } } } } diff --git a/lms/static/sass/course/_textbook.scss b/lms/static/sass/course/_textbook.scss index 249dadf29b..50986f5dd5 100644 --- a/lms/static/sass/course/_textbook.scss +++ b/lms/static/sass/course/_textbook.scss @@ -7,19 +7,20 @@ div.book-wrapper { @include box-sizing(border-box); ul#booknav { - font-size: $body-font-size; - - a { - color: #000; - - &:hover { - color: #666; - } - } + font-size: em(14); li { background: none; - padding-left: 30px; + border-bottom: 0; + padding-left: lh(); + + a { + padding: 0; + + &:hover { + background-color: transparent; + } + } div.hitarea { background-image: url('../images/treeview-default.gif'); @@ -35,6 +36,13 @@ div.book-wrapper { ul { background: none; + margin-top: lh(.25); + border-top: 1px solid $border-color; + padding-top: lh(.25); + + li { + padding-bottom: lh(.25); + } } } @@ -47,8 +55,8 @@ div.book-wrapper { section.book { @extend .content; - padding-right: 0; padding-bottom: 0; + padding-right: 0; padding-top: 0; nav { @@ -68,28 +76,22 @@ div.book-wrapper { width: flex-grid(2, 8); a { - display: table; - @include box-sizing(border-box); - height: 100%; - width: 100%; - vertical-align: middle; - @include transition; background-color: rgba(#000, .7); - background-repeat: no-repeat; background-position: center; + background-repeat: no-repeat; + @include box-sizing(border-box); + display: table; + height: 100%; opacity: 0; filter: alpha(opacity=0); text-indent: -9999px; + @include transition; + vertical-align: middle; + width: 100%; &:hover { opacity: 1; filter: alpha(opacity=100); - - &.last { - } - - &.next { - } } } @@ -120,9 +122,9 @@ div.book-wrapper { } section.page { - text-align: center; - position: relative; border: 1px solid $border-color; + position: relative; + text-align: center; img { max-width: 100%; diff --git a/lms/static/sass/course/base/_extends.scss b/lms/static/sass/course/base/_extends.scss index a0d417f388..72e2f56bbb 100644 --- a/lms/static/sass/course/base/_extends.scss +++ b/lms/static/sass/course/base/_extends.scss @@ -59,7 +59,7 @@ h1.top-header { width: flex-grid(3); h1, h2 { - font-size: em(18); + font-size: em(20); font-weight: 100; letter-spacing: 0; text-transform: none; @@ -88,22 +88,16 @@ h1.top-header { font-weight: normal; margin: 0; overflow: hidden; + font-size: 1em; a { - color: lighten($text-color, 10%); display: block; - font-size: $body-font-size; - padding: 7px 7px 7px 30px; text-decoration: none; @include transition(); } - // span.ui-icon { - // background-image: url(../images/ui-icons_454545_256x240.png); - // } - &.active { - border-bottom: 1px solid #d3d3d3; + @extend .bottom-border; color: #000; font-weight: bold; @@ -113,6 +107,33 @@ h1.top-header { } } + ul, ol { + list-style: none; + margin: 0; + padding-left: 0; + + li { + @extend .bottom-border; + @extend .clearfix; + background: none; + position: relative; + padding: 0; + + a { + display: block; + line-height: lh(); + font-size: 1em; + @include box-sizing(border-box); + padding: lh(.25) lh(.5) lh(.25) 0; + + &:hover { + color: #666; + background: #f6f6f6; + } + } + } + } + header#open_close_accordion { position: relative; diff --git a/lms/static/sass/course/courseware/_sidebar.scss b/lms/static/sass/course/courseware/_sidebar.scss index fe9f54d0e3..7f24659533 100644 --- a/lms/static/sass/course/courseware/_sidebar.scss +++ b/lms/static/sass/course/courseware/_sidebar.scss @@ -11,10 +11,10 @@ section.course-index { } div#accordion { - h3 { @include border-radius(0); border-top: 1px solid #e3e3e3; + font-size: em(16, 18); margin: 0; overflow: hidden; @@ -23,8 +23,14 @@ section.course-index { } &:hover { + color: #666; background: #f6f6f6; - text-decoration: none; + } + + &.ui-state-hover { + a { + color: #666; + } } &.ui-accordion-header { @@ -33,8 +39,6 @@ section.course-index { a { @include border-radius(0); @include box-shadow(none); - color: lighten($text-color, 10%); - font-size: $body-font-size; } &.ui-state-active { @@ -45,30 +49,35 @@ section.course-index { background: none; } } + + span.ui-icon { + background-image: url("/static/images/ui-icons_222222_256x240.png"); + opacity: .3; + } } } ul.ui-accordion-content { - @include border-radius(0); background: transparent; border: none; - font-size: 12px; + @include border-radius(0); + font-size: em(14, 18); margin: 0; padding: 1em 1.5em; li { + border-bottom: 0; @include border-radius(0); margin-bottom: lh(.5); a { - border: 1px solid transparent; background: transparent; + border: 1px solid transparent; @include border-radius(4px); - position: relative; - padding: 5px 36px 5px 10px; - text-decoration: none; display: block; - color: #666; + padding: 5px 36px 5px 10px; + position: relative; + text-decoration: none; p { font-weight: bold; @@ -84,16 +93,16 @@ section.course-index { &:after { background: transparent; - border-top: 1px solid rgb(180,180,180); border-right: 1px solid rgb(180,180,180); + border-top: 1px solid rgb(180,180,180); content: ""; display: block; height: 12px; margin-top: -6px; opacity: 0; position: absolute; - top: 50%; right: 30px; + top: 50%; @include transform(rotate(45deg)); width: 12px; } @@ -142,7 +151,6 @@ section.course-index { span.subtitle { font-weight: normal; } - } } } diff --git a/lms/static/sass/course/wiki/_sidebar.scss b/lms/static/sass/course/wiki/_sidebar.scss index ccaed19a17..8c9f97d27d 100644 --- a/lms/static/sass/course/wiki/_sidebar.scss +++ b/lms/static/sass/course/wiki/_sidebar.scss @@ -2,20 +2,8 @@ div#wiki_panel { @extend .sidebar; overflow: auto; - h2 { - @extend .bottom-border; - margin: 0 ; - padding: lh(.5) lh() lh(.5) 0; - color: #000; - } - ul { - padding-left: 0; - margin: 0; - li { - @extend .bottom-border; - &.search { padding: 10px lh() 10px 0; @@ -23,25 +11,14 @@ div#wiki_panel { display: none; } } - - a { - color: #666; - font-size: 14px; - padding: 7px lh() 7px 0; - - &:hover { - background: #efefef; - } - - } } + } - form { - input[type="submit"]{ - @extend .light-button; - text-transform: none; - text-shadow: none; - } + form { + input[type="submit"]{ + @extend .light-button; + text-transform: none; + text-shadow: none; } } From 643617599ab88dad3e6ba38beecd9e87eb20a596 Mon Sep 17 00:00:00 2001 From: Kyle Fiedler Date: Tue, 7 Aug 2012 16:23:25 -0400 Subject: [PATCH 2/6] Made sequnce nav black and white --- .../sequence-nav/document-icon-current.png | Bin 203 -> 204 bytes .../sequence-nav/document-icon-normal.png | Bin 207 -> 205 bytes .../sequence-nav/document-icon-visited.png | Bin 205 -> 206 bytes common/static/images/sequence-nav/edit.png | Bin 168 -> 171 bytes common/static/images/sequence-nav/history.png | Bin 276 -> 292 bytes .../images/sequence-nav/list-icon-current.png | Bin 413 -> 344 bytes .../images/sequence-nav/list-icon-normal.png | Bin 287 -> 284 bytes .../images/sequence-nav/list-icon-visited.png | Bin 300 -> 306 bytes .../static/images/sequence-nav/next-icon.png | Bin 264 -> 250 bytes .../static/images/sequence-nav/other-icon.png | Bin 467 -> 457 bytes .../images/sequence-nav/previous-icon.png | Bin 241 -> 243 bytes .../images/sequence-nav/problem-icon-alt.png | Bin 300 -> 300 bytes .../images/sequence-nav/vertical-icon.png | Bin 830 -> 845 bytes .../sequence-nav/video-icon-current.png | Bin 403 -> 403 bytes .../images/sequence-nav/video-icon-normal.png | Bin 398 -> 394 bytes .../sequence-nav/video-icon-visited.png | Bin 416 -> 425 bytes .../static/images/sequence-nav/video-icon.png | Bin 1063 -> 1074 bytes common/static/images/sequence-nav/view.png | Bin 229 -> 234 bytes 18 files changed, 0 insertions(+), 0 deletions(-) diff --git a/common/static/images/sequence-nav/document-icon-current.png b/common/static/images/sequence-nav/document-icon-current.png index f82f38ed59419a4702e8bd4a3eee4a9a7c7e474f..4eeedd8f76fb9bf548100da07636851e6e8b4d2d 100644 GIT binary patch delta 176 zcmV;h08jtR0n7oAB!81hL_t(|+U3hV3c^4TK;b=yC>G)YMDQNoL9o!;DwerL%78yX zh3&k9od+>k7ziQbD`sF>3^{LDU^HEHK9s z4Newp(FQ>Q7Z~D$vjsN@o_HXQf(fcHxT40up8A4|2Gf5G#wi`aC=Lp=*kgsY(LK@o e(Sid6eey5C*tC`#Y`Gf%0000Pvv zKVj2QhGf!CAT|VIGaxnw;y@t&1H>y~8ghX6ACiXEXwH-Y;%`8_3Z`K_RN-YHJ_E$9 zXd0A(_&c(Obx?Opp((_vVJ%dH>PXZek3)kjx`x%zh^qzS6eu80N5UX}4OD&wOv7?K d2@WOk0RZDux0oTanp6M)002ovPDHLkV1kvHOQQe) diff --git a/common/static/images/sequence-nav/document-icon-normal.png b/common/static/images/sequence-nav/document-icon-normal.png index 41c7e3af936bbca26225ae2256cdd06d01d46807..d508136647d19796f81cac15aaeb2223592e2916 100644 GIT binary patch delta 177 zcmV;i08anU0nGuBB!84iL_t(|+U3x(3BphifZ>PDgMhmTf@35Iju5d(25^F`@JJqR z-~x&xXlJ2SAfRO;f|4%&jc^?D7O?ob`|se4_g;!{#_)@CE|7jIdGXQy3wZL4*cRoN&Zk1q&VAu~S3A;D!V2zbXa$z?Tvo)VLzU5-TA^ frGpEGkZ! delta 179 zcmV;k08IbQ0nY)DB!8AkL_t(2&turKqM88-a{=)cApVaHZ(LfIgRGbxh-U)v49Sm5zLz_pgV{g z1Pe#dB5jnUPy~Jc#RZNK%m5Z2$HD#G8Rwkw-gnk`BMf+0YiBxG;4DFd8}8zTrw(FV z5Kv=<2nm)rAauc;r9u!bCNN5&gN+n?RM#%Gh0W)h7dyWB%B7NPXX~i fbPa?sIPn1hYD^cqtR_LG00000NkvXXu0mjfN;yRf diff --git a/common/static/images/sequence-nav/edit.png b/common/static/images/sequence-nav/edit.png index 6d7f0632c30dff5029912a70c25f6111edbddeb4..f7f5d3d944e2cfe43a5f0e96c25e21b49e5f4f14 100644 GIT binary patch delta 143 zcmV;A0C4}P0jmL!B!6;AL_t(|+U?ZA3BVu>g<(fI+CL}!fOtpJj5On zJoM1OkGBsGngU=;BY4GWf(;4lKJXQ9D}b@(X}q`n~VLYOQO#v-#u@;AeeeG=mz xkjJ_|=9a}6xhw=2!X|{F4A?ACb=zXQ0X2T8t=~t>vH$=800>D%PDHLkV1l?sK12Wj delta 140 zcmV;70CWGV0jL3xB!6#7L_t(|+U?G<4S+BVL{X2B5g5&bP_RKppk@H(@F*F>5qLA6T-5X upn_@?v&fE=FgNx@EEEANQd6N>y8tbqKkwN$g2Dg*002ovP6b4+LSTZRg*x^C diff --git a/common/static/images/sequence-nav/history.png b/common/static/images/sequence-nav/history.png index a65c4398d9914b2f8d2714ad642c49a7d5c3ad37..c063fa2240081f9d90fdb7f0e1bc842ea46ccd5b 100644 GIT binary patch delta 265 zcmV+k0rvis0;B?vB!BBkL_t(|+O3me4a6V}Mo$6~kbndvOac;+PzM+wIVqDc36p>X z){y4fd?}avaZBEkvF@cGbgwz*Us$)@)qBqj36;s4QePw=4rV&sOz}l32+Xw+ASV+* zL|U+fQPxjcYx0~RcKwK?n_)VM8dp0oYk$e^nH3fDf~4LN=>;+K z5<#r=qv){lKqSQ=g1yT+W13>y5k|0l6BRrKi~%PVnC9(KfcXh1lNypvqCI6hM;PHU zG89G_T=FLShR&)P%;fxo*Y00SAalX4QKX$YCk367N_-It3qyvo+q(z)f>Bsp%)~JO P00008!>0&#K?>L6GU7cFkD{{v?=sUO3SR zOgfG;%Y7d`+IedpKmJZP`GIl#KlfT_GKG(AN&0Sbv5R=ZEe< z2fXNj-fsr1P~;icYn<{AjLQ(s7ZomX^)Ds1n6!o+Hd%FDcZ4D*G;dVcL;F|_1cBZpt8j)@*_C^8*u?HQ6QE;9TyrnxPPvi>6l;M8&Z-taQ^W> z`X}?GzJ`lmzO9G8E#4htC+-@2lyVf9GWoc&L;@3RDobBB&2*=fypM7eSQv(F!Q66w zj69%i9dBBo2}mSmh+S=lZ;2$qV049y(|b_#R4Ir7&&&@;cYp%$LV?!SasmFqBvzKi zCXP^$Di(9yRD1H1ZNA?WDGo64Vfzwk=V+UTn8m6TQ{J)GVOgmj%AUn%n9#9nQ)Xg4-C*Dqcm-mk$Z&p7{nmf~$ndG>>Hg1mI28mzEeyjWoL~Y9s&Iyb4sX^H z=wNuziUAv*aM$7cvjj#M652B`;BNAkKpulf76Uo%COrwr!FkUlkj3CaA1eHifgw0L zys;%9hY9T%=y5l>Nx+qbwqFLW5-4L>P@91gEMcz0_tU@p#59HmmG~hAEvW18y(Iw$ zLqZz{y4+1J%J+Q_k%S^p(C2RQQc)BY<2asC6BHDF1)eL1hmIXo7+;oMEfOo4Eus z7#=iYz=9{-b@=`)fjS18HVl-xo4h69#ZaRN10L=sc?rnD&wM1{#!!S3g!sV)RVe82 z#*%;>+O%RI&)wuEfubz5{4#KrKoCQZ(hLM(09_rvZ~f&bIx)m4zz+^cK}?75BN8ZJ zuxY_Sj=RZ44Lix&q@T5E4GK!!O-B!BryL_t(|+O5#BO2c3jhT$`56{PJ|xC)Lgu8!?iNRUJ{u|(+9 zmQv{89SDvJ3SvTbchNzSRtKSoyS)IlYkYq=-Q*C&;TgU&yu*o~fKdvX2%015yANkvXXu0mjfu*7&H diff --git a/common/static/images/sequence-nav/next-icon.png b/common/static/images/sequence-nav/next-icon.png index 135d4fa715ab599dee08a342fd6bab41fce64296..ece431dcb891eaa0d4507074e720bce3017e251b 100644 GIT binary patch delta 222 zcmV<403rW~0{Q`vB!9t4L_t(|+Le<%3WG2hKs|ua1E?T)0l`u5EOikIxsxDt5TVeU z2yTMV8wgI~@|q6{84CFsUNSv+Nxnot5K)pOlO_%k$g*tHd+9Cwq*L$8Q!toBU%@0+ z-hz;(=_QG7;h&f079vREM-sgSp(qNGVlSa>TlRfl0lSdrIaht(1H6HoHL0#^=6SvV z<-Db?>o|^M11j6K%E1_h0br6|>%%oo!?G+V@NmwOQc4n5pmYx3IF0~MlVC@dd&rOb Y0=3xwIm^iSVgLXD07*qoM6N<$g3qR7JOBUy delta 236 zcmVJ--kfPzgjtbXZAZsTZg*#Yi8dyuQN;$Aga)otps}if}mGFpqD@CaQrzU^t)8|9|NY+qOj}lM&f$R<{G` zBBh6SV+%Gact;6Ed>V|Oz>SJ8qll7HgKa22f+A{ameede<9m^YR5mdQFFaT^6hDn8 zNW5bf9?Zat9HfEx6-XtADR|+5A73~UM0H^oQe#1Ad|KjIQU zcHceFPtq?CCH&JBw3fff-MYR%}tC*(I?M}K_I>f@ueyzWT7KZ}#d zlsGw@*3Cm^v80C=V+L<{K@17R@oX@@0p}_{i8vBU3U7wuy@(^FHla3Yk1xdrq%wg< zxZuFBq4;LpLL!DXIN*c}VMqh z;~x>W1)Gj(og`vgAesTG%?1Tb51P$ zB;?%peKN)f1ZFo3!(^=$2+R@_@7{Z%z=7m RZH@o{002ovPDHLkV1jHCUn>9r delta 213 zcmV;`04o3U0r3HlB!9R`L_t(2&tv%i|33pMm}rGsN*qE!yp&kQmO3h2kBzj2ei5U% zLR*>hFOdFkrYH6fpF&X}-U3nx!#FhnC2fFCc!sPPrv{)zHOvWkH9(!P3!6d=4M2_) zHYZ@!0A%n3gX;+)#mF}BfBf+NZgy%2(Hg*-fOzB5MbrQ5t4{L~r2&R>E?+wP%gs)M zXbm8240Pgyyo_+7HNc#>4&8}(lLj^?5~BgdiNtDvJ8|{O`QI2w%y9_-WS0Tl>*3Vp P00000NkvXXu0mjf%vNAG diff --git a/common/static/images/sequence-nav/problem-icon-alt.png b/common/static/images/sequence-nav/problem-icon-alt.png index c276ba223fbcb53ec2ebb8aad0823b992b3c4edf..364e041bad3254128f76c912f5431d0ba984cf2b 100644 GIT binary patch delta 227 zcmV<90383U0;~d%QGb~|do}|akO1PnK&-_;7{~+hqm+~s21-F@W+paalHD?W`gDrj zvU&4nirvD3CLj&ftj;j-U`V?KIbh|0_y74Tg~IKJ4NC5F(Al70a4CI0Mk#~3t1Erv?!WEk^$!@9Y*iErp zPVSpdv0GTs1f-#w)fomJ3~9F@2do?r9{^%SDE}!CH(}AE3&c4z_Q;TT3oKw2p_=88 z6utxESy&A4rm<&+gT>}bG_2J9#p4cO6u9S#BOK}0uBmriaQ(r!Ty*qlKW=|kEr dqeTIY002|*EJ-0rC@ug1002ovPDHLkV1hhhTTK7} diff --git a/common/static/images/sequence-nav/vertical-icon.png b/common/static/images/sequence-nav/vertical-icon.png index be17eab195fe31ebd6544894fbbc1c17b3674b94..064c6ba0465d77ada9fa2e06a4e9aa90e07e39f4 100644 GIT binary patch delta 822 zcmV-61Ihfp2F(VLB!3i1L_t(|+U?d$NK|1Mhw+yR&BROt(@nc5l0Zl>3_=LOHbo&! zf+8LnH7{fu&1mV^1#_VUVk^lql9X{JBM|ofDWu8w4)QW8B6BURaUK zF^g4vKoX9qz3gCx$X?Bn-uvPqm0l_=0V%f$Dkpo1I(j2*(SSyMjf(nGOY-0uU zR^&Q_Vd5uJkbercGa|QWj+{W`DT0|wH3Z*aIw5k9$kCc3HxbKJMj@yN+tIoeIRn?= zLlt6i5Nu~eKBGDEULqF~%%_}$pd3CYM0OK-x8}&1#PTV55S#+rQLPnuM~Ez%BMXtO zsM|thA+l(WY(?ERD^xnlaT6toMWWgs8(s^MGc`w!CVz4s!EV8WGzf}O504Emkqe2u zOLOE5VtG-ATnN(92#*afDy+ygSb~YKNXD@(+~nI4xXG_K+}UynK5z0SzmLGfXT>#@ zAqZ;0b`<&(`8!N}*+%3h&5;ifdGs%lXEzynIs%cs8=}43V&orI*eHgZ$Z47*M-llP!LGo-Q3x)f1cnVakuOBx;X6Srw~`G(Dk@>va3fFD z|Hz9l5yYV_-eg|{Zt|-Qch>p{K5glY)AKg17aY0z=&QTkpKVy07*qoM6N<$g5~UO A2LJ#7 delta 807 zcmV+?1K9k{2EGQ6B!2}-L_t(o3B|!%h*V_&0O0S;9CvoT>_xohifxKn=9^uhP&BCU z(U)#MRRj_}LiDP%Jt;xdyAJn^1-ZmcYpf7>PgMpo7YZD>&ezA zidJG2uj6y<#2pxuFRmxG)AI+GJ@eG_+fxNNd32Xwe>%2qQb*Sdh;Rrm;!$kDKk~)+ zE5>x(j`_$Cqk@HKy0Hke6sv>*+=d4F1dFg3P5B~RK}oS@V2R+YUF?z57 z70gE&9q7`YUVp_ZVJ^A^-GY8}X{{fTV)bIOV2+>%6;#~Vf*1!;LpLts5)y3Go#6Y3&qtB2k>xcujBsyRj0Rw01ETWP;4i z%M>d^=6X%-$rLa1pUln4Vw}dOn2q0273@GFUxX4)C{}_!IENa(7wp0Ur1F(<77fK3 z!N-CVf`3!^3|0BcxENy)gT}jrbtXm?Z@AveCeD8BH{KuywIRk*+=V_|z+QCVaU}9Z zDB(Cp6sH3Z;#Q2|Tb#jK%s?t%8GmCBnu@aw_X&Q%AeLeks`8aF8sj0ngt_<`htY@k zwPzzn6lXFvV1-~k&R`3cXze8SAyJ$)*eckEL4Q1qx3qRXPV2P_dIdcwp`=Y|z1G=m zHWVXswR$;9>toZRC~{4wphp|(Nv(UVb|q4fG)*L9)lM?kOchkLrzf5_aQ86YL@zF2 z6b)?ChGwJw^_1?Jicl)Y9$5Wkt;JDyj%+W%lQ9su={gzZg=JqdD>6~(; lTp*sbP4J!ID7I@ zA_TPvrCC8ymfDpGk{AVL7#1Yqw>R}197pHDi~Bxz4@xQcBZwT@OT~(Ra*Y6h*vX96tDk53^9%!w7;X{su)Nk$;(3ELMUG8WJ$%Z0Cl; zlGObum_bt%uLxoRWn>(J+EK>==CKOH4D!oMWpUQzi{5O#X)|b&qKYkS;28!y@SlG)l;rLDLkE7=Q;CxN!(-Lj&vR!Wi=Q z9rd6Er?`U)ZkrA$tVr)5?yaNMWSo?YS%r>mn;kUpgd}dw(S86VHEOQ^mmxj?0000< KMNUMnLSTZgm!o|E delta 364 zcmV-y0h9id1Cs-gFn<9U#_=1J3R-GOgSKdB=zpjs2qH-PC5=td-yrD_4o!j$O)WxE z&{9#+Qrcxwl;+u$36dBEWf&GD;q@ingX2ht569!ZJly-Lq}Aw1(6cS63zVfX`c7)1fE7>5U5;lV5n>|+Fe6#k0Ty?^DI5#Hd(0!qj@9vmxjeflP`L=&8EzvNkRqdSi=i+xZp;& zaHAJr&}4QOS+mGTc!VMj@PiCAWQ7JD27)r%hrIRJCHb)vD#}@afH z8-3gMzHD%#)@6Tgls1bd2%pH|1~pta`PZr_BZVR|X3;d^2?KE93bzf4+EB+Tx-f>E z{YE`#!8z{XfYYV}2EsBshzILxRar-sH7nS_rp-3$ct#v|=4!tVKW^gPq0R9C0000< KMNUMnLSTXzKc+bV diff --git a/common/static/images/sequence-nav/video-icon-normal.png b/common/static/images/sequence-nav/video-icon-normal.png index 52321ebf7b36da4d26a62d00e4149371dd5fc6c3..df907e83a00e44751b974e1a3300db8c6393ba0b 100644 GIT binary patch delta 367 zcmV-#0g(QV1BwHXB!5v!L_t(|+I`W#O9EjW$MGwYTw0p4C4?5oAX?fQrOl@1prQVP zmO9CZmIwq58)~dDIEt2_z|veZyzGZ18JZbd8PQ_bTlgLvhv)DbzVPAmJkR%0G)6Mpse9EGBV}PXxr22w)lpPJiLY0=~oH@R$;d#X`{G zhJq73L20842G(UB#z!O)8Ep+gJVM1h3b=D9a^nX{%wYpnvuF`z7#5ihH>%pQC9_CH z0lV0i(mXt3P|2tfsSq{(9lFy=pu_77+90+kab5PIl+g1oZ$~hcFA^xg)kYr-Y)W<7< z(cn@_MzlmN5i}SDQ9&SzK|z70xn_8?4@)vMGqf_I#cqG$y>Pjx!*6)u;W_8LM~R?amuw8-=<&Kk3GL1;BZouXCaG)FK_<~1x zg+~tk!!R zWI+wvl69hN-jN-hh#(6~16|OtDcNCEj8Dtq3UO4$0S--$P(u+hq*1IF{R6N7E3R7^ R^(X)U002ovPDHLkV1hKoqDcS% diff --git a/common/static/images/sequence-nav/video-icon-visited.png b/common/static/images/sequence-nav/video-icon-visited.png index b980c5b73e8996816bf47f3ccc2b610e0f5b373c..49ab8085670c7b98025464ce40e252c15d63701e 100644 GIT binary patch delta 399 zcmV;A0dW4H1E~X$B!6&8L_t(|+J(`*OF~f?fbk0zH8e#f3Jp=v(BIJBBw?XMP8z7> zaHX#yM=kRdPJ&LAj z!;whj5OHxN>wQ@pC1gK|JtV{7@JciqZB-l&N6_td7h#7D-+xHKia`vC0jQ{85&c+j zxm*R0$74~PPG`vL^`1cyZ`guTMJFm4k+qG;qu=j0|AnR*ykG(Px#00>D%PDHLkV1fg1ur2@q delta 389 zcmV;00eb$a1E2$tB!6c~L_t(26$Qb+OO$aO0O03+-_QHr8KPp8h6Tw@(b$~O6g5PF z1UEUmSVR2>L4$C%v;+;&)ZtW1gJ96m6chwOQRgJsqR{W_{oc3diAS4j{Z4m!11+FN z#y=DQfC7Pp7Lnyq74_}d`~0>yH9fbC4YYWM54evS1)#-QY=7Y~ws9lpd^PH(iKsh8 zM6-_};0Ryw8~^~z*upMe;#ki4N<@9aJa)6LbL&FvK-HgunzH zoIt`9_Ax|_0)CLNfORZk9!p3N_=WTM27uSN2LON`)-k{U@E!ss#u#COb0`4-00B6_ z0Txj~po=fKjD(LU0RR9AFu)V^aSH+k5)RQKAyA1f6G!-g5(2-`!z(1r;sTzc j20+3b;4b<&gYWPkrvP0<3=TJ100000NkvXXu0mjfPZXc~ diff --git a/common/static/images/sequence-nav/video-icon.png b/common/static/images/sequence-nav/video-icon.png index afb0ad86afb54a03267678c373aab3c1fbcea6bc..715a38eb969291976cef50e6c8d23fdd947d3ab5 100644 GIT binary patch delta 1053 zcmV+&1mgRr2(k!}B!BryL_t(|+U?eFNZfTC!0~UTXs{k6m7Xv{l41ox5Iu<=v?qns z3N>x!BNcS*9vJ)?$%3=6R=sE&rXj^IzV)&C{G`H=X2_ zetRE%gyXooC;ooVI(Ts$_jz!?H(x&YRa)!+nN0Qc^i<#{41Zz(Ll}l5fnm60)`_3H zy1EX8LZLnVkiNb?RZ~-QxS^q82o5nUp9kQGF(}_VaT(6~`ucAg8yg=Ahr@=%2?PSF zzrX+Bz<;knc^?vv1cu>~Stq_#EiEne@S_s1UC|*Z3G|u23wXTTjA+bSV6ad8jzg?=1+}qphM+y`i z@Iu9r3XM7_Jc+qTs9O9E8?5kQIzi-gY{H47_yQ{iM*fgk0lbH5gp)*m0va7Sg7ZY4 zHX(8`p;mDmR@{O+LF9c1<1*gHSMWx{)gS;JWjx7AUWu7qG%#``td7y1{3JsVdBlXs zg%VCjxqq7EB(KHHjww08KG@MF!RKHR*}{Sxtivm_KjIGqBfn3qAkLxk%HSXvjGDmM}p}XcBnWWi?fqQP1?y@&{3{I z#eb0=XD5$G!kxfP%u3w9;7M}3SQFz|z>HR_Vgo^p!4G#N+^3krGswa)<`P6s#Wv2$Y@P}0!h`+DMkvV@E*BafAQRO@ zo;M-#n}k}#)5yXIt|y3mKX&jnGVvN_qJMXC4$?3HA5!CZ02-%d_Ia!s7&)?gC$JCc z2%-n~AvH=0o`S|vq@jYyH%#2g`;mq#m_`axV>}3rFJ<;c%2&V{;B!BKnL_t(o3GKm6h+WkI0O0T3d+vL0CX-2+7#q>j#?eU8Qn96i zZ3DF?#ZpSd9}F%8Q>?K?OMilOVHE_SEs0nP-4t3v77e3lEVj~sf(sQ<5`WQF6B>+0 zL*7huGBa=9eaFRF3}K#|=DPFyLQ2W!K3nnGfB*T%*n-s#!RZ1bYV;A4bf}Eg&u`rJyW_EHIaAXg zzT?P$pS!Y*?R!yRfJ)XkT!jJpC~-KR_~6h5_!{oVyV!-Zaf>X-657~hjZ{N^s&mPYst1?9N)#f<_$24 zyKw^NqieV}7V$0Ij*GDvQDX%6Sn`VD7BGt|aE0tW%~`-Y{N9qD;d-*`aGmUc=G9n< z`z(3SaDNM!#YSwDy&O?s0edlr?_&kdkp)>o2OYeL=dcEsYfgnO9!J6r7{}Qt5o9&a zlRb;KFo`vqS6~j0U>;Xv4C@dOWC<(K#_MbYu@=FMfnSXa=+E|MkBRGn^s1Rf|zJTpG7ZW%awdN(1*ns0$iIbQ@ zK#(Q0u>)se0_!n|=wTeMTk) z1@!Sh%;O@IhKs1s#Su)PC=fA=>#+$3&^BC+aqPop+=iCsbnrGd;VPU&VYphh6Pxh> z#x$?Q46el{yoR>nYK&qEoAEQWBLWhp(SJn`B`V8xP+%Ti%phn^K#eZ?s1Z@3uq2@^ zo5eIfMxl8D30-v2!wN(Mr|TeK9@9995V43Acoehvs%#H})0G%t3ogML^fYGi_@% diff --git a/common/static/images/sequence-nav/view.png b/common/static/images/sequence-nav/view.png index 8905b519a2a97fc29192653e91c76b45f2ab50e5..bc85d47c23abb190d802166dcc8e1c172c8fcdc1 100644 GIT binary patch delta 206 zcmV;<05SjN0qOyeB!96`GHiNjoaH5)7!S#E(AANOH6CsdQ^c@Z`V$0$x8WjXA?)1^@s607*qo IM6N<$f{Ywf{r~^~ delta 201 zcmV;)05<>X0p$UZB!8?)L_t(|+U=6D4Z|Q1MHzt+JOU$l1dqT79w3D`@CekYT%~3N zMqmU+IDbpOh#&_}ot*R}B*fFdFU)_wpV#v-fgL0u6$Jz^_XL&#xk&`Bkthi=SV>e8 z&Lc_U-2yz%L6JGrS!ZDqAqQphfowV*SUwg~3`R*W*TtrYJVH|m*} Date: Tue, 7 Aug 2012 16:53:46 -0400 Subject: [PATCH 3/6] Fix odd movement on hover for the next button on hover --- common/lib/xmodule/xmodule/css/sequence/display.scss | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/common/lib/xmodule/xmodule/css/sequence/display.scss b/common/lib/xmodule/xmodule/css/sequence/display.scss index 6e7c5d24a7..97a8e0e4b3 100644 --- a/common/lib/xmodule/xmodule/css/sequence/display.scss +++ b/common/lib/xmodule/xmodule/css/sequence/display.scss @@ -3,9 +3,9 @@ nav.sequence-nav { // import from external sources. @extend .topbar; border-bottom: 1px solid $border-color; + @include border-top-right-radius(4px); margin: (-(lh())) (-(lh())) lh() (-(lh())); position: relative; - @include border-top-right-radius(4px); ol { @include box-sizing(border-box); @@ -242,9 +242,11 @@ nav.sequence-bottom { border: 1px solid $border-color; @include border-radius(3px); @include inline-block(); + width: 100px; li { float: left; + width: 50%; &.prev, &.next { margin-bottom: 0; @@ -252,12 +254,11 @@ nav.sequence-bottom { a { background-position: center center; background-repeat: no-repeat; - border-bottom: none; + border: none; display: block; padding: lh(.5) 4px; text-indent: -9999px; @include transition(all, .2s, $ease-in-out-quad); - width: 45px; &:hover { background-color: #ddd; @@ -275,7 +276,7 @@ nav.sequence-bottom { &.prev { a { background-image: url('../images/sequence-nav/previous-icon.png'); - border-right: 1px solid lighten($border-color, 10%); + border-right: 1px solid lighten(#c6c6c6, 10%); &:hover { background-color: none; From ccc1f1dfd52ea994ed412f6f64b57b196b31d601 Mon Sep 17 00:00:00 2001 From: Kyle Fiedler Date: Wed, 8 Aug 2012 10:41:50 -0400 Subject: [PATCH 4/6] Removed padding and added line-height for the tutorials --- lms/static/sass/course/courseware/_courseware.scss | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lms/static/sass/course/courseware/_courseware.scss b/lms/static/sass/course/courseware/_courseware.scss index f6c9dceb8e..fa3e844e88 100644 --- a/lms/static/sass/course/courseware/_courseware.scss +++ b/lms/static/sass/course/courseware/_courseware.scss @@ -105,12 +105,14 @@ div.course-wrapper { ul { margin: 0; @include clearfix(); + padding: 0; li { width: flex-grid(3, 9); float: left; margin-right: flex-gutter(9); margin-bottom: lh(); + line-height: lh(); &:nth-child(3n) { margin-right: 0; From c3cd858e4b78210d809171d181bd25c6e810ce95 Mon Sep 17 00:00:00 2001 From: Kyle Fiedler Date: Wed, 8 Aug 2012 16:09:58 -0400 Subject: [PATCH 5/6] Remove black bars for video --- common/lib/xmodule/xmodule/css/video/display.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/common/lib/xmodule/xmodule/css/video/display.scss b/common/lib/xmodule/xmodule/css/video/display.scss index bb69c30abb..235e2e3277 100644 --- a/common/lib/xmodule/xmodule/css/video/display.scss +++ b/common/lib/xmodule/xmodule/css/video/display.scss @@ -16,7 +16,6 @@ div.video { height: 0; overflow: hidden; padding-bottom: 56.25%; - padding-top: 30px; position: relative; object, iframe { @@ -463,7 +462,8 @@ div.video { } ol.subtitles { - width: 0px; + width: 0; + height: 0; } } From 971ec9891e950844ff401631b78cfdbe4b3482ef Mon Sep 17 00:00:00 2001 From: Kyle Fiedler Date: Wed, 8 Aug 2012 16:27:37 -0400 Subject: [PATCH 6/6] Added new selections styles --- lms/static/sass/course/base/_base.scss | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lms/static/sass/course/base/_base.scss b/lms/static/sass/course/base/_base.scss index d530eb74d4..8d952b5040 100644 --- a/lms/static/sass/course/base/_base.scss +++ b/lms/static/sass/course/base/_base.scss @@ -21,3 +21,8 @@ form { display: block; } } + +::selection, ::-moz-selection, ::-webkit-selection { + background:#444; + color:#fff; +}