summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorshivcharan Patil2013-09-04 00:28:23 +0530
committershivcharan Patil2013-09-04 00:28:23 +0530
commitad80ba370a665c50f1abba44fa25ce6edaa08f40 (patch)
tree399c26c6c0c6ec9999236f3e3afb668fa167b480
parent6c167ca2c5212369564b70bc7344ace72896192f (diff)
Content overlap bug fix,7.x-1.0-beta3
Footer blocks width bug fix, Undefined variable bug fix.
-rw-r--r--css/beach.css24
-rw-r--r--page.tpl.php34
2 files changed, 26 insertions, 32 deletions
diff --git a/css/beach.css b/css/beach.css
index b3e3064..0fc5216 100644
--- a/css/beach.css
+++ b/css/beach.css
@@ -28,11 +28,11 @@
margin-right: 230px;
}
-.sidebar-right #main-content .content-inner {
+.sidebar-second #main-content .content-inner {
margin-right: 230px;
}
-.sidebar-left #main-content .content-inner {
+.sidebar-first #main-content .content-inner {
margin-left: 230px;
}
@@ -76,20 +76,6 @@ body.page-admin.two-sidebars .section {
padding: 0 20px;
color: #000;
}
-/*
-#slogan {
- position: relative;
- top: -40px;
- left: 40px;
- z-index: 0;
- font-size: 15px;
- line-height: 20px;
- margin: 0;
- padding: 50px 20px 10px 20px;
- color: #046;
- background: transparent url(../images/white-trans-50.png) 0 0 repeat;
-}*/
-
#site-name a {
color: #000;
}
@@ -602,16 +588,16 @@ div.terms {
border-right: 1px solid #002347;
}
.fb1 .footer-column {
- width: 98%;
+ width: 99.88%;
}
.fb2 .footer-column {
- width: 49%;
+ width: 49.77%;
}
.fb3 .footer-column {
width: 33%;
}
.fb4 .footer-column {
- width: 24%;
+ width: 24.77%;
}
.footer-column .block {
padding: 0 11px;
diff --git a/page.tpl.php b/page.tpl.php
index 4d6bcdc..760e447 100644
--- a/page.tpl.php
+++ b/page.tpl.php
@@ -4,19 +4,27 @@
* @file
* Default theme implementation to display a single Drupal page.
*/
-
- if($page['footer_1'] || $page['footer_2'] || $page['footer_3'] || $page['footer_4']){
- $fbw = 'fb1';
- }
- if($page['footer_1'] && $page['footer_2'] && $page['footer_3'] && $page['footer_4']){
- $fbw = 'fb4';
- }
- if($page['footer_1'] && $page['footer_2'] || $page['footer_1'] && $page['footer_3'] || $page['footer_1'] && $page['footer_4'] || $page['footer_2'] && $page['footer_3'] || $page['footer_2'] && $page['footer_4'] || $page['footer_3'] && $page['footer_4'] ){
- $fbw = 'fb2';
- }
- if($page['footer_1'] && $page['footer_2'] && $page['footer_3'] || $page['footer_1'] && $page['footer_2'] && $page['footer_4'] || $page['footer_1'] && $page['footer_3'] && $page['footer_4'] || $page['footer_2'] && $page['footer_3'] && $page['footer_4'] ) {
- $fbw = 'fb3';
- }
+$fbw = null;
+if($page['footer_1'] && $page['footer_2'] && $page['footer_3'] && $page['footer_4']){
+ $fbw = 'fb4';
+ }
+else{
+ if($page['footer_1'] && $page['footer_2'] && $page['footer_3'] || $page['footer_1'] && $page['footer_2'] && $page['footer_4'] || $page['footer_1'] && $page['footer_3'] && $page['footer_4'] || $page['footer_2'] && $page['footer_3'] && $page['footer_4'] ) {
+ $fbw = 'fb3';
+ }
+ else {
+ if($page['footer_1'] && $page['footer_2'] || $page['footer_1'] && $page['footer_3'] || $page['footer_1'] && $page['footer_4'] || $page['footer_2'] && $page['footer_3'] || $page['footer_2'] && $page['footer_4'] || $page['footer_3'] && $page['footer_4'] ){
+ $fbw = 'fb2';
+ }
+ else {
+ if($page['footer_1'] || $page['footer_2'] || $page['footer_3'] || $page['footer_4']){
+ $fbw = 'fb1';
+ }
+ }
+ }
+
+ }
+
?>
<div id="top-wrapper" class="clear-block">