summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Pott2015-02-03 11:31:15 (GMT)
committerAlex Pott2015-02-03 11:31:15 (GMT)
commitadc801b781c224d6b359105d3739a953928da1dd (patch)
tree847b9b6c12fec87502d07892ec46494f4cac0204
parentdcf5c80b828e0bcc2dd8b8510c151862908fe9cf (diff)
Issue #2402639 by Katiemouse, nitvirus, lakshminp, dernetzjaeger, emma.maria, gippy, kporras07, john guant, Prashant.c: Rename the footer regions in Bartik
-rw-r--r--core/profiles/standard/config/install/block.block.bartik_footer.yml2
-rw-r--r--core/profiles/standard/config/install/block.block.bartik_powered.yml2
-rw-r--r--core/themes/bartik/bartik.info.yml10
-rw-r--r--core/themes/bartik/css/base/typography.css2
-rw-r--r--core/themes/bartik/css/colors.css3
-rw-r--r--core/themes/bartik/css/components/footer.css46
-rw-r--r--core/themes/bartik/css/layout.css65
-rw-r--r--core/themes/bartik/templates/page.html.twig30
8 files changed, 79 insertions, 81 deletions
diff --git a/core/profiles/standard/config/install/block.block.bartik_footer.yml b/core/profiles/standard/config/install/block.block.bartik_footer.yml
index 43817fd..e98fcb8 100644
--- a/core/profiles/standard/config/install/block.block.bartik_footer.yml
+++ b/core/profiles/standard/config/install/block.block.bartik_footer.yml
@@ -3,7 +3,7 @@ theme: bartik
weight: 0
status: true
langcode: en
-region: footer
+region: footer_fifth
plugin: 'system_menu_block:footer'
settings:
id: 'system_menu_block:footer'
diff --git a/core/profiles/standard/config/install/block.block.bartik_powered.yml b/core/profiles/standard/config/install/block.block.bartik_powered.yml
index 5a9881f..f7e4c90 100644
--- a/core/profiles/standard/config/install/block.block.bartik_powered.yml
+++ b/core/profiles/standard/config/install/block.block.bartik_powered.yml
@@ -3,7 +3,7 @@ theme: bartik
weight: 10
status: true
langcode: en
-region: footer
+region: footer_fifth
plugin: system_powered_by_block
settings:
id: system_powered_by_block
diff --git a/core/themes/bartik/bartik.info.yml b/core/themes/bartik/bartik.info.yml
index 93c4b61..f4bea78 100644
--- a/core/themes/bartik/bartik.info.yml
+++ b/core/themes/bartik/bartik.info.yml
@@ -28,8 +28,8 @@ regions:
triptych_first: 'Triptych first'
triptych_middle: 'Triptych middle'
triptych_last: 'Triptych last'
- footer_firstcolumn: 'Footer first column'
- footer_secondcolumn: 'Footer second column'
- footer_thirdcolumn: 'Footer third column'
- footer_fourthcolumn: 'Footer fourth column'
- footer: Footer
+ footer_first: 'Footer first'
+ footer_second: 'Footer second'
+ footer_third: 'Footer third'
+ footer_fourth: 'Footer fourth'
+ footer_fifth: 'Footer fifth'
diff --git a/core/themes/bartik/css/base/typography.css b/core/themes/bartik/css/base/typography.css
index fb3fcd0..906bd09 100644
--- a/core/themes/bartik/css/base/typography.css
+++ b/core/themes/bartik/css/base/typography.css
@@ -10,7 +10,7 @@ body,
font-family: Georgia, "Times New Roman", Times, serif;
}
#header,
-#footer-wrapper,
+#site-footer__wrapper,
.skip-link,
ul.contextual-links,
ul.links,
diff --git a/core/themes/bartik/css/colors.css b/core/themes/bartik/css/colors.css
index 6ba3064..7689d57 100644
--- a/core/themes/bartik/css/colors.css
+++ b/core/themes/bartik/css/colors.css
@@ -43,7 +43,7 @@ a:active,
border-color: #f9f9f9;
}
#page-wrapper,
-#footer-wrapper {
+#site-footer__wrapper {
background: #292929;
}
.region-header,
@@ -70,4 +70,3 @@ a:active,
right: -20px;
left: 0;
}
-
diff --git a/core/themes/bartik/css/components/footer.css b/core/themes/bartik/css/components/footer.css
index 90de8af..59d3fe3 100644
--- a/core/themes/bartik/css/components/footer.css
+++ b/core/themes/bartik/css/components/footer.css
@@ -1,46 +1,46 @@
/* ------------------ Footer ------------------ */
-#footer-wrapper .block .content {
+#site-footer__wrapper .block .content {
color: #c0c0c0;
color: rgba(255, 255, 255, 0.65);
font-size: 0.857em;
}
-#footer-wrapper .block .content a {
+#site-footer__wrapper .block .content a {
color: #fcfcfc;
color: rgba(255, 255, 255, 0.8);
}
-#footer-wrapper .block .content a:hover,
-#footer-wrapper .block .content a:focus {
+#site-footer__wrapper .block .content a:hover,
+#site-footer__wrapper .block .content a:focus {
color: #fefefe;
color: rgba(255, 255, 255, 0.95);
}
-#footer-wrapper .block {
+#site-footer__wrapper .block {
margin: 20px 0;
border: 1px solid #444;
border-color: rgba(255, 255, 255, 0.1);
padding: 10px;
}
#footer-columns .block-menu,
-#footer .block {
+#site-footer__bottom .block {
margin: 0;
padding: 0;
border: none;
}
-#footer .block {
+#site-footer__bottom .block {
margin: 0.5em 0;
}
-#footer .block .content {
+#site-footer__bottom .block .content {
padding: 0.5em 0;
margin-top: 0;
}
-#footer .block > h2 {
+#site-footer__bottom .block > h2 {
/* @extend .visually-hidden */
position: absolute !important;
clip: rect(1px, 1px, 1px, 1px);
overflow: hidden;
height: 1px;
}
-#footer .block h2 {
+#site-footer__bottom .block h2 {
margin: 0;
}
#footer-columns h2 {
@@ -88,56 +88,56 @@
background-color: rgba(255, 255, 255, 0.05);
text-decoration: none;
}
-#footer {
+#site-footer__bottom {
letter-spacing: 0.2px;
margin-top: 30px;
border-top: 1px solid #555;
border-color: rgba(255, 255, 255, 0.15);
}
-#footer .region {
+#site-footer__bottom .region {
margin-top: 20px;
}
-#footer .block {
+#site-footer__bottom .block {
clear: both;
}
-#footer .menu ,
-#footer .menu li {
+#site-footer__bottom .menu ,
+#site-footer__bottom .menu li {
list-style: none;
margin: 0;
padding: 0;
}
-#footer .menu li a {
+#site-footer__bottom .menu li a {
float: left; /* LTR */
padding: 0 12px;
display: block;
border-right: 1px solid #555; /* LTR */
border-color: rgba(255, 255, 255, 0.15);
}
-[dir="rtl"] #footer .menu li a {
+[dir="rtl"] #site-footer__bottom .menu li a {
float: right;
border-left: 1px solid #555;
border-color: rgba(255, 255, 255, 0.15);
border-right: none;
}
-#footer .menu li:first-child a {
+#site-footer__bottom .menu li:first-child a {
padding-left: 0; /* LTR */
}
-[dir="rtl"] #footer .menu li:first-child a {
+[dir="rtl"] #site-footer__bottom .menu li:first-child a {
padding-right: 0;
padding-left: 12px;
}
-#footer .menu li:last-child a {
+#site-footer__bottom .menu li:last-child a {
padding-right: 0; /* LTR */
border-right: none; /* LTR */
}
-[dir="rtl"] #footer .menu li:last-child a {
+[dir="rtl"] #site-footer__bottom .menu li:last-child a {
padding-left: 0;
border-left: none;
}
-#footer-wrapper tr.odd {
+#site-footer__wrapper tr.odd {
background-color: transparent;
}
-#footer-wrapper tr.even {
+#site-footer__wrapper tr.even {
background-color: #2c2c2c;
background-color: rgba(0, 0, 0, 0.15);
}
diff --git a/core/themes/bartik/css/layout.css b/core/themes/bartik/css/layout.css
index 32be50c..8537380 100644
--- a/core/themes/bartik/css/layout.css
+++ b/core/themes/bartik/css/layout.css
@@ -15,7 +15,7 @@ body,
#main,
#triptych,
#footer-columns,
-#footer {
+#site-footer__bottom {
width: 100%;
max-width: 860px;
margin-left: auto;
@@ -52,10 +52,10 @@ body,
.sidebar .section {
padding: 0 15px;
}
-#footer-wrapper {
+#site-footer__wrapper {
padding: 35px 0 30px;
}
-#footer-wrapper .section {
+#site-footer__wrapper .section {
box-sizing: border-box;
padding: 0 15px;
}
@@ -65,10 +65,10 @@ body,
box-sizing: border-box;
padding: 0 20px 0;
}
-.region-footer-firstcolumn,
-.region-footer-secondcolumn,
-.region-footer-thirdcolumn,
-.region-footer-fourthcolumn {
+.region-footer-first,
+.region-footer-second,
+.region-footer-third,
+.region-footer-fourth {
box-sizing: border-box;
padding: 0 10px;
}
@@ -79,10 +79,10 @@ body,
.region-triptych-first,
.region-triptych-middle,
.region-triptych-last,
- .region-footer-firstcolumn,
- .region-footer-secondcolumn,
- .region-footer-thirdcolumn,
- .region-footer-fourthcolumn {
+ .region-footer-first,
+ .region-footer-second,
+ .region-footer-third,
+ .region-footer-fourth {
display: inline;
float: left; /* LTR */
position: relative;
@@ -91,10 +91,10 @@ body,
[dir="rtl"] .region-triptych-first,
[dir="rtl"] .region-triptych-middle,
[dir="rtl"] .region-triptych-last,
- [dir="rtl"] .region-footer-firstcolumn,
- [dir="rtl"] .region-footer-secondcolumn,
- [dir="rtl"] .region-footer-thirdcolumn,
- [dir="rtl"] .region-footer-fourthcolumn {
+ [dir="rtl"] .region-footer-first,
+ [dir="rtl"] .region-footer-second,
+ [dir="rtl"] .region-footer-third,
+ [dir="rtl"] .region-footer-fourth {
float: right;
}
#sidebar-first,
@@ -127,14 +127,14 @@ body,
.region-triptych-middle {
padding: 20px 5px 30px;
}
- .region-footer-firstcolumn,
- .region-footer-secondcolumn {
+ .region-footer-first,
+ .region-footer-second {
box-sizing: border-box;
padding: 0 10px;
width: 50%;
}
- .region-footer-thirdcolumn,
- .region-footer-fourthcolumn {
+ .region-footer-third,
+ .region-footer-fourth {
box-sizing: border-box;
padding: 0 10px;
width: 50%;
@@ -152,7 +152,7 @@ body,
#main,
#triptych,
#footer-columns,
- #footer {
+ #site-footer__bottom {
max-width: 1290px;
}
#content,
@@ -161,10 +161,10 @@ body,
.region-triptych-first,
.region-triptych-middle,
.region-triptych-last,
- .region-footer-firstcolumn,
- .region-footer-secondcolumn,
- .region-footer-thirdcolumn,
- .region-footer-fourthcolumn {
+ .region-footer-first,
+ .region-footer-second,
+ .region-footer-third,
+ .region-footer-fourth {
display: inline;
float: left; /* LTR */
position: relative;
@@ -175,10 +175,10 @@ body,
[dir="rtl"] .region-triptych-first,
[dir="rtl"] .region-triptych-middle,
[dir="rtl"] .region-triptych-last,
- [dir="rtl"] .region-footer-firstcolumn,
- [dir="rtl"] .region-footer-secondcolumn,
- [dir="rtl"] .region-footer-thirdcolumn,
- [dir="rtl"] .region-footer-fourthcolumn {
+ [dir="rtl"] .region-footer-first,
+ [dir="rtl"] .region-footer-second,
+ [dir="rtl"] .region-footer-third,
+ [dir="rtl"] .region-footer-fourth {
float: right;
}
.layout-two-sidebars #content {
@@ -228,10 +228,10 @@ body,
.region-triptych-last {
width: 33%;
}
- .region-footer-firstcolumn,
- .region-footer-secondcolumn,
- .region-footer-thirdcolumn,
- .region-footer-fourthcolumn {
+ .region-footer-first,
+ .region-footer-second,
+ .region-footer-third,
+ .region-footer-fourth {
box-sizing: border-box;
padding: 0 10px;
width: 25%;
@@ -243,4 +243,3 @@ body,
margin-top: 20px;
margin-bottom: 40px;
}
-
diff --git a/core/themes/bartik/templates/page.html.twig b/core/themes/bartik/templates/page.html.twig
index 518969a..10f6fc9 100644
--- a/core/themes/bartik/templates/page.html.twig
+++ b/core/themes/bartik/templates/page.html.twig
@@ -60,11 +60,11 @@
* - page.triptych_first: Items for the first triptych.
* - page.triptych_middle: Items for the middle triptych.
* - page.triptych_last: Items for the last triptych.
- * - page.footer_firstcolumn: Items for the first footer column.
- * - page.footer_secondcolumn: Items for the second footer column.
- * - page.footer_thirdcolumn: Items for the third footer column.
- * - page.footer_fourthcolumn: Items for the fourth footer column.
- * - page.footer: Items for the footer region.
+ * - page.footer_first: Items for the first footer column.
+ * - page.footer_second: Items for the second footer column.
+ * - page.footer_third: Items for the third footer column.
+ * - page.footer_fourth: Items for the fourth footer column.
+ * - page.footer_fifth: Items for the fifth footer column.
* - page.breadcrumb: Items for the breadcrumb region.
*
* @see template_preprocess_page()
@@ -171,19 +171,19 @@
</aside>
</div>
{% endif %}
- <div id="footer-wrapper">
- <footer class="section">
- {% if page.footer_firstcolumn or page.footer_secondcolumn or page.footer_thirdcolumn or page.footer_fourthcolumn %}
+ <div id="site-footer__wrapper">
+ <footer class="site-footer">
+ {% if page.footer_first or page.footer_second or page.footer_third or page.footer_fourth %}
<div id="footer-columns" class="clearfix">
- {{ page.footer_firstcolumn }}
- {{ page.footer_secondcolumn }}
- {{ page.footer_thirdcolumn }}
- {{ page.footer_fourthcolumn }}
+ {{ page.footer_first }}
+ {{ page.footer_second }}
+ {{ page.footer_third }}
+ {{ page.footer_fourth }}
</div>
{% endif %}
- {% if page.footer %}
- <div id="footer" role="contentinfo" class="clearfix">
- {{ page.footer }}
+ {% if page.footer_fifth %}
+ <div id="site-footer__bottom" role="contentinfo">
+ {{ page.footer_fifth }}
</div>
{% endif %}
</footer>