Skip to content
Snippets Groups Projects
Commit 2902d97d authored by Lewis Nyman's avatar Lewis Nyman
Browse files

Issue #2226213 by svenryen, Manuel Garcia: Split the right sidebar region into...

Issue #2226213 by svenryen, Manuel Garcia: Split the right sidebar region into stacked 'Major' and 'Minor' region
parent 3302b812
No related branches found
No related tags found
No related merge requests found
...@@ -6,6 +6,7 @@ core = 7.x ...@@ -6,6 +6,7 @@ core = 7.x
; -------- regions --------------- ; -------- regions ---------------
regions[page_tools] = Page Tools regions[page_tools] = Page Tools
regions[sidebar_first] = Sidebar first
regions[sidebar_second] = Sidebar second regions[sidebar_second] = Sidebar second
regions[highlighted] = Highlighted regions[highlighted] = Highlighted
regions[navigation] = Navigation regions[navigation] = Navigation
......
#aside { #aside,
#sidebar-first {
.block { .block {
background: $pale-yellow; background: $pale-yellow;
} }
......
// Book pages // Book pages
.book-navigation { .book-navigation {
clear: both; clear: both;
ul.menu, ul.menu,
.block & ul.menu { .block & ul.menu {
border-top: 1px solid nth($greys, 4); border-top: 1px solid nth($greys, 4);
...@@ -16,7 +16,10 @@ ...@@ -16,7 +16,10 @@
} }
// Sidebar blocks on book pages // Sidebar blocks on book pages
#aside #block-drupalorg-handbook-meta-sidebar, #aside,
#aside #block-drupalorg-handbook-about-page { #sidebar-first {
background: $white; #block-drupalorg-handbook-meta-sidebar,
#block-drupalorg-handbook-about-page {
background: $white;
}
} }
...@@ -17,7 +17,8 @@ ...@@ -17,7 +17,8 @@
#content-top-region, #content-top-region,
#content, #content,
#content-bottom-region, #content-bottom-region,
#aside-region { #aside-region,
#sidebar-first-region {
margin-bottom: 13px; margin-bottom: 13px;
} }
...@@ -33,7 +34,7 @@ ...@@ -33,7 +34,7 @@
/* Submitted time on nodes and comments */ /* Submitted time on nodes and comments */
.submitted time { .submitted time {
font-style: italic; font-style: italic;
} }
/* todo: check what is this */ /* todo: check what is this */
......
...@@ -72,14 +72,18 @@ ol { ...@@ -72,14 +72,18 @@ ol {
list-style-type: upper-alpha; list-style-type: upper-alpha;
} }
} }
#aside .block ol { #aside,
list-style: none; #sidebar-first {
padding-left: 0; .block ol {
list-style: none;
padding-left: 0;
}
} }
.profile .item-list li, .profile .item-list li,
#aside .block .item-list li, #aside .block .item-list li,
#aside .block .links li, #aside .block .links li,
#sidebar-first .block .item-list li,
#sidebar-first .block .links li,
#homebox .block .menu li, #homebox .block .menu li,
#homebox .block .item-list li { #homebox .block .item-list li {
line-height: 1.2em; line-height: 1.2em;
......
...@@ -8,11 +8,15 @@ ...@@ -8,11 +8,15 @@
@include span-columns(12 omega); @include span-columns(12 omega);
z-index: 1; z-index: 1;
} }
.one-sidebar #main { .one-sidebar,
@include span-columns(8); .two-sidebars {
#main {
@include span-columns(8);
}
} }
#aside { #aside,
#sidebar-first {
@include span-columns(4 omega); @include span-columns(4 omega);
} }
...@@ -26,11 +30,17 @@ ...@@ -26,11 +30,17 @@
//This is how we fix nested classes that are in content for now //This is how we fix nested classes that are in content for now
/* todo: remove grid classes post upgrade */ /* todo: remove grid classes post upgrade */
.one-sidebar #main .grid-4 { .one-sidebar,
@include span-columns(4,8); .two-sidebars {
#main .grid-4 {
@include span-columns(4,8);
}
} }
.one-sidebar #main .grid-4.omega { .one-sidebar,
@include omega(); .two-sidebars {
#main .grid-4.omega {
@include omega();
}
} }
/* todo: check if needed, page-titles are h1 everywhere */ /* todo: check if needed, page-titles are h1 everywhere */
......
...@@ -143,7 +143,8 @@ ...@@ -143,7 +143,8 @@
@include marketplace-big-arrow-list; @include marketplace-big-arrow-list;
} }
#aside { #aside,
#sidebar-first {
#block-block-40, #block-block-40,
#block-block-42, #block-block-42,
#block-block-46, #block-block-46,
...@@ -159,7 +160,8 @@ ...@@ -159,7 +160,8 @@
} }
} }
#aside #block-views-drupalorg-training-block-1 { #aside #block-views-drupalorg-training-block-1,
#sidebar-first #block-views-drupalorg-training-block-1 {
background-color: $white; background-color: $white;
ul.views-summary li { ul.views-summary li {
......
...@@ -73,13 +73,21 @@ ...@@ -73,13 +73,21 @@
</div> <!-- /#page-heading --> </div> <!-- /#page-heading -->
<div id="main" role="main">
<?php if ($tabs['#primary']): ?> <?php if ($tabs['#primary']): ?>
<div id="tabs" class="clearfix"> <div id="tabs" class="clearfix">
<?php print render($tabs); ?> <?php print render($tabs); ?>
</div> <!-- /#tabs --> </div> <!-- /#tabs -->
<?php endif; // end if $tabs ?> <?php endif; // end if $tabs ?>
<?php if ($page['sidebar_first']): ?>
<div id="sidebar-first" role="complementary" >
<div id="sidebar-first-region">
<?php print render($page['sidebar_first']); ?>
</div> <!-- /#column-right-region-first -->
</div> <!-- /#column-right-first -->
<?php endif; // end if $right-first ?>
<div id="main" role="main">
<?php if ($page['content_top']): ?> <?php if ($page['content_top']): ?>
<div id="content-top-region" class="clearfix"> <div id="content-top-region" class="clearfix">
<?php print render($page['content_top']); ?> <?php print render($page['content_top']); ?>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment