summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAaron Dudenhofer2013-02-12 15:28:55 (GMT)
committer Aaron Dudenhofer2013-02-12 15:28:55 (GMT)
commit87f746d98e9218768dd4ad094f0efa107815a112 (patch)
tree64c41f17c5aef4235d46a9962bab25c0979f0f21
parent8f203d6880c3e975e868b012b864cc4cf61a361a (diff)
Issue #1789672 by bojanz: adding footer region in place of coded logos
-rw-r--r--css/shiny-rtl.css6
-rw-r--r--css/shiny.css13
-rw-r--r--css/style-rtl.css4
-rw-r--r--css/style.css2
-rw-r--r--scss/shiny-rtl.scss4
-rw-r--r--scss/shiny.scss12
-rw-r--r--scss/style-rtl.scss4
-rw-r--r--scss/style.scss2
-rw-r--r--shiny.info1
-rw-r--r--template.php6
-rw-r--r--templates/maintenance-page.tpl.php2
-rw-r--r--templates/page.tpl.php15
12 files changed, 39 insertions, 32 deletions
diff --git a/css/shiny-rtl.css b/css/shiny-rtl.css
index 25c4f28..f8e6af4 100644
--- a/css/shiny-rtl.css
+++ b/css/shiny-rtl.css
@@ -36,7 +36,7 @@ input.form-radio + label::before {
}
/* Targeting Webkit browsers only. FF will show the dropdown arrow with so much padding. */
-@media screen and (-webkit-min-device-pixel-ratio:0) {
+@media screen and (-webkit-min-device-pixel-ratio: 0) {
select.form-select {
padding: 5px 5px 5px 35px;
background: white url("../images/drop-filter-rtl.png") no-repeat left center;
@@ -86,6 +86,10 @@ input.form-radio + label::before {
padding: 0 10px 0 0;
}
+#powered_by_drupal_commerce {
+ float: right;
+}
+
#credit {
float: left;
/* CG Logo on White */
diff --git a/css/shiny.css b/css/shiny.css
index 3c2e35e..1bd4476 100644
--- a/css/shiny.css
+++ b/css/shiny.css
@@ -630,23 +630,24 @@ h1#overlay-title {
padding-bottom: .9em;
}
-.footer-messages {
+#footer {
border-top: 1px solid #efefef;
clear: both;
font: normal 13px/13px "Open Sans", Arial, sans-serif;
margin: 0 40px;
}
-body.in-maintenance .footer-messages {
+body.in-maintenance #footer {
border: 0;
margin: 0 auto;
width: 960px;
}
-#overlay #overlay-content .footer-messages {
+#overlay #overlay-content #footer {
border-top: 0;
color: #fff;
- margin: 0;
+ margin: 0 0 0 -8px;
+ padding: 0 8px;
position: absolute;
top: 100%;
width: 100%;
@@ -658,7 +659,9 @@ body.in-maintenance .footer-messages {
padding: 20px 0 40px;
}
-#powered {
+#powered_by_drupal_commerce {
+ float: left;
+ /* LTR */
padding-top: 20px;
}
diff --git a/css/style-rtl.css b/css/style-rtl.css
index 343171c..debdc1b 100644
--- a/css/style-rtl.css
+++ b/css/style-rtl.css
@@ -23,10 +23,6 @@ ol {
margin: 0.25em 2em 0.25em 0;
}
-#powered {
- float: left;
-}
-
/**
* Skip link.
*/
diff --git a/css/style.css b/css/style.css
index 8eee837..c8fb7fb 100644
--- a/css/style.css
+++ b/css/style.css
@@ -1056,7 +1056,7 @@ ol.task-list li.done {
.overlay #branding h1.page-title,
.overlay #left,
-.overlay #footer {
+.overlay #feed-icons {
display: none;
}
diff --git a/scss/shiny-rtl.scss b/scss/shiny-rtl.scss
index 4222850..aa0653e 100644
--- a/scss/shiny-rtl.scss
+++ b/scss/shiny-rtl.scss
@@ -91,7 +91,9 @@ input.form-radio + label::before {
padding: 0 10px 0 0;
}
}
-
+#powered_by_drupal_commerce {
+ float: right;
+}
#credit {
float: left;
diff --git a/scss/shiny.scss b/scss/shiny.scss
index 5df0b0a..e5239d3 100644
--- a/scss/shiny.scss
+++ b/scss/shiny.scss
@@ -532,21 +532,22 @@ h1#overlay-title {
#overlay-titlebar .add-or-remove-shortcuts {
padding-bottom: .9em;
}
-.footer-messages {
+#footer {
border-top: 1px solid #efefef;
clear: both;
font: normal 13px/13px "Open Sans", Arial, sans-serif;
margin: 0 40px;
}
-body.in-maintenance .footer-messages {
+body.in-maintenance #footer {
border: 0;
margin: 0 auto;
width: 960px;
}
-#overlay #overlay-content .footer-messages {
+#overlay #overlay-content #footer {
border-top: 0;
color: #fff;
- margin: 0;
+ margin: 0 0 0 -8px;
+ padding: 0 8px;
position: absolute;
top: 100%;
width: 100%;
@@ -555,7 +556,8 @@ body.in-maintenance .footer-messages {
float: right; /* LTR */
padding: 20px 0 40px;
}
-#powered {
+#powered_by_drupal_commerce {
+ float: left; /* LTR */
padding-top: 20px;
}
body.in-maintenance #credit {
diff --git a/scss/style-rtl.scss b/scss/style-rtl.scss
index 174e5b3..9e0ca20 100644
--- a/scss/style-rtl.scss
+++ b/scss/style-rtl.scss
@@ -21,10 +21,6 @@ ol {
margin: 0.25em 2em 0.25em 0;
}
-#powered {
- float: left;
-}
-
/**
* Skip link.
*/
diff --git a/scss/style.scss b/scss/style.scss
index 0309d62..aebe903 100644
--- a/scss/style.scss
+++ b/scss/style.scss
@@ -866,7 +866,7 @@ ol.task-list li.done {
}
.overlay #branding h1.page-title,
.overlay #left,
-.overlay #footer {
+.overlay #feed-icons {
display: none;
}
.overlay #page {
diff --git a/shiny.info b/shiny.info
index a531462..97796c5 100644
--- a/shiny.info
+++ b/shiny.info
@@ -14,5 +14,6 @@ regions[help] = Help
regions[page_top] = Page top
regions[page_bottom] = Page bottom
regions[sidebar_first] = First sidebar
+regions[footer] = Footer
regions_hidden[] = sidebar_first
diff --git a/template.php b/template.php
index 32de6a1..a9eb163 100644
--- a/template.php
+++ b/template.php
@@ -138,3 +138,9 @@ function shiny_preprocess_overlay(&$variables) {
$variables['breadcrumb'] = theme('breadcrumb', array('breadcrumb' => drupal_get_breadcrumb()));
}
}
+
+function shiny_system_info_alter(&$info, $file, $type) {
+ if ($type == 'theme') {
+ $info['overlay_regions'][] = 'footer';
+ }
+}
diff --git a/templates/maintenance-page.tpl.php b/templates/maintenance-page.tpl.php
index afdf66f..3e20c1a 100644
--- a/templates/maintenance-page.tpl.php
+++ b/templates/maintenance-page.tpl.php
@@ -43,7 +43,7 @@
</div>
</div>
</div>
- <div class="footer-messages clearfix">
+ <div id="footer" class="footer-messages clearfix">
<div id="credit" class="clearfix">
<div class="message">Proudly built by</div>
<div class="logo"><a href="http://commerceguys.com">Commerce Guys</a></div>
diff --git a/templates/page.tpl.php b/templates/page.tpl.php
index fd40e3d..0121859 100644
--- a/templates/page.tpl.php
+++ b/templates/page.tpl.php
@@ -28,17 +28,14 @@
<?php print render($page['content']); ?>
</div>
- <div id="footer">
+ <div id="feed-icons">
<?php print $feed_icons; ?>
</div>
</div>
- <div class="footer-messages clearfix">
- <div id="credit" class="clearfix">
- <div class="message">Proudly built by</div>
- <div class="logo"><a href="http://commerceguys.com">Commerce Guys</a></div>
- </div>
- <div id="powered">
- Powered by <a href="http://drupalcommerce.org">Drupal Commerce</a>
- </div>
+ <?php if ($page['footer']):?>
+ <div id="footer">
+ <?php print render($page['footer']);?>
+ </div>
+ <?php endif;?>
</div>