Merge branch 'MDL-39835_M26' of github.com:lazydaisy/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 4 Jun 2013 06:44:35 +0000 (14:44 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 4 Jun 2013 06:44:35 +0000 (14:44 +0800)
theme/sky_high/pix/footer-rtl.jpg [deleted file]
theme/sky_high/pix/footer-rtl.png [new file with mode: 0644]
theme/sky_high/pix/footer.png
theme/sky_high/style/admin.css
theme/sky_high/style/pagelayout.css
theme/sky_high/style/report.css

diff --git a/theme/sky_high/pix/footer-rtl.jpg b/theme/sky_high/pix/footer-rtl.jpg
deleted file mode 100644 (file)
index f33775b..0000000
Binary files a/theme/sky_high/pix/footer-rtl.jpg and /dev/null differ
diff --git a/theme/sky_high/pix/footer-rtl.png b/theme/sky_high/pix/footer-rtl.png
new file mode 100644 (file)
index 0000000..7ba3703
Binary files /dev/null and b/theme/sky_high/pix/footer-rtl.png differ
index 34365a8..f2d649c 100644 (file)
Binary files a/theme/sky_high/pix/footer.png and b/theme/sky_high/pix/footer.png differ
index 949de96..253d320 100644 (file)
@@ -7,6 +7,7 @@ body.pagelayout-admin.has_dock {
     width: 100%;
     margin: 0 auto;
     position: relative;
+    max-width: 1664px;
 }
 .pagelayout-admin #page-footer {
     float: none;
index d243e8e..644fb49 100644 (file)
@@ -10,9 +10,9 @@ body {
 }
 
 #page {
-    width:100%;
-    max-width: 1600px;
-    margin:0 auto;
+    width: 100%;
+    max-width: 1760px;
+    margin: 0 auto;
 }
 
 #page-content {
index a9bdbb3..0859374 100644 (file)
@@ -1,5 +1,8 @@
 /** Report layout **/
 
+.pagelayout-report #page {
+    max-width: 1664px;
+}
 #report-wrapper {
     background: #fff;
     margin: 20px 2% 0;