From 1b3f03e2e583fce30e8d2cc860b03cefc24fbe04 Mon Sep 17 00:00:00 2001 From: Kyle Fiedler Date: Fri, 20 Jul 2012 19:16:10 -0400 Subject: [PATCH] Added fixes for ie and an image change --- lms/static/images/courses/video-thumb.jpg | Bin 0 -> 6779 bytes lms/static/sass/_courses.scss | 2 +- lms/static/sass/_home.scss | 4 + lms/static/sass/ie.scss | 127 +++++++++++++++++++++ lms/static/sass/shared/_course_object.scss | 2 +- lms/templates/courses.html | 2 +- lms/templates/index.html | 4 +- lms/templates/main.html | 7 +- 8 files changed, 139 insertions(+), 9 deletions(-) create mode 100644 lms/static/images/courses/video-thumb.jpg create mode 100644 lms/static/sass/ie.scss diff --git a/lms/static/images/courses/video-thumb.jpg b/lms/static/images/courses/video-thumb.jpg new file mode 100644 index 0000000000000000000000000000000000000000..b27b8dc75024d9bb9b1f5b036e7d89f70e55ae4d GIT binary patch literal 6779 zcma)A2T)U6w+@6Fq&MlI384q6p@$x6hTbkB1PKsANtCX11?feQB9PFFfK&^Jbg)nY z(wm}EM2es^d3fKw_y6C_KkvOY=gjQA_WIVh*4k^&>~qeh&Xxfe^@GqJ0D!Tv1b_zc zFFD%;Fzeynyn_K`0E%<9IskCC4CL{|;rw8-vc7>buI||DC>b{_MmEURPZla8Cks&5 z3i5Mx^G4yo*HJgnz8XT`o^=X=(e4^Twu+{5rhd98Pqa};0Ln7N%*rjq+fCJ7NJ|r} z9s~=*_+d~uS8x!<$2Slbq#^XDbJ+R#w^~*R{HF=dTSG|aH!IlA)B>!F4M2evWiCs* z$w8rDB_$cCf})ZVR0=FF2bGtVJAagf4`MExs_|7aa(73_zSMWO<+_y9N5xw-J) z;Pcx3??k^1&!d6qVcqZ;lrPR$PebTjBjb*ChbijltLPXQ=Cprc_9$J;jBy1keNLM5 z0LX#=gP4q&T#y9_rO;u$>MBIZb~XdJ033rtlIKtOLI-BAZzLZJrKx)x(d(djyR&*cZ-_41ar4pO+Z6Nw zm#G{Cl~lrqsjb@h2vVsp=>G#hI^LzI^SG*ASa_h8G+@F@R4-u|GmrV~O5IX3TpN(n z^_dHLrPmE@`YmETk>HgtTpb|&SY;Ra>8YRMhfw2cZYz#>n_BXu)8-yhp7HpRB*;E4 zsu(Xb>{qw|e{lxTjcd*h{9fOm-q&Pb&z<&164$VMU|~s5(#OO^{)M3y_tBkaW9%#9 zj~29?gR07>USG@wCo5W*PX(3tlC>9lvQ6b#M%@x}%wED(8kGn34BA;omKTE#WiBgU z5nr=^$_JW~HAq#aPpHK6#$RuXpM?mow8S-f&fK?4yQF9AjUJ8_Db&cX_L{t!w~=}V zFvqLif0|d--B|Wrq1+f&$5@RdiW>RF@*guhy)B)2^0DDjF6pvR<(z?yJH#}~QA%^g zH&kU}_o*3I_hyK7=gWrih{mJ+`vW3Y^n71m0YqfTN&7r6nmd>cfu$3!DZcP2)ZzUm`Y4UV zvDVPfnfep^i^sz8+mw0hoXGl;xQ|VlDGS__W*}UB()+^F)xtZ>lHh4z+^k6S{M*ux ziT)?~leTAoB3R|!s(aj?NGT*JBS5z{u32&lirr=89=A-Mf2UVX7p~C6ec*Q^hhnry)|Dsd z2Lbu(P=jLOyMp3PldLswk^;_Vvz2x!EAipmfrXZf*RJTtHmPs$2$v*f9@VKJnW4N9 z)~8wJoH@{g>U-KWyH?X6vlyF};y1%jbd`826U{^I-ZsiAqds^iGrt8LnPm9yfJd?Vlab zip*1;_}SM$x1B(0jBXaE&ROv;-!j?L`p|ge^(kh3r6E1L+owkLagS-8DcZ0#nqdOh zts3Vt!9d8jVp>Bcey$4j~Zl)a;P^s#k7$giEa#ZP0&Aox>3&CcelR zs~g?IGy5GB?zRA(H0%6>#vJMhC~94<_7^* zEohS%yZbbhAxL{z8FNj%TdAXkZ}1ona?7ZYWppK~jy*PQzIRgqB}EaH(SY zsAI!?EuJ)OzjYt_j+W$&M}u5=oNP4?`Kn9Y?hcyMvtCGFG96P3elKq@q<)7O(pu=X z<1QjN$YP!)w4Kn=kn-#TIsXfV%V4a07?4H%=3$4bI8f{E+Ibgwc@GEWW>^AV-qC)LqB+jolRb5ue(r^%;QqXyZ-vn39LuJ1M~? zc8C*zO&4OL>kpGv1xGGr0^c~;Y8+duD3{lDvxF-bu#m69YJ167fe5E#Nfn8c39AGK z*at?4pqkM~eH<|@x*;L|s5kSrK^8tr+T#td;?g?z!3092skl%Acw>>b=ZQN&*T zIfFl9Hpe|&AH<=gi;?@0U{x^Gz`^E;_We=~3YdW)*?sZvaBmm*Moz~HJcXafJTGo` zQ9M3v9>h~We!D(!c~T``Glb>iD}Q=Z@}=nhSua)GTa)lY(}}KL_r?v`+SUjh3uD`R zV*Vq^kf!CdBu|kkk%crgM@iEPi5zK#E#mcR(XYe&R5L6+Rn3C-#PnS?UJj=>m8sd5 z+>62eO#9fQRv1G(sK)%N+Okopbs6!MF(AK#cxk*T)W23`dpY3&HqnnRCS$AGmj78@Y6>3_JJ9>08nG`V^V{igjhZ&vh64Irqeaz~S$9V-M#gaVeR|mKvY9TlW(MvglhY*Y z0qxJa7v3(lh4{Kcd-4~OYb|fG*ZYI7mhU$z>Ag8}9BY|#xpczXwvh3uuO_bU{`YQz z<)vPo-UIP;Z<&rKjS8#t!i~!z`b^w9{VJ&i483-dSK_JPb(K4QUB0jB;EnMOj%lOj zBRFiD<~UeLW4~`km96$n75N}Cu#HtFyjtQU+9{{Nkai0bA;w6^w%!;6}=$fhkJ%xto(1iVIV9 z#4Jn|GA@h32+!r;elS+#q`BwJ=7CXAgg;{NqXBVzuC4Z}ykstBzBY%C%I4_cFnVDV z%?3-U@ZbHQ#?=bI^kk-84I%j2crNd8IobQlo4zuhsUz(^)+%)^*k6m9R1x(p7R#++ zG|b4vz0J;$fYKz?=JhqVGK$HzJ6%(QVJ+lm=Jt4ynOQuJS8R*Lk}AvfjNX1MmodES zObccqlvZV?kE`8;#9Iw8Diti*<)xJD8%;J+tlxJ?yy9p)(-fxdL^s=#P5k2qc?n;n z(4|#rLE}+lvDm7cdhT>ER$AK>_E(HvLEPC$kDr5bt50*M#J_pxwm;2 z^WC|a`-+V?>sKvCA{{4(Bm9WP3lIl(Z%B^MEA>RZLO z-`KQBs*Q6QuyGUGppR=HAwN+{K!Yc40we6N1#seuD6&Tg-^2I6jS}w2-iSaj$gi zgd_6U{rxu;$C7!V-^M=+_r=8oRbb2{cgK4XTGwjR@+)C<(^F}Ako4GjVe3mvBVQ>K zxFXuu%9WKrJqVC0GOlceJFrY-B;=aCU@`bYSn=b3>p?(^7G;_o>v|?1Omb+V=n~NP zgpIFGXRW;WG&83u>4I5-%n05P$_f4(U_tZA*|)*TpVO{vaj0bxj`Wl44BzMFVf?KU_!whdpa^R?IV5D7bd- z;y#O&Hayf6_ne&oU4-x{Uv1~b>NX&v#Oy*U$L*Y7bMbpvydX571b$|9DP+*WRlc1c zmi*Uk7W2hDOFTaF?%}HuRi-(uVDUrB(l;;HO$T8MF-%-s5B0p!vtk5g1+Wip@WHE66g4=xC{}4&%ooqSXbTkn5Nnxhd6POnKK?@ zi^RS&Te{x4J-5sJenp;Oy=7NT*DEik{aWU*DurAKO2-CdcZqez0AsghdDP!xrhBl&M=*~0>PAgKMF_@;Z_ zo>0aY$`c$oQT^+QwO1%+&MR9x;N?F5C1Fa|$s;TJhgZl45#g;XUg_kY3~T+q_BrhA zp$-e_Tb@xYHq9ZgQJOn>fI9aP2MffpvbXy!-rdOOGg~Y-6BqxmBD*b^lJ{%yUQZ9j z0Imv0$`ge+ykqB+64xQS%O|`NgB@0i*XDVJl#-q@W}AA*V7Nxze__Ww#5D4km&FzR z$&jltl0AXqv5yn7tDTNb*N70&Ku%hLlW5!3ic`E%ob)HxTxyZ2j1uUPgMAi>Dg$Nv9D?mk@zOZrpE?zJfN|vzW74 zdG&^rw=+W+ZX0KS`&CkYlm zoW?wJfyMiR!%ZIs7OEe+LO^0I#U&HTp2smypM)cl-gVp)AFE(g9XlkqD57elv>>L*b=x93YQ(Drj1*2(mo%KPI+7wQe-;>E_=EemE3=CX@ldDoU zwlMccw;kX(vX-}_-AO-3DVsnI1j<{2z z&7U9j4N0*U?)AC2h~NXoX9w8V!Y$~eciU|;`;i?SLc_~HIGfe`6|KQ;II+=CrJ1H< z5^W9TO#TXBD$Cb=0rrsidfvEmfmoi#*U4Pm;ANZfFsBYwzbUeY(6J^*xr?@yD2EP~ z7_2AlNI2y`^dFn&;RU6oIM*R}_49Q)nVNRDDp6LQpVbd0okuetWpM*B5XP&HLY1!( z_!i6NB7&=tUm`|~V-JmNOzy{}BsD(?FE6ZApt$J2*eCDnl>mdEPOM(;1A0&|m z1yPkio)9b-uPON-i}c3zpyd$vXY?N!$Gk?pqzg&u7(G@IOPCtBo#n_XCtSZDWFZ}E zcx~Fy9L2=L_Q!odIdF=&0s4tBMvUANbc53@>5Frt2G4)i0GL<57V3T6W%DHkX7l9kT?U7l=t|}Zk_=s5x@z#0zz2!*JGI4Pe{Guh0AAvHm`+# zElLrgKyJR+(nfRWjn173ns+k&5NXE~moBSFmS*PIIj;N4*Nh|>y+WxbvuZ8*%`Ljs zKQ{luE)~&1Tx*{id7S}PB0zKoL6D9VupL9Ue2#Cw`zg*Xt}^V{6x{jw zgpJK0&h4js`ren_1OV)D%5va=X^U5Q7Ke1iK#{_>sPxlVaZiqdm9?)eGrC<;Ezs3Q zr_?d`JHD(d-d`KV-8eZ&^Jf5HZRYObdC`n6Iu1A<)t&*gmWpWRJi?p98_ocM+ZLC! VFJ`?^PF-X^16a2H6lXr0{x3wE^Hcx; literal 0 HcmV?d00001 diff --git a/lms/static/sass/_courses.scss b/lms/static/sass/_courses.scss index 6fef20ea22..7e5bd4ff38 100644 --- a/lms/static/sass/_courses.scss +++ b/lms/static/sass/_courses.scss @@ -22,13 +22,13 @@ width: flex-grid(12); > hgroup { + background: #FFF; background: rgba(255,255,255, 0.93); border: 1px solid rgb(100,100,100); @include box-shadow(0 4px 25px 0 rgba(0,0,0, 0.5)); padding: 20px 30px; position: relative; z-index: 2; - } &.main-search, &.university-search { diff --git a/lms/static/sass/_home.scss b/lms/static/sass/_home.scss index 0a03faa28d..4ef25f106c 100644 --- a/lms/static/sass/_home.scss +++ b/lms/static/sass/_home.scss @@ -24,6 +24,7 @@ } .title { + background: #FFF; background: rgba(255,255,255, 0.93); border: 1px solid rgb(100,100,100); @include box-shadow(0 4px 25px 0 rgba(0,0,0, 0.5)); @@ -189,6 +190,7 @@ } .media { + background: #FFF; background: rgba(255,255,255, 0.93); border: 1px solid rgb(100,100,100); @include box-sizing(border-box); @@ -226,6 +228,7 @@ width: 60px; &::after { + color: #fff; color: rgba(255,255,255, 0.8); content: "\25B6"; display: block; @@ -254,6 +257,7 @@ border-color: rgba(255,255,255, 0.9); &::after { + color: #fff; color: rgba(255,255,255, 1); } } diff --git a/lms/static/sass/ie.scss b/lms/static/sass/ie.scss new file mode 100644 index 0000000000..a160513d1a --- /dev/null +++ b/lms/static/sass/ie.scss @@ -0,0 +1,127 @@ +// These are all quick solutions for IE please rewrite +.highlighted-courses .courses .course header.course-preview, .find-courses .courses .course header.course-preview, +.home .highlighted-courses > h2, .home .highlighted-courses > section.outside-app h1, section.outside-app .home .highlighted-courses > h1, +header.global { + background: #FFF; +} + +.home > header .title .actions, +.home > header .title:hover .actions { + display: none; + height: auto; +} + +.home > header .title { + &:hover { + height: 120px; + + > hgroup { + h1 { + border-bottom: 0; + padding-bottom: 0; + } + + h2 { + opacity: 1; + } + } + + .actions { + opacity: 0; + } + } +} + +.last { + margin-right: 0 !important; +} + +.home .university-partners .partners a { + .name { + position: static; + } + + &:hover { + text-decoration: none; + + &::before { + opacity: 1; + } + + .name { + bottom: 0px; + } + + img { + top: 0px; + } + } + +} + + +.home .university-partners .partners { + width: 660px; + + li.partner { + float: left; + display: block; + padding: 0; + width: 220px; + overflow: hidden; + } +} + +.highlighted-courses .courses .course, .find-courses .courses .course { + .meta-info { + display: none; + } + + .inner-wrapper { + height: 100%; + overflow: visible; + position: relative; + } + + header.course-preview { + left: 0px; + position: relative; + top: 0px; + width: 100%; + z-index: 3; + height: auto; + + hgroup { + position: relative; + right: 0; + top: 0; + } + + } + // } + + .info { + height: auto; + position: static; + overflow: visible; + + .desc { + height: auto; + } + } + + &:hover { + background: rgb(245,245,245); + border-color: rgb(170,170,170); + @include box-shadow(0 1px 16px 0 rgba($blue, 0.4)); + + .info { + top: 0; + } + + .meta-info { + opacity: 0; + } + } +} + diff --git a/lms/static/sass/shared/_course_object.scss b/lms/static/sass/shared/_course_object.scss index a448155447..374caf4898 100644 --- a/lms/static/sass/shared/_course_object.scss +++ b/lms/static/sass/shared/_course_object.scss @@ -141,6 +141,7 @@ top: 0px; @include transition(all, 0.15s, linear); width: 100%; + overflow: hidden; .cover-image { height: 200px; @@ -174,7 +175,6 @@ padding: 0px 10px 10px 10px; width: 100%; - .university { border-right: 1px solid rgb(200,200,200); color: $lighter-base-font-color; diff --git a/lms/templates/courses.html b/lms/templates/courses.html index d7302565d9..25f3d27a08 100644 --- a/lms/templates/courses.html +++ b/lms/templates/courses.html @@ -28,7 +28,7 @@ <%include file="course.html" args="course=course" /> %endfor -
+
%for course in universities['BerkeleyX']: <%include file="course.html" args="course=course" /> %endfor diff --git a/lms/templates/index.html b/lms/templates/index.html index 062a6bbe3d..28ef2d3b25 100644 --- a/lms/templates/index.html +++ b/lms/templates/index.html @@ -66,7 +66,7 @@ -
  • +
  • @@ -88,7 +88,7 @@ <%include file="course.html" args="course=course" /> %endfor
  • -
    +
    %for course in universities['BerkeleyX']: <%include file="course.html" args="course=course" /> %endfor diff --git a/lms/templates/main.html b/lms/templates/main.html index 0fe68e4728..2c9e00081d 100644 --- a/lms/templates/main.html +++ b/lms/templates/main.html @@ -13,6 +13,9 @@ % if not settings.MITX_FEATURES['USE_DJANGO_PIPELINE']: + % endif @@ -64,10 +67,6 @@ <%include file="navigation.html" /> - -
    ${self.body()}