mirror of
https://github.com/moodle/moodle.git
synced 2025-08-05 17:06:53 +02:00
MDL-21140 CSS style reset now used from the YUI3 lib, surprisingly it is a bit different from YUI2
This commit is contained in:
parent
bee934afa3
commit
39302c7922
2 changed files with 16 additions and 2 deletions
|
@ -599,8 +599,13 @@ class theme_config {
|
||||||
$css = array('yui'=>array(), 'plugins'=>array(), 'parents'=>array(), 'theme'=>array());
|
$css = array('yui'=>array(), 'plugins'=>array(), 'parents'=>array(), 'theme'=>array());
|
||||||
|
|
||||||
//YUI sheets
|
//YUI sheets
|
||||||
$yui_sheets = "/*** Standard YUI sheets ***/\n\n";
|
$yui_sheets = "/*** YUI reset sheets and grids ***/\n\n";
|
||||||
$yui_sheets .= file_get_contents("$CFG->libdir/yui/$CFG->yui2version/reset-fonts-grids/reset-fonts-grids.css");
|
$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");
|
$items = new DirectoryIterator("$CFG->libdir/yui/$CFG->yui2version/assets/skins/sam");
|
||||||
foreach ($items as $item) {
|
foreach ($items as $item) {
|
||||||
if ($item->isDot() or !$item->isFile()) {
|
if ($item->isDot() or !$item->isFile()) {
|
||||||
|
|
|
@ -46,6 +46,11 @@ body {
|
||||||
padding: 4px;
|
padding: 4px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* ugly ugly hack, undo the CSS reset from YUI for now */
|
||||||
|
ul li {
|
||||||
|
list-style-type: none;
|
||||||
|
}
|
||||||
|
|
||||||
#layout-table {
|
#layout-table {
|
||||||
width:100%;
|
width:100%;
|
||||||
border-collapse:separate;
|
border-collapse:separate;
|
||||||
|
@ -59,6 +64,10 @@ body {
|
||||||
vertical-align:top;
|
vertical-align:top;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#layout-table td {
|
||||||
|
border: 0px;
|
||||||
|
}
|
||||||
|
|
||||||
#layout-table #content {
|
#layout-table #content {
|
||||||
padding-left:12px;
|
padding-left:12px;
|
||||||
padding-right:12px;
|
padding-right:12px;
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue