implementing new wrapper names - MDL-22180

This commit is contained in:
Patrick Malley 2010-04-23 17:43:08 +00:00
parent 0a03123fcf
commit 8e0d1f8586
4 changed files with 65 additions and 69 deletions

View File

@ -56,35 +56,35 @@ echo $OUTPUT->doctype() ?>
<?php } ?>
<div id="page-content">
<div id="regions">
<div id="regions-mask">
<div id="region-main">
<div id="region-main-mask">
<div class="region-content">
<?php echo core_renderer::MAIN_CONTENT_TOKEN ?>
</div>
<div id="region-main-box">
<div id="region-post-box">
<div id="region-main-wrap">
<div id="region-main">
<div class="region-content">
<?php echo core_renderer::MAIN_CONTENT_TOKEN ?>
</div>
</div>
</div>
<?php if ($hassidepre) { ?>
<div id="region-pre">
<div class="region-content">
<?php echo $OUTPUT->blocks_for_region('side-pre') ?>
</div>
</div>
<?php } ?>
<?php if ($hassidepost) { ?>
<div id="region-post">
<div class="region-content">
<?php echo $OUTPUT->blocks_for_region('side-post') ?>
</div>
</div>
<?php } ?>
</div>
</div>
<?php if ($hassidepre) { ?>
<div id="region-pre">
<div class="region-content">
<?php echo $OUTPUT->blocks_for_region('side-pre') ?>
</div>
</div>
<?php } ?>
<?php if ($hassidepost) { ?>
<div id="region-post">
<div class="region-content">
<?php echo $OUTPUT->blocks_for_region('side-post') ?>
</div>
</div>
<?php } ?>
</div>
</div>
</div>
<?php if ($hasfooter) { ?>

View File

@ -56,35 +56,35 @@ echo $OUTPUT->doctype() ?>
<?php } ?>
<div id="page-content">
<div id="regions">
<div id="regions-mask">
<div id="region-main">
<div id="region-main-mask">
<div class="region-content">
<?php echo core_renderer::MAIN_CONTENT_TOKEN ?>
</div>
<div id="region-main-box">
<div id="region-post-box">
<div id="region-main-wrap">
<div id="region-main">
<div class="region-content">
<?php echo core_renderer::MAIN_CONTENT_TOKEN ?>
</div>
</div>
</div>
<?php if ($hassidepre) { ?>
<div id="region-pre">
<div class="region-content">
<?php echo $OUTPUT->blocks_for_region('side-pre') ?>
</div>
</div>
<?php } ?>
<?php if ($hassidepost) { ?>
<div id="region-post">
<div class="region-content">
<?php echo $OUTPUT->blocks_for_region('side-post') ?>
</div>
</div>
<?php } ?>
</div>
</div>
<?php if ($hassidepre) { ?>
<div id="region-pre">
<div class="region-content">
<?php echo $OUTPUT->blocks_for_region('side-pre') ?>
</div>
</div>
<?php } ?>
<?php if ($hassidepost) { ?>
<div id="region-post">
<div class="region-content">
<?php echo $OUTPUT->blocks_for_region('side-post') ?>
</div>
</div>
<?php } ?>
</div>
</div>
</div>
<?php if ($hasfooter) { ?>

View File

@ -4,54 +4,54 @@
|--------------210px--------------------------------------------210px----------------|
|-----------------------------------------------------------------------------------*/
#page-content #regions {
#page-content #region-main-box {
left: 210px; /* Width of left sideblock */
}
#page-content #regions #regions-mask {
#page-content #region-main-box #region-post-box {
margin-left: -420px; /* Twice width of left sideblock */
padding-top: 5px;
}
#page-content #regions #regions-mask #region-main #region-main-mask {
#page-content #region-main-box #region-post-box #region-main-wrap #region-main {
margin-left: 420px; /* Twice width of left sideblock */
padding: 0 15px; /* Padding around middle column */
}
#page-content #regions #regions-mask #region-pre {
#page-content #region-main-box #region-post-box #region-pre {
left: 210px; /* Width of left sideblock */
width: 210px; /* Width of left sideblock */
}
#page-content #regions #regions-mask #region-post {
#page-content #region-main-box #region-post-box #region-post {
width: 210px; /* Width of right sideblock */
}
#page-content #regions .region-content {
#page-content #region-main-box .region-content {
padding: 0;
}
/** Only side pre **/
.side-pre-only #page-content #regions #regions-mask {
.side-pre-only #page-content #region-main-box #region-post-box {
margin-left: -210px;
}
.side-pre-only #page-content #regions #regions-mask #region-main #region-main-mask {
.side-pre-only #page-content #region-main-box #region-post-box #region-main-wrap #region-main {
margin-left: 210px;
}
/** Only side post **/
.side-post-only #page-content #regions #regions-mask {
.side-post-only #page-content #region-main-box #region-post-box {
margin-left: -210px;
}
.side-post-only #page-content #regions #regions-mask #region-main #region-main-mask {
.side-post-only #page-content #region-main-box #region-post-box #region-main-wrap #region-main {
margin-left: 210px;
}
.has_dock.side-post-only .page-middle #regions #regions-mask #region-main #region-main-mask {
.has_dock.side-post-only .page-middle #region-main-box #region-post-box #region-main-wrap #region-main {
margin-left: 210px;
}

View File

@ -76,10 +76,6 @@ h2.main {
color: #999;
}
.navicon {
display: none;
}
/* Content */
.sitetopic {