From 2902d97d95b1b3ffaeb0a72cac2e7ce662f341ed Mon Sep 17 00:00:00 2001
From: LewisNyman <hello@lewisnyman.co.uk>
Date: Fri, 28 Mar 2014 15:00:05 +0100
Subject: [PATCH] Issue #2226213 by svenryen, Manuel Garcia: Split the right
sidebar region into stacked 'Major' and 'Minor' region
---
bluecheese.info | 1 +
sass/partials/common/_block.scss | 3 ++-
sass/partials/common/_book.scss | 11 +++++++----
sass/partials/common/_content.scss | 5 +++--
sass/partials/common/_lists.scss | 12 ++++++++----
sass/partials/common/_page.scss | 24 ++++++++++++++++-------
sass/partials/drupalorg/_marketplace.scss | 6 ++++--
tpl/page.tpl.php | 10 +++++++++-
8 files changed, 51 insertions(+), 21 deletions(-)
diff --git a/bluecheese.info b/bluecheese.info
index 2cb587e9..767144b7 100644
--- a/bluecheese.info
+++ b/bluecheese.info
@@ -6,6 +6,7 @@ core = 7.x
; -------- regions ---------------
regions[page_tools] = Page Tools
+regions[sidebar_first] = Sidebar first
regions[sidebar_second] = Sidebar second
regions[highlighted] = Highlighted
regions[navigation] = Navigation
diff --git a/sass/partials/common/_block.scss b/sass/partials/common/_block.scss
index e28048b4..c266913e 100644
--- a/sass/partials/common/_block.scss
+++ b/sass/partials/common/_block.scss
@@ -1,4 +1,5 @@
-#aside {
+#aside,
+#sidebar-first {
.block {
background: $pale-yellow;
}
diff --git a/sass/partials/common/_book.scss b/sass/partials/common/_book.scss
index d6e9efb2..e7290ee7 100644
--- a/sass/partials/common/_book.scss
+++ b/sass/partials/common/_book.scss
@@ -1,7 +1,7 @@
// Book pages
.book-navigation {
clear: both;
-
+
ul.menu,
.block & ul.menu {
border-top: 1px solid nth($greys, 4);
@@ -16,7 +16,10 @@
}
// Sidebar blocks on book pages
-#aside #block-drupalorg-handbook-meta-sidebar,
-#aside #block-drupalorg-handbook-about-page {
- background: $white;
+#aside,
+#sidebar-first {
+ #block-drupalorg-handbook-meta-sidebar,
+ #block-drupalorg-handbook-about-page {
+ background: $white;
+ }
}
diff --git a/sass/partials/common/_content.scss b/sass/partials/common/_content.scss
index c772b8d3..f57df300 100644
--- a/sass/partials/common/_content.scss
+++ b/sass/partials/common/_content.scss
@@ -17,7 +17,8 @@
#content-top-region,
#content,
#content-bottom-region,
-#aside-region {
+#aside-region,
+#sidebar-first-region {
margin-bottom: 13px;
}
@@ -33,7 +34,7 @@
/* Submitted time on nodes and comments */
.submitted time {
- font-style: italic;
+ font-style: italic;
}
/* todo: check what is this */
diff --git a/sass/partials/common/_lists.scss b/sass/partials/common/_lists.scss
index e9124bec..a927c8e5 100644
--- a/sass/partials/common/_lists.scss
+++ b/sass/partials/common/_lists.scss
@@ -72,14 +72,18 @@ ol {
list-style-type: upper-alpha;
}
}
-#aside .block ol {
- list-style: none;
- padding-left: 0;
+#aside,
+#sidebar-first {
+ .block ol {
+ list-style: none;
+ padding-left: 0;
+ }
}
-
.profile .item-list li,
#aside .block .item-list li,
#aside .block .links li,
+#sidebar-first .block .item-list li,
+#sidebar-first .block .links li,
#homebox .block .menu li,
#homebox .block .item-list li {
line-height: 1.2em;
diff --git a/sass/partials/common/_page.scss b/sass/partials/common/_page.scss
index dbb0534d..e7818969 100644
--- a/sass/partials/common/_page.scss
+++ b/sass/partials/common/_page.scss
@@ -8,11 +8,15 @@
@include span-columns(12 omega);
z-index: 1;
}
- .one-sidebar #main {
- @include span-columns(8);
+ .one-sidebar,
+ .two-sidebars {
+ #main {
+ @include span-columns(8);
+ }
}
- #aside {
+ #aside,
+ #sidebar-first {
@include span-columns(4 omega);
}
@@ -26,11 +30,17 @@
//This is how we fix nested classes that are in content for now
/* todo: remove grid classes post upgrade */
-.one-sidebar #main .grid-4 {
- @include span-columns(4,8);
+.one-sidebar,
+.two-sidebars {
+ #main .grid-4 {
+ @include span-columns(4,8);
+ }
}
-.one-sidebar #main .grid-4.omega {
- @include omega();
+.one-sidebar,
+.two-sidebars {
+ #main .grid-4.omega {
+ @include omega();
+ }
}
/* todo: check if needed, page-titles are h1 everywhere */
diff --git a/sass/partials/drupalorg/_marketplace.scss b/sass/partials/drupalorg/_marketplace.scss
index 189f673a..970c75d7 100644
--- a/sass/partials/drupalorg/_marketplace.scss
+++ b/sass/partials/drupalorg/_marketplace.scss
@@ -143,7 +143,8 @@
@include marketplace-big-arrow-list;
}
-#aside {
+#aside,
+#sidebar-first {
#block-block-40,
#block-block-42,
#block-block-46,
@@ -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;
ul.views-summary li {
diff --git a/tpl/page.tpl.php b/tpl/page.tpl.php
index 59d5da76..91df6672 100644
--- a/tpl/page.tpl.php
+++ b/tpl/page.tpl.php
@@ -73,13 +73,21 @@
</div> <!-- /#page-heading -->
- <div id="main" role="main">
<?php if ($tabs['#primary']): ?>
<div id="tabs" class="clearfix">
<?php print render($tabs); ?>
</div> <!-- /#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']): ?>
<div id="content-top-region" class="clearfix">
<?php print render($page['content_top']); ?>
--
GitLab