Browse files

MDL-32806 theme_formal_white: Fixed misalignment of frame, logo and h…

…eadermenu whin in RTL mode
  • Loading branch information...
1 parent 6109f21 commit 73502c575ab4a6261df5d3aec5d7d151924d6d4d @lazydaisy lazydaisy committed Nov 5, 2012
View
16 theme/formal_white/layout/frontpage.php
@@ -70,13 +70,6 @@
<!-- 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 $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 -->
View
16 theme/formal_white/layout/general.php
@@ -68,13 +68,6 @@
<!-- 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 $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 -->
View
16 theme/formal_white/layout/report.php
@@ -63,13 +63,6 @@
<!-- 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 $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 -->
View
40 theme/formal_white/style/formal_white.css
@@ -25,16 +25,44 @@ 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;
+ right: 100%;
+}
+.langmenu {
+ margin-right: 0.4em
+}
#dock {background-color:[[setting:blockcontentbgc]];border-right:1px dashed #000;}
#dock .dockeditem_container {margin-top: 10px;}
View
5 theme/formal_white/style/frame.css
@@ -83,6 +83,7 @@
position:relative;
width:17px;
margin-left:-17px;
+ float:left;
}
#frameleft,
@@ -109,7 +110,8 @@
background-repeat:no-repeat;
background-position:100% 0;
text-align:left;
- margin:0 0 0 17px;
+ margin-left:0 0 0 17px;
+ height: 17px;
}
#framebottomright div,
@@ -124,6 +126,7 @@
position:relative;
width:17px;
margin-left:-17px;
+ floaf: left;
}
#framebottom,

0 comments on commit 73502c5

Please sign in to comment.