Permalink
Browse files

MDL-26240 Fixes for Anomaly theme inconsistency

  • Loading branch information...
1 parent 1de9151 commit d11d1e5bc010215d3aec8d65528ce7001c1d0dea @lazydaisy lazydaisy committed Nov 27, 2011
View
@@ -7,7 +7,7 @@
$THEME->name = 'anomaly';
-$THEME->sheets = array('base', 'general', 'browser');
+$THEME->sheets = array('base', 'general', 'browser','dock');
/// This variable is an array containing the names of all the
/// stylesheet files you want included in this theme, and in what order
////////////////////////////////////////////////////////////////////////////////
@@ -21,6 +21,9 @@
if ($hascustommenu) {
$bodyclasses[] = 'has_custom_menu';
}
+if ($hasnavbar) {
+ $bodyclasses[] = 'hasnavbar';
+}
echo $OUTPUT->doctype() ?>
<html <?php echo $OUTPUT->htmlattributes() ?>>
@@ -106,6 +109,7 @@
<div class="rounded-corner bottom-right"></div>
</div>
<?php } ?>
+ <div class="clearfix"></div>
</div>
<?php echo $OUTPUT->standard_end_of_body_html() ?>
</body>
@@ -15,6 +15,9 @@
if ($hascustommenu) {
$bodyclasses[] = 'has_custom_menu';
}
+if ($hasnavbar) {
+ $bodyclasses[] = 'hasnavbar';
+}
echo $OUTPUT->doctype() ?>
<html <?php echo $OUTPUT->htmlattributes() ?>>
@@ -85,6 +88,7 @@
<div class="rounded-corner bottom-right"></div>
</div>
<?php } ?>
+ <div class="clearfix"></div>
</div>
<?php echo $OUTPUT->standard_end_of_body_html() ?>
</body>
@@ -2,11 +2,6 @@
* Core
*/
-body,
-body.has_dock {
- margin: 25px 3%;
-}
-
#page, div, p, li, input, option, textarea {
font-size: 10pt;
line-height: 1.5em;
@@ -16,6 +11,13 @@ body.has_dock {
font-family: Georgia,Times,"Times New Roman",serif;
}
+#page {
+ position: relative;
+ width: 94%;
+ margin: 25px 3%;
+ padding: 0;
+}
+
h1.main,
h2.main,
h3.main,
@@ -30,13 +30,16 @@
/** Fix IE8 + Opera positioning issue **/
.ie8 #page-header .rounded-corner.top-right,
+.ie9 #page-header .rounded-corner.top-right,
.opera #page-header .rounded-corner.top-right {
position: relative;
top: -11px;
}
-#page-footer {position: relative;
+#page-footer {
+ position: relative;
}
+
#page-footer .rounded-corner {
position: absolute;
background-image: url([[pix:theme|corners_header]]);
@@ -109,9 +112,10 @@
* corners.... if only IE could handle it.
*
* Browsers:
- * Firefox: body.gecko
- * Chrome: body.safari
- * Safari: body.safari
+ * Firefox: body.gecko -moz
+ * Chrome: body.safari -webkit
+ * Safari: body.safari -webkit
+ * Opera: body.opera no prefix
*/
.opera .rounded-corner.top-left,
@@ -144,7 +148,8 @@
.safari #page-header,
.gecko .block .corner-box .header,
.gecko #page-header {
- -moz-border-radius: 10px 10px 0px 0px;
+ -moz-border-top-left-radius: 10px;
+ -moz-border-top-right-radius: 10px;
-webkit-border-top-left-radius: 10px;
-webkit-border-top-right-radius: 10px;
border-top-left-radius: 10px;
@@ -154,21 +159,44 @@
.opera #page-footer,
.safari #page-footer,
.gecko #page-footer {
- -moz-border-radius: 0px 0px 10px 10px;
+ -moz-border-bottom-left-radius: 10px;
+ -moz-border-bottom-right-radius: 10px;
-webkit-border-bottom-left-radius: 10px;
-webkit-border-bottom-right-radius: 10px;
border-bottom-left-radius: 10px;
border-bottom-right-radius: 10px;
}
-.gecko .forumpost,
-.gecko .forumpost .side {
- -moz-border-radius-bottomleft: 20px
+
+.opera.forumpost div.row .left,
+.safari .forumpost div.row .left,
+.gecko .forumpost div.row .left {
+ -moz-border-bottom-left-radius: 20px;
+ -webkit-border-bottom-left-radius: 20px;
+ border-bottom-left-radius: 20px;
}
+.opera .forumpost,
+.opera .forumpost div.row.side,
+.safari .forumpost,
+.safari .forumpost div.row.side,
.gecko .forumpost,
-.gecko .forumpost .content {
- -moz-border-radius-bottomright: 20px;
+.gecko .forumpost div.row.side {
+ -moz-border-bottom-right-radius: 20px;
+ -moz-border-bottom-left-radius: 20px;
+ -webkit-border-bottom-right-radius: 20px;
+ -webkit-border-bottom-left-radius: 20px;
+ border-bottom-right-radius: 20px;
+ border-bottom-left-radius: 20px;
+}
+
+.opera .forumpost .options,
+.safari .forumpost .options,
+.gecko .forumpost .options {
+ -moz-border-bottom-right-radius: 20px;
+ -webkit-border-bottom-right-radius: 20px;
+ border-bottom-right-radius: 20px;
+
}
/** Fix for IE 6 float background bug */
@@ -0,0 +1,139 @@
+/* Docking Module
+-----------------*/
+
+body.has_dock #page {
+ width: 97%;
+ right: 3%;
+}
+
+#dock {
+ width:3%;
+ position:fixed;
+ top:0px;
+ right:0;
+ height:100%;
+ z-index:11000;
+ background-color: #C8C9C7;
+ border-right: 0 none;
+}
+
+#dock.nothingdocked {
+ visibility: hidden;
+ display:none;
+}
+#dock .controls {
+ bottom: auto;
+ background-color: #C8C9C7;
+ -webkit-border-bottom-right-radius: 10px;
+ -moz-border-bottom-right-radius: 10px;
+ border-bottom-right-radius: 10px;
+}
+#dock .dockeditem.firstdockitem {
+ margin-top: 10em;
+ -webkit-border-top-left-radius: 10px;
+ -moz-border-top-right-radius: 10px;
+ border-top-left-radius: 10px;
+}
+#dock .dockeditem {
+ background-color: #C8C9C7;
+ padding: 2px;
+ padding-right: 0px;
+}
+#dock .dockedtitle {
+ padding-bottom: 5px;
+ cursor:pointer;
+ background-color: #222;
+ -webkit-border-top-left-radius: 10px;
+ -moz-border-radius-topleft: 10px;
+ border-top-left-radius: 10px;
+ -webkit-border-bottom-left-radius: 10px;
+ -moz-border-radius-bottomleft: 10px;
+ border-bottom-left-radius: 10px;
+}
+#dock .dockedtitle h2 {
+ margin: 0;
+ padding: 10px 3px;
+ color: #fff;
+ font-family: sans-serif;
+}
+.dockedtitle.activeitem h2 {
+ color: #fff !important;
+}
+#dock .dockedtitle.activeitem {
+ background-color: #697F55;
+ width: 35px;
+ -webkit-border-top-left-radius: 10px;
+ -moz-border-radius-topleft: 10px;
+ border-top-left-radius: 10px;
+ -webkit-border-bottom-left-radius: 10px;
+ -moz-border-radius-bottomleft: 10px;
+ border-bottom-left-radius: 10px;
+}
+#dock .controls img {
+ cursor:pointer;
+ margin-left: 10px;
+}
+/*
+Docked Item Panel
+-----------------------*/
+#dockeditempanel {
+ width: 180px;
+ position: relative;
+ z-index: 12000;
+ left: 100%;
+}
+#dockeditempanel.dockitempanel_hidden {
+ display:none;
+}
+#dockeditempanel .dockeditempanel_content {
+ background-color: #eee;
+ margin: 0 3px;
+ position: relative;
+ min-height: 100px;
+ border-color: #697F55;
+ border-style: solid;
+ border-width: 5px;
+ -webkit-border-radius: 10px;
+ -moz-border-radius: 10px;
+ border-radius: 10px;
+ -webkit-border-top-left-radius: 0;
+ -moz-border-top-left-radius: 0;
+ border-top-left-radius: 0;
+
+}
+#dockeditempanel .dockeditempanel_hd {
+ border-width: 0;
+ background-color: #eee;
+ padding: 2px;
+}
+#dockeditempanel .dockeditempanel_bd .block_docked {
+ margin:10px;
+}
+#dockeditempanel .block_calendar_month.block_docked {
+ text-align: center;
+}
+#dockeditempanel .dockeditempanel_hd {
+ text-align: right;
+ -webkit-border-top-right-radius: 10px;
+ -moz-border-top-right-radius: 10px;
+ border-top-right-radius: 10px;
+}
+#dockeditempanel .dockeditempanel_hd h2 {
+ display:inline;
+ margin: 0;
+ padding-right: 2em;
+ color: #000;
+ float: left;
+}
+
+#dockeditempanel .dockeditempanel_hd .commands {
+ display:inline;
+}
+#dockeditempanel .dockeditempanel_hd .commands img {
+ margin-right: 3px;
+ vertical-align: middle;
+}
+#dockeditempanel .dockeditempanel_bd {
+ overflow:auto;
+ width:auto; /* adds scroll to dock panel */
+}
Oops, something went wrong.

0 comments on commit d11d1e5

Please sign in to comment.