Skip to content
Browse files

MDL-22180 - Implementing new selector names for page layout

  • Loading branch information...
1 parent 8e0d1f8 commit aa1b682edf397594b070180a2c6c5a4f348d6d44 Patrick Malley committed Apr 23, 2010
Showing with 40 additions and 31 deletions.
  1. +8 −4 theme/base/layout/frontpage.php
  2. +9 −4 theme/base/layout/general.php
  3. +23 −23 theme/base/style/pagelayout.css
View
12 theme/base/layout/frontpage.php
@@ -36,29 +36,33 @@
<!-- END OF HEADER -->
<div id="page-content">
- <div id="regions">
- <div id="regions-mask">
- <div id="region-main">
- <div id="region-main-mask">
+ <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>
</div>
View
13 theme/base/layout/general.php
@@ -46,30 +46,35 @@
</div>
<?php } ?>
<!-- END OF HEADER -->
+
<div id="page-content">
- <div id="regions">
- <div id="regions-mask">
- <div id="region-main">
- <div id="region-main-mask">
+ <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>
</div>
View
46 theme/base/style/pagelayout.css
@@ -7,9 +7,9 @@
* #page-header
* #page-content
* | #regions
- * | #regions-mask
+ * | #region-post-box
* | #region-main
- * | | #region-main-mask
+ * | | #region-main
* | | .region-content
* | #region-pre
* | | .region-content
@@ -31,31 +31,31 @@ body {margin:auto 0px;width:auto;}
#page {width:100%;overflow:hidden;}
#page-header {float:left;width:100%;}
#page-content {clear:both;float:left;overflow:hidden;position:relative;width:100%;}
-#page-content #regions {float:left;left:200px;position:relative;width:200%;}
-#page-content #regions #regions-mask {float:left;left:50%;margin-left:-400px;position:relative;width:100%;}
-#page-content #regions #regions-mask #region-main {float:right;position:relative;right:100%;width:50%;}
-#page-content #regions #regions-mask #region-main #region-main-mask {margin-right:0px;margin-left:400px;overflow:hidden;}
-#page-content #regions #regions-mask #region-pre {float:left;left:200px;margin-left:-50%;overflow:hidden;position:relative;width:200px;}
-#page-content #regions #regions-mask #region-post {float:left;left:0px;overflow:hidden;position:relative;width:200px;}
-#page-content #regions .region-content {overflow:hidden;padding:10px;}
+#page-content #region-main-box {float:left;left:200px;position:relative;width:200%;}
+#page-content #region-main-box #region-post-box {float:left;left:50%;margin-left:-400px;position:relative;width:100%;}
+#page-content #region-main-box #region-post-box #region-main-wrap {float:right;position:relative;right:100%;width:50%;}
+#page-content #region-main-box #region-post-box #region-main-wrap #region-main {margin-right:0px;margin-left:400px;overflow:hidden;}
+#page-content #region-main-box #region-post-box #region-pre {float:left;left:200px;margin-left:-50%;overflow:hidden;position:relative;width:200px;}
+#page-content #region-main-box #region-post-box #region-post {float:left;left:0px;overflow:hidden;position:relative;width:200px;}
+#page-content #region-main-box .region-content {overflow:hidden;padding:10px;}
#page-footer {clear:both;float:left;width:100%;}
/** Only side pre **/
-.side-pre-only #page-content #regions #regions-mask {margin-left:-200px;}
-.side-pre-only #page-content #regions #regions-mask #region-main #region-main-mask {margin-left:200px;}
-.side-pre-only #page-content #regions #regions-mask #region-pre {left:0px;}
-.side-pre-only #page-content #regions #regions-mask #region-post {width:0px;}
+.side-pre-only #page-content #region-main-box #region-post-box {margin-left:-200px;}
+.side-pre-only #page-content #region-main-box #region-post-box #region-main-wrap #region-main {margin-left:200px;}
+.side-pre-only #page-content #region-main-box #region-post-box #region-pre {left:0px;}
+.side-pre-only #page-content #region-main-box #region-post-box #region-post {width:0px;}
/** Only side post **/
-.side-post-only #page-content #regions {left:0px;}
-.side-post-only #page-content #regions #regions-mask {margin-left:-200px;}
-.side-post-only #page-content #regions #regions-mask #region-main #region-main-mask {margin-left:200px;}
-.side-post-only #page-content #regions #regions-mask #region-pre {width:0px;}
-.has_dock.side-post-only .page-middle #regions #regions-mask #region-main #region-main-mask {margin-left:200px;}
+.side-post-only #page-content #region-main-box {left:0px;}
+.side-post-only #page-content #region-main-box #region-post-box {margin-left:-200px;}
+.side-post-only #page-content #region-main-box #region-post-box #region-main-wrap #region-main {margin-left:200px;}
+.side-post-only #page-content #region-main-box #region-post-box #region-pre {width:0px;}
+.has_dock.side-post-only .page-middle #region-main-box #region-post-box #region-main-wrap #region-main {margin-left:200px;}
/** No blocks whatsoever **/
-.content-only #page-content #regions {left:0px;}
-.content-only #page-content #regions #regions-mask {margin-left:0px;}
-.content-only #page-content #regions #regions-mask #region-main #region-main-mask {margin-left:0px;}
-.content-only #page-content #regions #regions-mask #region-pre {left:0;width:0px;}
-.content-only #page-content #regions #regions-mask #region-post {width:0;}
+.content-only #page-content #region-main-box {left:0px;}
+.content-only #page-content #region-main-box #region-post-box {margin-left:0px;}
+.content-only #page-content #region-main-box #region-post-box #region-main-wrap #region-main {margin-left:0px;}
+.content-only #page-content #region-main-box #region-post-box #region-pre {left:0;width:0px;}
+.content-only #page-content #region-main-box #region-post-box #region-post {width:0;}

0 comments on commit aa1b682

Please sign in to comment.
Something went wrong with that request. Please try again.