From c158eac4c3bee999de5aca34a86425568463ea10 Mon Sep 17 00:00:00 2001
From: moodler <moodler>
Date: Fri, 2 Feb 2007 15:03:40 +0000
Subject: [PATCH] Merged some changes from stable 1.7

---
 theme/chameleon/pix/i/key.gif     | Bin 431 -> 1010 bytes
 theme/chameleon/pix/i/move_2d.gif | Bin 0 -> 140 bytes
 theme/chameleon/pix/i/roles.gif   | Bin 0 -> 431 bytes
 theme/chameleon/user_styles.css   |  14 +++++++++++---
 4 files changed, 11 insertions(+), 3 deletions(-)
 create mode 100644 theme/chameleon/pix/i/move_2d.gif
 create mode 100644 theme/chameleon/pix/i/roles.gif

diff --git a/theme/chameleon/pix/i/key.gif b/theme/chameleon/pix/i/key.gif
index b3bb135385439ac343ea7ee366e74d7efc1d1171..554dfdbf2f3d6cba2ec9a1017c0c79cbce57448c 100644
GIT binary patch
literal 1010
zcmeIxYfF=10LJlKQ};~E7Fw8SYWiZ9S{kONL4~IzUlavGgDlsIirlhnP~o;D#Y8p_
zlc9(@-{?xG=(I$cc}S)3kdCE0>9*&2c64(G9UkuNL-ejczfW+%m2*8iHSInLkN{Q#
z5)%`dA)q`8@KZp`CD4>ZEGnRM=YcPGK<_>9nF{FiVg|jqj|vzJI)lOJq>=||pyXxA
z2o(q)-sL}`GMP;A>(diV@bwL8{GHd&3ea7~uC3+O*Vpw{l{GZf4^=;JY~%|Bf>GY1
z5#Foj<|eETw6wIewY3U`!nwBerLKf!QQWd99v1=Gr#O*FwAw@dEk390O)~cT4h-~5
zBm)wOWW0NHa8NSQGl~voP4-HMhKJ!dFgr8@r+|AFfzx1dWY#T5_7n(I0sCss(wq|N
z0Mrto7J+&Ibp(h4h$0XpKodbG*C=F4`O5m9F>OVmTUF{5D!oF5?xQrN8dGTw;A*vH
ze+N;o88iph4G?;-X-(_80~Vbg*Xqq$y#>XLdTc{$uw%Fx!!0OoGZ?J~;|6ZrL`@FN
zv<cx2%<O{jrpatGneAqa-C*^YtZs|d0e9Y8Hyl=*bHnDcICmlBLfGhVx}7eM%eA+)
zwd3-@ZO`7$F5HLz`zH%Td3?P50R(a2pue90$Q*#guw1c5N(>FAvI@DatcYaty!_T!
zMPOLUGh7^Llaiv&a(83dl?&~e6`_-)%E;-Uq*8xg?jj+u=>q3A5<|))hGdjqdn*{v
z&Odo2*2gb(p`-Hnsfg|1_#oQRD)yn85Z)L&FFctx#hfYPXadObtiyRhvXA`KXyieG
zxA1#-7p0%Vh~{WMkP}MhkNwID;GcP#L8{i2XVqM!^ievKeDevMBON~?+sWLB%P&+R
d-dE3i)dl#)q|&8@V;lnTKk+zs*ezv&^gs3@&8PqX

literal 431
zcmV;g0Z{%&Nk%w1VGsZi0M!5hEC>h=YW3y{3dMi`)6UMC6%OjXce=W||H1$V2XmH&
zj`P6)XU6|LJUs8G6ATPXkaU5eMh9nQegE%L*7^S(jQ_Xb|E5F&c_j}2=9bKuNdNx;
zT64eu|I9uyZ`nvrrlzJ@5)w<7|CHJP%9w9mMMc>;MZwnU8Y-vQ0S7_1|2iot|Nmy@
z=H{GcDgW4VGcz;4fh#tv|Fi%A|K9+anVHh1imqoBS65g6|Nq7J|Ns4=L}=B1q~f)`
z(*OVeA^8La6aYT}EC2ui01yBW000KeKuF;dDdK(vh=TBI{z?c0;5G@BNCbmR;w(f%
z1J=!!%XM}!Mbk^$Y*-rdIr9pw5$(5zG=IG?Oc)4mZ!rcLbT1A7Ek8IHG?4=#8h(lq
zM?Wngcnbh1H8BGNE*vOKjsqJD9y$~!GX*0Q79LFp5i|=BI%NVMWfVL$KOh&Y5*9iq
z0wy{mBO)cmxeF4|J_0Et3=AR-O&Gco-90G<-3$TX2geH!0WvBg@-hJrAet)<7!3^%
Z2?8c~u!2~V7BIkRI>7J%svkiB06UT;sH*?~

diff --git a/theme/chameleon/pix/i/move_2d.gif b/theme/chameleon/pix/i/move_2d.gif
new file mode 100644
index 0000000000000000000000000000000000000000..9fe5765bc85c6070ddb496f753b91ef6cd5b760c
GIT binary patch
literal 140
zcmZ?wbhEHb<YnMxc+ANVGb1QzPDJhclK$Q8i%!hmc4gzi+k4JDJaPTSmH*g);!hSv
z1_pix9R?r(nZdwf`N1=jX;#D{hMajP3}vpH3#J9ytq8MWEtqqeQRI%pn?rs)bI<x*
as*<tk2sO;qn&q@OG)>qf&}Ie)gEautJ3*cR

literal 0
HcmV?d00001

diff --git a/theme/chameleon/pix/i/roles.gif b/theme/chameleon/pix/i/roles.gif
new file mode 100644
index 0000000000000000000000000000000000000000..b3bb135385439ac343ea7ee366e74d7efc1d1171
GIT binary patch
literal 431
zcmV;g0Z{%&Nk%w1VGsZi0M!5hEC>h=YW3y{3dMi`)6UMC6%OjXce=W||H1$V2XmH&
zj`P6)XU6|LJUs8G6ATPXkaU5eMh9nQegE%L*7^S(jQ_Xb|E5F&c_j}2=9bKuNdNx;
zT64eu|I9uyZ`nvrrlzJ@5)w<7|CHJP%9w9mMMc>;MZwnU8Y-vQ0S7_1|2iot|Nmy@
z=H{GcDgW4VGcz;4fh#tv|Fi%A|K9+anVHh1imqoBS65g6|Nq7J|Ns4=L}=B1q~f)`
z(*OVeA^8La6aYT}EC2ui01yBW000KeKuF;dDdK(vh=TBI{z?c0;5G@BNCbmR;w(f%
z1J=!!%XM}!Mbk^$Y*-rdIr9pw5$(5zG=IG?Oc)4mZ!rcLbT1A7Ek8IHG?4=#8h(lq
zM?Wngcnbh1H8BGNE*vOKjsqJD9y$~!GX*0Q79LFp5i|=BI%NVMWfVL$KOh&Y5*9iq
z0wy{mBO)cmxeF4|J_0Et3=AR-O&Gco-90G<-3$TX2geH!0WvBg@-hJrAet)<7!3^%
Z2?8c~u!2~V7BIkRI>7J%svkiB06UT;sH*?~

literal 0
HcmV?d00001

diff --git a/theme/chameleon/user_styles.css b/theme/chameleon/user_styles.css
index a37cc39a4f..25dab62dc5 100644
--- a/theme/chameleon/user_styles.css
+++ b/theme/chameleon/user_styles.css
@@ -116,7 +116,6 @@ div.navbar {
   padding: 3px 0;
   background-color: #EEFFDD;
   margin-top: 5px;
-  clear: both;
   border-style: none;
 }
 div#footer {
@@ -278,6 +277,11 @@ td.courseboxcontent {
   background-color: #DCE7EC;
   border-color: #DCE7EC;
 }
+table.cal_popup_bg {
+  background-color: #F8F8F8;
+  color: #333333;
+  border-color: #EEFFDD;
+}
 div.sideblock div.calendar-controls span.current {
   text-align: center;
 }
@@ -335,11 +339,11 @@ div.sideblock div.header div.commands {
   height: 16px;
   background-color: #ffffff;
 }
-fieldset.adminsettings span.form-shortname {
+#adminsettings fieldset span.form-shortname {
   color: #cccccc;
   font-size: 90%;
 }
-fieldset.adminsettings {
+#adminsettings fieldset {
   background-color: #EEEEEE;
   border-width: 1px;
   border-style: solid;
@@ -348,3 +352,7 @@ fieldset.adminsettings {
 form.mform div.textarea textarea {
   width: 35em;
 }
+div.sideblock div.commands a.roles img {
+  width: 11px;
+  height: 11px;
+}
-- 
2.39.5