diff --git a/themes/bartik/css/layout-rtl.css b/themes/bartik/css/layout-rtl.css index c245ef810a62c604e89e84c610f9f96a561ee773..475ca156f8eb348bc8537a9ba6695ba54fa0005d 100644 --- a/themes/bartik/css/layout-rtl.css +++ b/themes/bartik/css/layout-rtl.css @@ -4,12 +4,12 @@ #content, .sidebar, -#triptych-first, -#triptych-middle, -#triptych-last, -#footer-firstcolumn, -#footer-secondcolumn, -#footer-thirdcolumn, -#footer-fourthcolumn { +.region-triptych-first, +.region-triptych-middle, +.region-triptych-last, +.region-footer-firstcolumn, +.region-footer-secondcolumn, +.region-footer-thirdcolumn, +.region-footer-fourthcolumn { float: right; } diff --git a/themes/bartik/css/layout.css b/themes/bartik/css/layout.css index 577b2b70ee2c58b652701031303425257f582545..650a7419ffbd8d611b459c89c23a8da3413d0353 100644 --- a/themes/bartik/css/layout.css +++ b/themes/bartik/css/layout.css @@ -16,13 +16,13 @@ } #content, .sidebar, -#triptych-first, -#triptych-middle, -#triptych-last, -#footer-firstcolumn, -#footer-secondcolumn, -#footer-thirdcolumn, -#footer-fourthcolumn { +.region-triptych-first, +.region-triptych-middle, +.region-triptych-last, +.region-footer-firstcolumn, +.region-footer-secondcolumn, +.region-footer-thirdcolumn, +.region-footer-fourthcolumn { display: inline; float: left; /* LTR */ position: relative; @@ -51,19 +51,19 @@ #breadcrumb { margin: 0 15px; } -#triptych-first, -#triptych-middle, -#triptych-last { +.region-triptych-first, +.region-triptych-middle, +.region-triptych-last { margin: 20px 20px 30px; width: 280px; } #footer-wrapper { padding: 35px 5px 30px; } -#footer-firstcolumn, -#footer-secondcolumn, -#footer-thirdcolumn, -#footer-fourthcolumn { +.region-footer-firstcolumn, +.region-footer-secondcolumn, +.region-footer-thirdcolumn, +.region-footer-fourthcolumn { padding: 0 10px; width: 220px; } diff --git a/themes/bartik/templates/page.tpl.php b/themes/bartik/templates/page.tpl.php index 4753f6ba35ea3a21ae77d1782a0612f50279fc02..1d487bdd24ebc70804f092322cfaae81645a5ede 100644 --- a/themes/bartik/templates/page.tpl.php +++ b/themes/bartik/templates/page.tpl.php @@ -149,9 +149,9 @@ <?php endif; ?> <?php if ($page['featured']): ?> - <div id="featured" class="region"><div class="section clearfix"> + <div id="featured" class="section clearfix"> <?php print render($page['featured']); ?> - </div></div> <!-- /.section, /#featured --> + </div> <!-- /#featured --> <?php endif; ?> <div id="main-wrapper" class="clearfix"><div id="main" class="clearfix"> @@ -203,25 +203,9 @@ <?php if ($page['triptych_first'] || $page['triptych_middle'] || $page['triptych_last']): ?> <div id="triptych-wrapper"><div id="triptych" class="clearfix"> - - <?php if ($page['triptych_first']): ?> - <div id="triptych-first" class="region triptych"><div class="section"> - <?php print render($page['triptych_first']); ?> - </div></div> <!-- /.section, /#triptych-first --> - <?php endif; ?> - - <?php if ($page['triptych_middle']): ?> - <div id="triptych-middle" class="region triptych"><div class="section"> - <?php print render($page['triptych_middle']); ?> - </div></div> <!-- /.section, /#triptych-middle --> - <?php endif; ?> - - <?php if ($page['triptych_last']): ?> - <div id="triptych-last" class="region triptych"><div class="section"> - <?php print render($page['triptych_last']); ?> - </div></div> <!-- /.section, /#triptych-last --> - <?php endif; ?> - + <?php print render($page['triptych_first']); ?> + <?php print render($page['triptych_middle']); ?> + <?php print render($page['triptych_last']); ?> </div></div> <!-- /#triptych, /#triptych-wrapper --> <?php endif; ?> @@ -229,31 +213,10 @@ <?php if ($page['footer_firstcolumn'] || $page['footer_secondcolumn'] || $page['footer_thirdcolumn'] || $page['footer_fourthcolumn']): ?> <div id="footer-columns" class="clearfix"> - - <?php if ($page['footer_firstcolumn']): ?> - <div id="footer-firstcolumn" class="region sitemap"><div class="section"> - <?php print render($page['footer_firstcolumn']); ?> - </div></div> <!-- /.section, /#footer-firstcolumn --> - <?php endif; ?> - - <?php if ($page['footer_secondcolumn']): ?> - <div id="footer-secondcolumn" class="region sitemap"><div class="section"> - <?php print render($page['footer_secondcolumn']); ?> - </div></div> <!-- /.section, /#footer-secondcolumn --> - <?php endif; ?> - - <?php if ($page['footer_thirdcolumn']): ?> - <div id="footer-thirdcolumn" class="region sitemap"><div class="section"> - <?php print render($page['footer_thirdcolumn']); ?> - </div></div> <!-- /.section, /#footer-thirdcolumn --> - <?php endif; ?> - - <?php if ($page['footer_fourthcolumn']): ?> - <div id="footer-fourthcolumn" class="region sitemap"><div class="section"> - <?php print render($page['footer_fourthcolumn']); ?> - </div></div> <!-- /.section, /#footer-fourthcolumn --> - <?php endif; ?> - + <?php print render($page['footer_firstcolumn']); ?> + <?php print render($page['footer_secondcolumn']); ?> + <?php print render($page['footer_thirdcolumn']); ?> + <?php print render($page['footer_fourthcolumn']); ?> </div><!-- /#footer-columns --> <?php endif; ?>