Merged some changes from stable 1.7

diff --git a/theme/chameleon/pix/i/key.gif b/theme/chameleon/pix/i/key.gif
index b3bb135385439ac343ea7ee366e74d7efc1d1171..554dfdbf2f3d6cba2ec9a1017c0c79cbce57448c 100644 (file)
Binary files a/theme/chameleon/pix/i/key.gif and b/theme/chameleon/pix/i/key.gif differ

diff --git a/theme/chameleon/pix/i/move_2d.gif b/theme/chameleon/pix/i/move_2d.gif
new file mode 100644 (file)
index 0000000..9fe5765
Binary files /dev/null and b/theme/chameleon/pix/i/move_2d.gif differ

diff --git a/theme/chameleon/pix/i/roles.gif b/theme/chameleon/pix/i/roles.gif
new file mode 100644 (file)
index 0000000..b3bb135
Binary files /dev/null and b/theme/chameleon/pix/i/roles.gif differ

diff --git a/theme/chameleon/user_styles.css b/theme/chameleon/user_styles.css
index a37cc39a4f6f04adcfdad40c8c57dc176068dbd2..25dab62dc5825e505971b9bf7ae4bdeefc716abd 100644 (file)
--- 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;
+}