MDL-21140 CSS style reset now used from the YUI3 lib, surprisingly it is a bit differ...

diff --git a/lib/outputlib.php b/lib/outputlib.php
index af9648d026aa27ced66519dceb7b6a56d2ed77d7..0641ccd72a45ed993eccadd6dc9c7fcd3df9a765 100644 (file)
--- a/lib/outputlib.php
+++ b/lib/outputlib.php
@@ -599,8 +599,13 @@ class theme_config {
         $css = array('yui'=>array(), 'plugins'=>array(), 'parents'=>array(), 'theme'=>array());
 
         //YUI sheets
-        $yui_sheets = "/*** Standard YUI sheets ***/\n\n";
-        $yui_sheets .= file_get_contents("$CFG->libdir/yui/$CFG->yui2version/reset-fonts-grids/reset-fonts-grids.css");
+        $yui_sheets = "/*** YUI reset sheets and grids ***/\n\n";
+        $yui_sheets .= file_get_contents("$CFG->libdir/yui/$CFG->yui3version/cssreset/reset-min.css");
+        $yui_sheets .= file_get_contents("$CFG->libdir/yui/$CFG->yui3version/cssbase/base-min.css");
+        $yui_sheets .= file_get_contents("$CFG->libdir/yui/$CFG->yui3version/cssfonts/fonts-min.css");
+        $yui_sheets .= file_get_contents("$CFG->libdir/yui/$CFG->yui3version/cssgrids/grids-min.css");
+
+        $yui_sheets .= "/*** Standard YUI sheets ***/\n\n";
         $items = new DirectoryIterator("$CFG->libdir/yui/$CFG->yui2version/assets/skins/sam");
         foreach ($items as $item) {
             if ($item->isDot() or !$item->isFile()) {

diff --git a/theme/standard/style/styles_layout.css b/theme/standard/style/styles_layout.css
index 155f325091654a8635f0e2d00abd3bd7d416cce5..4b1079c5f4e102d5d9c34168bba64645a99f97d3 100644 (file)
--- a/theme/standard/style/styles_layout.css
+++ b/theme/standard/style/styles_layout.css
@@ -46,6 +46,11 @@ body {
  padding: 4px;
 }
 
+/* ugly ugly hack, undo the CSS reset from YUI for now */
+ul li {
+ list-style-type: none;
+}
+
 #layout-table {
   width:100%;
   border-collapse:separate;
@@ -59,6 +64,10 @@ body {
   vertical-align:top;
 }
 
+#layout-table td {
+ border: 0px;
+}
+
 #layout-table #content {
   padding-left:12px;
   padding-right:12px;