Browse files

Merge branch 'MDL-26893-M21' of git://github.com/lazydaisy/moodle int…

…o MOODLE_21_STABLE
  • Loading branch information...
2 parents 171bbda + 4a17d78 commit 297f40838a7ef2de1064881fa6776e4ddf8725d0 Sam Hemelryk committed Oct 17, 2011
Showing with 53 additions and 14 deletions.
  1. +53 −14 theme/sky_high/style/pagelayout.css
View
67 theme/sky_high/style/pagelayout.css
@@ -1,12 +1,7 @@
/** Path: theme pagelayout **/
/*********************************************************************************************
-
- left column: 230px
- right column: 330px
- padding left/right column: 10px
- padding center column: 30px
-
+ column witdh: [[setting:regionwidth]]
**********************************************************************************************/
body {
@@ -91,8 +86,6 @@ body {
width: 100%;
}
-
-
/* @end */
/* @group Pre Side Only */
@@ -118,8 +111,6 @@ body {
width: 0%;
}
-
-
/* @end */
/* @group Post Side Only */
@@ -136,16 +127,63 @@ body {
margin-left: [[setting:regionwidth]];
}
+.side-post-only #page-content #region-main-box #region-post-box #region-pre {
+ left: 0;
+ width: 0;
+}
+
.side-post-only #page-content #region-main-box #region-post-box #region-post {
- left: [[setting:regionwidthdouble]];
+ left: [[setting:regionwidth]];
width: [[setting:regionwidth]];
}
.has_dock.side-post-only .page-middle #region-main-box #region-post-box #region-main-wrap #region-main {
margin-left: 200px;
}
+.blocks-moving.side-post-only #page-content #region-main-box {
+ float: left;
+ margin-left: -[[setting:regionwidth]];
+ position: relative;
+ width: 200%;
+ right: 100%;
+}
+.blocks-moving.side-post-only #page-content #region-main-box #region-post-box {
+ float: left;
+ margin-left: -[[setting:regionwidth]];
+ width: 100%;
+ border-right: 2px solid #98bcd6;
+ background: url([[pix:theme|top_bg]]) repeat-x top #fff;
+}
+
+.blocks-moving.side-post-only #page-content #region-main-box #region-post-box #region-main-wrap {
+ float: left;
+ width: 50%;
+}
+
+.blocks-moving.side-post-only #page-content #region-main-box #region-post-box #region-main-wrap #region-main {
+ overflow: hidden;
+ position: relative;
+ margin-left: [[setting:regionwidthdouble]];
+ left: 100%;
+}
+
+.blocks-moving.side-post-only #page-content #region-main-box #region-post-box #region-pre {
+ float: right;
+ position: relative;
+ left: [[setting:leftregionwidthmargin]];
+ width: [[setting:regionwidth]];
+ background: transparent;
+}
+
+.blocks-moving.side-post-only #page-content #region-main-box #region-post-box #region-post {
+ float: right;
+ position: relative;
+ left: [[setting:rightregionwidthmargin]];
+ width: [[setting:regionwidth]];
+ background: transparent;
+}
/* @end */
@@ -171,12 +209,13 @@ body {
width: 0px;
}
+/* @end */
+/* @pagelayout-report - overflow */
-/* @end */
.pagelayout-report #page-content #region-main {
- overflow:auto;
+ overflow: auto;
}
.pagelayout-report #page-content #region-main .region-content {
- overflow:visible;
+ overflow: visible;
}

0 comments on commit 297f408

Please sign in to comment.