diff --git a/css/shiny-rtl.css b/css/shiny-rtl.css index 25c4f28e8c0ee8b14af16daa93fb18b5ffe4d7cb..f8e6af4fa9e89f2e1e7d6ab5a1d6c56a4969dfe7 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 3c2e35ea434c6e90f58e13e1897bb994b7e59f3e..1bd44762da6aceba2f6880f5d1cb91855c2c7194 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 343171cc65392a3845bcbd88eb42efee0634d462..debdc1bb4634fb5760fb2cd57c356d699229e288 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 8eee8370bb0c52fd84316eaf279fb3db7146dd62..c8fb7fb656a314efb79590d91a8cef5c87763697 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 4222850113ff507daf4456ef8783197043d12b2d..aa0653e9dfd2d9c79a108d4fe78ebd4e5499bae5 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 5df0b0ad7c494be3f32c6b61c231ee88f497594d..e5239d347161e022a90e4e2b53340bf8e68d0cea 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 174e5b3b542e527498eaab622c56e080089694dd..9e0ca207f7e5168858bb80b0d43534807ff769ee 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 0309d62f7c8b75c2a4d051774ca39ee9a623af18..aebe9037f1a392b7b46ca35ab09841869d96105f 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 a531462745b85f8e11e06b581fffc131c8b8006d..97796c5992eec656a5a852192192e35f64566ae9 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 32de6a1d6233cbafb041a0fd560ad993da06b8f9..a9eb163e3a7b683caa35f736b1eb68af2fc4f485 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 afdf66f802951037571e24c5ee25de1756254257..3e20c1ad3a76f0b60ed24510dc95b6f082fce2ca 100644 --- a/templates/maintenance-page.tpl.php +++ b/templates/maintenance-page.tpl.php @@ -43,7 +43,7 @@ -
+