From a3dfd2ff219cd937a0c5b3b857f18eb55c21fb89 Mon Sep 17 00:00:00 2001
From: urs_hunkler <urs_hunkler>
Date: Mon, 21 Jul 2008 07:41:36 +0000
Subject: [PATCH] I cleaned up the worst issues with these 1.9 themes under 2.0
 and added missing images.

---
 theme/colors/colors.css                  |  64 ++++++++++++++++-------
 theme/lines/lines.css                    |  61 ++++++++++++++++-----
 theme/lines/pix/content_bottom_right.png | Bin 0 -> 4851 bytes
 theme/lines/pix/footer_grad.png          | Bin 0 -> 419 bytes
 theme/lines/pix/sideblock_grad.png       | Bin 0 -> 1409 bytes
 5 files changed, 91 insertions(+), 34 deletions(-)
 create mode 100644 theme/lines/pix/content_bottom_right.png
 create mode 100644 theme/lines/pix/footer_grad.png
 create mode 100644 theme/lines/pix/sideblock_grad.png

diff --git a/theme/colors/colors.css b/theme/colors/colors.css
index a3a2e4a6da..93a4f822a9 100755
--- a/theme/colors/colors.css
+++ b/theme/colors/colors.css
@@ -1,4 +1,4 @@
-/* @override http://ubuntu.userver.lan/moodle_19_test/theme/colors/colors.css */
+/* @override http://ubuntu.userver.lan/moodle_20/theme/colors/colors.css */
 /* @group core */
 body {
   background-color: #b9baa3;
@@ -458,9 +458,6 @@ link
 #theme-index.course-1 div#content {
   margin: 0;
 }
-.admin #layout-table #middle-column {
-  /*padding-top: 10px;*/
-}
 .admin h2.main {
   margin: 0 0 10px;
   height: 20px;
@@ -598,7 +595,7 @@ link
   margin-bottom: 0;
   padding-bottom: 0;
   border-style: none;
-  width: 220px;
+  /*width: 220px;*/
 }
 .sideblock .header,
 .sideblock .header h2 {
@@ -683,45 +680,50 @@ div.loginbox.twocolumns div.loginpanel {
 }
 /* @end */
 /* @group content */
-div#content {
+#content {
   clear: both;
 }
-#site-index div#content,
-#course-view div#content,
-.haslayouttable div#content {
+#site-index #content,
+#course-view #content,
+.haslayouttable #content {
   margin: 0;
 }
 #site-index .subscribelink,
 #course-view .subscribelink {
   padding: 0 5px;
 }
-#layout-table {
+.weeks-format #left-column, 
+.weeks-format #right-column, 
+.topics-format #left-column, 
+.topics-format #right-column {
+	width: 15.5em;
+}
+.weeks-format,
+.topics-format {
   width: 960px;
-  border-collapse: collapse;
   margin: 0;
 }
-#layout-table #left-column {
-  width: 220px !important;
+.topics-format #left-column {
   background-color: #f68933;
 }
-#layout-table #middle-column {
+.topics-format #middle-column {
   padding: 0;
   background-color: #fff;
+  margin: 0 16.5em;
 }
-#layout-table #right-column {
-  width: 220px !important;
+.topics-format #right-column {
   background-color: #1d6fcf;
 }
-div.headingblock {
+.headingblock {
   border-style: none;
 }
-div#content div.section {
+#content .section {
   border-style: none;
 }
-div.section {
+.section {
   border-style: none;
 }
-.onlymiddlecolumn div#content {
+.onlymiddlecolumn #content {
   margin: 10px;
 }
 /* @end */
@@ -750,6 +752,28 @@ div.categorybox {
   padding-top: 180px;
   margin-top: 10px;
 }*/
+/* @group My Group */
+.admin #layout-table #middle-column {
+  /*padding-top: 10px;*/
+}
+#layout-table {
+  width: 960px;
+  border-collapse: collapse;
+  margin: 0;
+}
+#layout-table #left-column {
+  width: 220px !important;
+  background-color: #f68933;
+}
+#layout-table #middle-column {
+  padding: 0;
+  background-color: #fff;
+}
+#layout-table #right-column {
+  width: 220px !important;
+  background-color: #1d6fcf;
+}
+/* @end */
 /* @end */
 /* @group course */
 #course-view .section td.side {
diff --git a/theme/lines/lines.css b/theme/lines/lines.css
index 214d63ac38..4165981561 100755
--- a/theme/lines/lines.css
+++ b/theme/lines/lines.css
@@ -1,4 +1,4 @@
-/* @override http://ubuntu.userver.lan/moodle_19_test/theme/lines/lines.css */
+/* @override http://ubuntu.userver.lan/moodle_20/theme/lines/lines.css */
 /* @group core */
 body {
   background-color: #eaebd3;
@@ -646,16 +646,24 @@ link
 .haslayouttable div#content {
   margin: 0;
 }
-#layout-table {
-  border-collapse: collapse;
-  margin-top: 0;
+.weeks-format #left-column, 
+.weeks-format #right-column, 
+.topics-format #left-column, 
+.topics-format #right-column {
+	width: 15.5em;
 }
-#layout-table #left-column,
-#layout-table #right-column {
+.weeks-format,
+.topics-format {
+  width: 960px;
+  margin: 0;
+}
+.topics-format #left-column,
+.topics-format #right-column {
   padding: 10px 0 0;
   background: #f8f9ef url(pix/sideblock_grad.png) repeat-x left top;
 }
-#layout-table #middle-column {
+.topics-format #middle-column {
+  margin: 0 16.5em;
   padding: 0 14px;
   background: url(pix/content_bottom_right.png) no-repeat right bottom;
 }
@@ -697,9 +705,35 @@ link
   padding-top: 180px;
   margin-top: 10px;
 }*/
+/* @group 2.0 layout-table hacks */
+#layout-table {
+  border-collapse: collapse;
+  margin-top: 0;
+}
+#layout-table #left-column,
+#layout-table #right-column {
+  padding: 10px 0 0;
+  background: #f8f9ef url(pix/sideblock_grad.png) repeat-x left top;
+}
+#layout-table #middle-column {
+  padding: 0 14px;
+  background: url(pix/content_bottom_right.png) no-repeat right bottom;
+}
+/* @end */
 /* @end */
 /* @group course */
-#course-view .section td.side {
+#course-view .weeks .section,
+#course-view .topics .section {
+  border-style: none;
+  margin-bottom: 2em;
+}
+#course-view .weeks .content ,
+#course-view .topics .content, 
+#course-view .weeks .section,
+#course-view .topics .section {
+  background-color: #FFF;
+}
+#course-view .section .side {
   border-top: 5px #EEE;
   border-style: solid none dotted;
 }
@@ -712,13 +746,12 @@ link
 #course-view .current .right {
   background-color: #FFC;
 }
-#course-view .section td.content {
+#course-view .weeks .section .content,
+#course-view .topics .section .content {
   padding-top: 0;
-  border-top: 5px #EEE;
-  border-style: solid none dotted;
-}
-#course-view .section .spacer {
-  height: 3em;
+  border-style: none;
+  border-top: 5px #EEE solid;
+  border-bottom: 1px #EEE solid;
 }
 .section .summary {
   color: #444;
diff --git a/theme/lines/pix/content_bottom_right.png b/theme/lines/pix/content_bottom_right.png
new file mode 100644
index 0000000000000000000000000000000000000000..021ed131004fcd237deea88855a1758b5eb3df84
GIT binary patch
literal 4851
zcmcInX;f3^);<U#ML^o3B@8A3+d4s*kuXJr0#Z>yW`V{e%n*hk5QcyvSfK{II3Sah
zC^85tGRasig3KZiMMG4SDFnnYha~q6QrmmiUElYsXRRdXyxGIEpZ)Bem0yn8TFOc*
zNkb4MYi(s=2SH+K;J!^t61+dzTKx`uNQ51*J|P9J7%9Se@cdP<l}i`|ZT?2|66<5e
ztpb~`$p@Xu&PRSi<4J*<I0ESuQ8O|y7&0-B494O8iDbknqPK65sTu--P(%0<Ox2w9
zk7ykU#u9yettg>Hdy4G|JjEYxL{Kv~lQxM&1Lr^@8Hb1r3<wHCN1Cdw#YBU9(J@L5
zv1UT{H&xp&N``Pgatwhbg%S~Zn%Ww8EnPi?o`I&0p^lNE!Cr(tj*K{r3qt4^B6PI0
zz?%+QTN|yX4Zy5jYG%^l(<GGOg|@Rew4M_@nX37a$-!t8Dk366GeTFB6zYxAHZn3o
zY3ZPJbToj4Mp#r385gM$6sG<;$e(d6h++6p-(a#YDF`8oi#tUMC!4CNi4uLe){Dah
ze@PS+woV?P5fzCGMrmtmp}s^0jwav`jSVH@$fVE{BvOFc=kgEvh7u!4q5feAti7&@
z$n!sp{>u87KhXk5CYk|0_GxJ8YG@gr(9uR~X`^)wUH|6)+33IAkB|tyUQz$UT}KP8
zzi-|BZ$|6xCMXdRe<Nm%bx}?Kb^iYmM!<jJD>ytfV680#Jc<}V3?v4T!vJU6|H&Bv
zkM<&k2I9zOzJWMzA}Tn@+XVI3;s1&6Gio3UAWPI2UH%FEODq48o4<JfN5X#&`cEd&
znjBdH8$(639PCM6<Op0S5&9pBy*7AA9N29W*{z9NG&U!E1BuX|>YOPbMM039rnSZX
z6Oq{*Ci`^3p>2}AyI<z~G|JBl4+<$6-GmT(XPY1~)!^7?_RWoyz>Bwgj%nY_*Z|dA
zArqYiZc&5Ph9>He?HeBRC=`EmtDDe(#K1s46Wj0mF_fgBiW3|Q$qmgrI88Md1k#)1
zzn8&@9h($XFi(`=&*!73wGuaCB2{lp*3?y=m)sB>#q3g-Wod|u{S1RiHGgQx9ZPS|
z!pC@RN9y@woguxSRIl`5ph*4vlr{|H3?c`+baBlt6q|E>7)f^_O<(?-e}Qx(<z=I3
z3DDj1G7@h>(PiNd!+IG}4@436rs>JYcVwv&6!!cX!N{hYx08l`r$HxgL4rd~!bH6N
zB1K86dE<vRO#%Yit0pd1lQ`*&n~Z^%XIj=7ByJ4Ww$XI!J18!8gXkKOzMg5$mC>kV
zI#Xc$8O+Wu<um|RgtFP9>oihaY+u7JU|~K}P+O1O3vJ6)_$>j-cJzy@ynS@8d<Q5R
zLrnp&vmMhZsh&JP*U@KXvN*BqlV$#%mA(k5Q12$bl)YO=9&)`^xe@TQ%XCaQ-n8H_
zX*7dxSD6qIP&~5}zj7l35QC21@vXJw1`N@|SQNAS#VWj`o9E;G12D7QJ@c`TJ*X!S
z9U@n&iI~>#7uS)Gf4*x>crAugLJXrTKiaS_-vn#(*zFmhByjnwbKrX$x8V(dkiz3x
z!h)&IBaFuD(YYdyA1o+2f>Je+R5w7z$-#%rCUC0Y$E7CD?aYH&?q=u9&`ELfAd~)-
zUfFvoi8pgqwWYs_+Vg2@K^5S8)T=UXUlu!XHQj`*aG<8et)>G5b)VvV-LkaeZsUW1
zuIe<soVx>9tjUO}ivf||-fR_)_(<vqhnyB&MUv@%aqj})S`7g0XsfHcngFSIuvEtJ
zT<V-Buh{k7U}nOqX5;YW2k35IcI!6&tHZyd^yQ%+tWciqBJjd855QZbd)N(Hm+%>t
zQ_|R}PL~g=E)Q-3Smc6Q#poB4MP(M&&CXR7<Qj{psO}09c{#TXls_56<elb}EX2T(
z^x%}9PIU=@^67^fLbMVybsgCAe<eU4wZi4*W|z&;J-nSxMc&&vL-O086i}kx5tZ3X
zfQzBib&<dosqqx^5Hy4`yr#KkH84*i-P`UFPB%0j6j4A26ug&tA1<JcR+jg5fXwxS
zvkO}<0b&CdRF8?|*B>o{nL%O<SAQ>ZnIj_H$D+vIhyf+Q_hqzh8bNCFo4Y^2346_z
zVAoe20mBc^@ehKc4znXTcsHOP72DmXr+t@9XusuZ30vu0vvv-v5&KZ6&@oEIK_?SH
zap$Lh-wVP|1msZ@5kTrU?#U1)RmMlSR0UYu(K}Z_kXM^hRe_A1^oJ6YzFX7eL*`0<
zBbcsz*$Txpfjg}AfebxbKzmWM;NVBt-m=0%iXi_^9}*^Cjp9>Y;$=l*REzKs4b$b<
zPQ#ogdw^51MFvsSi8`QoUA)1$F+y%GG}CA-R^b&;z)9!agdb%k;tz^QxF2wJxNfj{
z6x=5t_d=XqqrrX*Lw$<zTc7L0;>mKEPjbLyc-ia+q17^b#9%M80iW{44a@y9bR$cO
zy7)wn5Wh6!<PZxoXj%F>fX3)vwloC7t7waqYfC)x6zByPB^g@IWL-{B;8HU>772(R
znGeRVpR-yR%N{CF9&RPQtsZ}6v=1yA;`@fqUqlnL&}Du=#J7c$WMB4-dSbp&Z^{SK
zJ(AqqZrusvnSyNd9Ri?`V=&|Q<Bgu6Qx`fD&WRjHXWAL>;iB~=r*^p_p|lNScU@m-
zshzySt*6O@f(bVgpqP3UYpmeG0Z^ATOegJW*3NAiqSLu0;U}3L=hANVBzTyfGUZC;
zw_9{>+R!Y$E;u<-`D#IJ8ptzp`4@}gp2g#@JqQRa_iP5ts<tyjhCVaobkKb`5A1f8
ze&tQH_T)jJQos6^QvU;hlgF>r#iQIYk{dqGKGaDY%N~n`S%qknxYZQ0dT@n@Brl=I
zFz_zSbT?S1_C0T{*j}Jv8$}vk8s$6*TQ3VilDsqoYwJ)MXM*0csmVNM4CtdaM-k5w
z`(9S!&6L69p0#W`;u9iSe4M?o-22!E5D9;up3q+wJKu?EpD!dJXj}`s8fF~mk<WEw
zm79R>A)cKS5L*77dbz<zt7~&BCPPFp!{|=csa}ZL%mjr@YfnkLt{;I|e+J3c^pspR
zV1yWXby-AV49rTU6Vunc3I`DI*9C?4Zstp8!Cd@y1uXV`dN3)d!S1%%Bx8&hIT)s!
z2FBHHrN~Rg*9%c(B(#(QOI@dT{U^-_JWv3-eP4sB6c&!Ei}YHhChn5{d9>np!K`90
z&V3KFin>#>wC8n+Q6CWjbsA9QF9F?N0UKE5x{O4;2dNFyE(-=-xTmpub+=eeyaM>`
z`<nAMJ7R!C<qcX_3U8I>J?fh$A~2EzK|7L0yT?`LxdSb(my60cXR@w-pXpYZJ`v=}
z{+)3(sme1gp&1!FDQEn+qJ$}rKi;aC_sVwSPI#MpvTyj|qI<e1gRStMdo>zK$NUfP
zqTjb>mL$t*4?i;9nrS72{9`Fw-L%Dd(7f_P6P)qnf`hvkSZ6ABQ_GaV9PgT&RlGpc
zp+vOYfP?NY-<4nsf(%|3%eLOv3_AMj2md?hC-U}{U7-z%x$I;`*OaRr<}|-ksmP78
zi8f2UNZM88nf#`^M)vO1*lO$WRELwwC>KVZ51(H&O|5So;N@J%yRV3^DU4p$buvgH
zZ`t)4&QAWw3z7JCM1yYWzFI%**1>wtpLOz3l7iD$6fQ?65A&_g`ZLU8O&6&}rEKFr
z-mZlIbj!gox69GY_k0PDr+sV4*U@;8lGE*2csgghxvqActl{g{V28b%D%vGi_o0`i
zck$)!t@4VB8y#f##GOlvOLkk`T^+f3*K2Gl>%&6HiqrZ1;>eU${CGu`K*uXCQFS#J
zcF1gC?1i_3`LML|K)ylhw{DqMF)B~DI&cMx{S(i|w+-Ywwl1*mTvRy4X`sY?q<A5V
z7WR)v@$gSAf3S<$`Orz0eO#z%7`-R=vATNg<s&86%>VGj%_3J7yDQno3!|i-AJ2`?
z+|Ggr<ifwXkkqR`^)fuePA|=Em6AA)y!pxE_n}|TRnMfgr<t4^l(0u8x@lN2Ft)g?
zqjzcW?gd3bEA3?u9M3A2tMnXxCpgvirgrrLnmFuHP?k#yx$=oCsOXRK^ql`TGKJN%
z=cUIDgT(pcSG=GRw^$b*G1YuvG98)QWp+_BmcN`75W3}=0?CQZS5ihQ-*F=S?3H69
z&54LS%#1M)W4LW;KK*o+pQ*bet9B4$P)SIx`PqMdhSYjZD8R425=zUNPEM-EIhY&1
z;A8CBG-kfjtK2FqDo(J#!X1s4{dTey)yq3w1K%Ff<t4?IFXL*ouN*$QSd}xqF(mjR
zW_z(`_dNWoTYM%p<W(bV|B$}86^-)Y+G;H4nqZ7p>%_|EKe=n~QZ3%+*-+8L@hl9k
z<ImQ7@(&RjgwG48Oo3FB|6)_2fOJQ|EnuhUrPX71;;~kFri2HA^jvYJfxyRDiyY-l
z`!QDYfnEKqgwa6z<VXW0EGb6dVnn|*vRrz*PLOIyGF{-VOjB;E=1p5GS>^73)GF^A
z?f<J}x(8Lv5bpXSPX0ly&6IFs3d$xT=!UTInWg80gpGC_)<OvtD}GzxVw}`CZdA&A
zTkcY~e0;~^wmNp^4}pyfukG0l%)062_=<xX;uGYuYQjK?QNLTr?H@aCt?r$Ai=|<n
zn1yU%<iISVo=5AP57bTO71(lh&jcrOB?Q~+&8dfa+a-$8fkvZw?JKJIC1YB?ux!B7
zA;&eGC#VmfkBg=9VR3$o5e#9`fbbZD{n22cI+&l<*)jC1@=$UlXJhEoMM_eYM~o?V
zUPi-gY3`QXu2TJ&wrna?J~A&8%X4gcO~mfC*+d>Tq}#{MILh8jHJ@54@!xV!mhnm$
z6XDym2}^4V;fLn-%~1*^FO3=MgqJb{6pKpE?xmE@dfTz$hT%2+l+<U(9@f4)Q&{1B
zw&B#-Yt>}okg~yCH{azb*7*hWaC>o`AVXEqx6SM$_qzkFa#8%ztZ+8JWT2=-u7iEn
z8?h;F@@7l<n*z@jOLL<GQjL~8;}PTBSt-J#WxYPbgOX!6>yz2?&R_jzI?tH>0DI^e
zHTR&ja$a?s*+~6aTANCH9&Pj*wf#Dhu9X3!-yg=y2w0UX<rCr3Z+X1(k6imYYN&gC
zWBCj<DKC#YFwLs4H8vkkL=*0nRi7?%pRugFXgv!5R1Aj}1hA>z3nj_)Q1);fLmr>o
zYUO5vabA(^p)Pf@Xx+%vM&zTPvhr&Gpyc5Fo;zmp=j_-_HvGN|DL^WiFaNfF%uZMx
z9zEYXzrWbA;kSfR)>}v3+2JEIr+cfrM(7vIy~=9l4{zR%kBPW67E%=xe@FSrr^?Yl
z&2uM>uf5fn;wKOujdV?;dX8UYNTxr}Qo<C78$>MmK9J*wD+;Dp;mKFeI43>aVg~+O
OLe>XuEy@o3eCFR(ojxM~

literal 0
HcmV?d00001

diff --git a/theme/lines/pix/footer_grad.png b/theme/lines/pix/footer_grad.png
new file mode 100644
index 0000000000000000000000000000000000000000..ad61f5137cc72fcb34f3018aea3ac036008ee9f4
GIT binary patch
literal 419
zcmeAS@N?(olHy`uVBq!ia0vp^Aa(!;GmsSjDIy1?n2Vh}LpV4%Za?&Y0OU3X_=LFr
z`1$_F&v)N{0MVQ8Ki+=({`%YZH{ZU$`ugqV*Ka`b#h0%@^!&@$XP>`3`TPY)KK=Ch
z(WlQ(K7D@t@zcYPpB{Yt^ytIK2OmD(|M2nN`ww^Ce*ltq-@U*6?){y2?{B?*ck}H#
zAbI1>+v{)M0?BKy-&}qD21s6c^%{sSb7}j_10BOz;1OBOz`!j8!i<;h*8Kqrij}xV
zlsFfqCYEI8=P86_=B6?jSm+uU>l&E9U;j)Ws6qy$A~-*-q&%@GmBBG3KPgqgEwd=K
zJijQrSiw2ic*Zq1PzdCEx;TbtOuTyR=v1Zv29|@z?&cQ8tNdr!`E@q4J;SSz523Ch
zuCX^~ZSuVsuuau!(ORe7i`0Le;ydDTbK@pwLs4T<D?x9=@G`})Q~xw~i$!k?UMO8C
zP@UTUNXJj>i&EaBRZj08DgK*U+cmx7wfZl{i}gNdg&)0L3$&WS)78&qol`;+0FE5m
Apa1{>

literal 0
HcmV?d00001

diff --git a/theme/lines/pix/sideblock_grad.png b/theme/lines/pix/sideblock_grad.png
new file mode 100644
index 0000000000000000000000000000000000000000..9d23d3c349bca71f42ca73a96fb1b15d3ea34d2c
GIT binary patch
literal 1409
zcmcIkO-vI(6kbyjkRKC>(Znc@OJY3O?sh3HUE30%MKH7w+6Z!D*$!n>y1Ut3(gKOW
zzeG$tcr%_%@I>Oz!C>M^H1VJ}iC!v+c<^ANpdirwq0Y9Y{DkO<+1;5pFW>jxo9|6_
zsylSCs{BMbhGA75?fxFLns#@Y1<l7ZM{Chyky|<<Wo2dQ#jY=C+uPk431qX`P4r|p
zbHmu&)D831bR(l18-}47hH4;NU)S_CO<&jb4OLswv^7opqnht(M*XF#D;f27MqS>>
zEN3!kURv-}d`Bq`i|tor46CRyze67uuIk8nObPTUtrBDuPT)a=OF)clw378!(zW#T
z8-WlfO+;82Qj&}WvF4~S2tgYs!K5I?WzZU~zyGNXovWnU#PtO`X;w(s7!zhoB}B~A
zloA;>4izv6V;t|r0RTAQqF%hWAxH+rRyfSHk4rE-9*VHzan>Ehn|$S-6phFUs4yUv
z7~y3)<;8O`X=Iyj0tY#W68GZyn)-s>pjD6{aM<itmaKOGhto#6D7VXb9)uYMTw-`Y
zxd26yXrgGlop#t!F}Z>J%F*hPqC<3#zpaoH?Y#J~qKGs>B$G*7vfd_0F~aV4y9tsa
zD9VZuR(Xt9n3R>5>+(Ui;`pJ=N}QO})r`vw3Zse_$IV2=Q8*kU78CJuK|CZQkzz!`
zZX=0eWJL5JC!On<AVmaW#J5jNJSKA&XgljRANm;u`j8%lhDRupb~Mrr&i)<zJZKL+
zC`7rTv3=+bNLQ*r-vKJnJ%lO54q<Ytn`heN2mcW)$`<t!N2QTmTcRuhM_>Z-ii|X~
z@765J(nErjU=$yhU}BIE`Iv{;cK)-zeAVb$pleAK@8wqM#a14Ov90@ogwF>($Ruap
zymz9XNPmaFIdbma$G5JU8(3vvuIugO)LA(zznqwEn||>4@|{P|f)6X-Rlk^=ubCN0
zznTqvJ~FeoYPl<_w|-#h+E8rx+WhI~_|KB`soB!6{OySrmom3DmsU&bERGAdo1L#w
O7OW!>@;_-Axc(R7Q?;f5

literal 0
HcmV?d00001

-- 
2.39.5