L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'MDL-32806_master' of git://github.com/lazydaisy/moodle

Browse Source
This commit is contained in:
Dan Poltawski
2012-11-20 11:53:36 +08:00
parent 881f49841b 715be3cccf
commit e4b6c671ac
5 changed files with 83 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
theme/formal_white/layout/frontpage.php
+9 -7
View File
@@ -70,13 +70,6 @@ echo $OUTPUT->doctype() ?>
<!-- begin of page-header -->
<?php if ($hasheading) { ?>
<div id="page-header">
<?php if ($displaylogo) { ?>
<div id="headerlogo">
<img src="<?php echo $logourl ?>" alt="Custom logo here" />
</div>
<?php } else { ?>
<h1 class="headerheading"><?php echo $PAGE->heading ?></h1>
<?php } ?>
<div class="headermenu">
<?php
@@ -87,6 +80,15 @@ echo $OUTPUT->doctype() ?>
echo $PAGE->headingmenu;
?>
</div>
<?php if ($displaylogo) { ?>
<div id="headerlogo">
<img src="<?php echo $logourl ?>" alt="Custom logo here" />
</div>
<?php } else { ?>
<h1 class="headerheading"><?php echo $PAGE->heading ?></h1>
<?php } ?>
</div>
<?php } ?>
<!-- end of page-header -->
theme/formal_white/layout/general.php
+9 -7
View File
@@ -68,13 +68,6 @@ echo $OUTPUT->doctype() ?>
<!-- begin of page-header -->
<?php if ($hasheading) { ?>
<div id="page-header">
<?php if ($displaylogo) { ?>
<div id="headerlogo">
<img src="<?php echo $logourl ?>" alt="Custom logo here" />
</div>
<?php } else { ?>
<h1 class="headerheading"><?php echo $PAGE->heading ?></h1>
<?php } ?>
<div class="headermenu">
<?php
@@ -85,6 +78,15 @@ echo $OUTPUT->doctype() ?>
echo $PAGE->headingmenu;
?>
</div>
<?php if ($displaylogo) { ?>
<div id="headerlogo">
<img src="<?php echo $logourl ?>" alt="Custom logo here" />
</div>
<?php } else { ?>
<h1 class="headerheading"><?php echo $PAGE->heading ?></h1>
<?php } ?>
</div>
<?php } ?>
<!-- end of page-header -->
theme/formal_white/layout/report.php
+9 -7
View File
@@ -63,13 +63,6 @@ echo $OUTPUT->doctype() ?>
<!-- begin of page-header -->
<?php if ($hasheading) { ?>
<div id="page-header">
<?php if ($displaylogo) { ?>
<div id="headerlogo">
<img src="<?php echo $logourl ?>" alt="Custom logo here" />
</div>
<?php } else { ?>
<h1 class="headerheading"><?php echo $PAGE->heading ?></h1>
<?php } ?>
<div class="headermenu">
<?php
@@ -80,6 +73,15 @@ echo $OUTPUT->doctype() ?>
echo $PAGE->headingmenu;
?>
</div>
<?php if ($displaylogo) { ?>
<div id="headerlogo">
<img src="<?php echo $logourl ?>" alt="Custom logo here" />
</div>
<?php } else { ?>
<h1 class="headerheading"><?php echo $PAGE->heading ?></h1>
<?php } ?>
</div>
<?php } ?>
<!-- end of page-header -->
theme/formal_white/style/formal_white.css
+33 -6
View File
@@ -25,16 +25,43 @@ h1.headerheading {margin:14px 11px 8px 11px;float:left;font-size:200%;}
h2.main, h3.main, h4.main {margin:1em;padding:0;text-align:center;}
/* page-header */
#page-header{line-height:0;overflow:hidden;}
#page-header{
margin: 0;
overflow: hidden;
padding: 0;
width: 100%;
}
/* headerlogo */
#headerlogo {position:relative;margin:0;}
/* if I use: position:absolute; I even need height:105px; in #page-header */
/* if I use: position:relative; z-index doesn't work*/
#headerlogo {
float: left;
height: auto;
margin: 0;
padding: 0;
width: auto;
}
.dir-rtl #headerlogo {
float: right;
}
/* headermenu */
.headermenu {position:absolute;text-align:right;line-height:1.7em;font-size:90%;margin:0.5em;right:[[calculated:headermenuright]];top:15px;}
.langmenu {margin-right:0.4em}
.headermenu {
float: right;
font-size: 90%;
line-height: 1.7em;
margin: 0.5em;
position: relative;
right: 0;
text-align: right;
top: 0;
}
.dir-rtl .headermenu {
float: left;
}
.langmenu {
margin-right: 0.4em
}
#dock {background-color:[[setting:blockcontentbgc]];border-right:1px dashed #000;}
#dock .dockeditem_container {margin-top: 10px;}
theme/formal_white/style/frame.css
+23 -20
View File
@@ -68,21 +68,22 @@
background-position:100% 0;
text-align:left;
height:17px;
margin:0 0 0 17px;
margin-left:17px;
}
#frametopright div,
#footerframetopright div { /* Frame background top left */
background-image:url([[pix:theme|roundcorner/header_l]]);
font-size:1px;
line-height:1%;
height:17px;
background-repeat:no-repeat;
background-position:0 0;
background-color:transparent;
background-image:url([[pix:theme|roundcorner/header_l]]);
background-position:0 0;
background-repeat:no-repeat;
float:left;
font-size:1px;
height:17px;
line-height:1%;
margin-left:-17px;
position:relative;
width:17px;
margin-left:-17px;
}
#frameleft,
@@ -106,33 +107,35 @@
#framebottomright,
#footerframebottomright { /* Frame background bottom right */
background-image:url([[pix:theme|roundcorner/footer_r]]);
background-repeat:no-repeat;
background-position:100% 0;
background-repeat:no-repeat;
height: 17px;
margin-left:17px;
text-align:left;
margin:0 0 0 17px;
}
#framebottomright div,
#footerframebottomright div { /* Frame background bottom left */
background-image:url([[pix:theme|roundcorner/footer_l]]);
font-size:1px;
line-height:1%;
height:17px;
background-repeat:no-repeat;
background-position:0 0;
background-color:transparent;
background-image:url([[pix:theme|roundcorner/footer_l]]);
background-position:0 0;
background-repeat:no-repeat;
float: left;
font-size:1px;
height:17px;
line-height:1%;
margin-left:-17px;
position:relative;
width:17px;
margin-left:-17px;
}
#framebottom,
#footerframebottom { /* Bottom Middle */
background-image:url([[pix:theme|roundcorner/footer]]);
background-repeat:repeat-x;
background-position:0 100%;
background-attachment:scroll;
background-color:transparent;
background-image:url([[pix:theme|roundcorner/footer]]);
background-position:0 100%;
background-repeat:repeat-x;
}
/*******************************************************************/