summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSungsit Sawaiwan2009-05-12 15:13:51 +0000
committerSungsit Sawaiwan2009-05-12 15:13:51 +0000
commit55422b2f22ff270c18b2f758e679f80751ae1fca (patch)
treeb2574a2e86c7731203cfebeb00c7b3fb9bd7b0c7
parent71f97f774ce242e7afd294ec65a918e739c1cb87 (diff)
#453968 : Fixed duplicated class name to support Calendar module.
-rw-r--r--css/beach.css28
-rw-r--r--page-node.tpl.php2
-rw-r--r--page.tpl.php2
3 files changed, 17 insertions, 15 deletions
diff --git a/css/beach.css b/css/beach.css
index 8a3d06a..067f805 100644
--- a/css/beach.css
+++ b/css/beach.css
@@ -24,20 +24,20 @@
float:right;
}
-.two-sidebars #main-content .inner {
+.two-sidebars #main-content .content-inner {
margin-left: 230px;
margin-right: 230px;
}
-.sidebar-right #main-content .inner {
+.sidebar-right #main-content .content-inner {
margin-right: 230px;
}
-.sidebar-left #main-content .inner {
+.sidebar-left #main-content .content-inner {
margin-left: 230px;
}
-.inner {
+.content-inner {
padding: 20px;
}
@@ -70,6 +70,13 @@
}
/**
+ * Fix table overlap when use 2 sidebars layout in admin pages.
+ */
+body.page-admin.two-sidebars .section {
+ min-width: 960px;
+}
+
+/**
* Hidden Elements
*/
.hidden,
@@ -80,11 +87,6 @@
visibility: hidden;
}
-/* Fix table overlapping when use 2 sidebars layout in admin pages */
-body.page-admin.two-sidebars .section {
- min-width: 960px;
-}
-
#branding {
float: left;
margin: 0;
@@ -341,12 +343,12 @@ textarea {
padding: 0 0 40px 0;
}
-#main-content .inner {
+#main-content .content-inner {
background: transparent url(../images/white-trans-50.png) 0 0 repeat;
}
-body.page-node #main-content .inner,
-body.page-blog #main-content .inner {
+body.page-node #main-content .content-inner,
+body.page-blog #main-content .content-inner {
background: url(../images/white-trans-25.png) 0 0 repeat;
}
@@ -885,7 +887,7 @@ div.comment-content {
#comments .links a {
padding: 3px 10px;
color: #fff;
- background: #6bd;
+ background: #999;
-moz-border-radius: 3px;
-webkit-border-radius: 3px;
border-radius: 3px;
diff --git a/page-node.tpl.php b/page-node.tpl.php
index fb5982f..e91f52e 100644
--- a/page-node.tpl.php
+++ b/page-node.tpl.php
@@ -85,7 +85,7 @@
<?php endif; ?>
<div id="main-content" class="column">
- <div class="inner clear-block">
+ <div class="content-inner clear-block">
<?php if ($breadcrumb): ?><div class="top-breadcrumb clear-block"><?php print $breadcrumb; ?></div><?php endif; ?>
diff --git a/page.tpl.php b/page.tpl.php
index f5ff456..1873bd9 100644
--- a/page.tpl.php
+++ b/page.tpl.php
@@ -85,7 +85,7 @@
<?php endif; ?>
<div id="main-content" class="column">
- <div class="inner clear-block">
+ <div class="content-inner clear-block">
<?php if ($breadcrumb): ?><div class="top-breadcrumb clear-block"><?php print $breadcrumb; ?></div><?php endif; ?>