From 84c6b673c858549eef4643d6540b78ecc1b87814 Mon Sep 17 00:00:00 2001 From: Chris Van Date: Sat, 19 Nov 2011 02:39:54 -0500 Subject: [PATCH] fix footer on old devhub pages (bug 703775) --- media/css/impala/faux-zamboni.less | 7 + media/css/impala/footer.less | 9 +- media/css/zamboni/amo_headerfooter.css | 242 ------------------------- settings.py | 2 +- 4 files changed, 15 insertions(+), 245 deletions(-) delete mode 100644 media/css/zamboni/amo_headerfooter.css diff --git a/media/css/impala/faux-zamboni.less b/media/css/impala/faux-zamboni.less index 86945313a5..ad868f0a6c 100644 --- a/media/css/impala/faux-zamboni.less +++ b/media/css/impala/faux-zamboni.less @@ -1,5 +1,12 @@ @import 'lib'; +@font-face { + font-family: 'MetaBlack'; + src: url('https://www.mozilla.org/img/fonts/MetaWebPro-Black.woff') format('woff'); + font-weight: bold; + font-style: normal; +} + /* >> The Magnificent CLEARFIX << Lifted from html5boilerplate.com License is Public domain */ diff --git a/media/css/impala/footer.less b/media/css/impala/footer.less index ebb4cd2b66..9d177e1746 100644 --- a/media/css/impala/footer.less +++ b/media/css/impala/footer.less @@ -49,7 +49,7 @@ url(../../img/impala/footer-logo.png) center center no-repeat; } #copyright { - margin-left: 17px; + margin: 0 17px; } .footerlogo { @@ -89,6 +89,7 @@ url(../../img/impala/footer-logo.png) center center no-repeat; } #footer-menu { display: table; + margin: 0 17px; width: 70%; ul { display: table-row; @@ -146,10 +147,14 @@ url(../../img/impala/footer-logo.png) center center no-repeat; } #footer.footer-condensed { + min-height: 106px; .footer-wrap { background: url(../../img/zamboni/global/bg-footer.png) 0 -192px repeat-x; } .section { - padding: 20px 0 10px; + padding: 25px 0 15px; + } + #copyright { + padding: 0; } } diff --git a/media/css/zamboni/amo_headerfooter.css b/media/css/zamboni/amo_headerfooter.css deleted file mode 100644 index 18fd05324b..0000000000 --- a/media/css/zamboni/amo_headerfooter.css +++ /dev/null @@ -1,242 +0,0 @@ - -@font-face { - font-family: 'MetaBlack'; - src: url('https://www.mozilla.org/img/fonts/MetaWebPro-Black.woff') format('woff'); - font-weight: bold; - font-style: normal; -} - -body { - background: 0; - padding-top: 0; -} -/*---------------------------------- - Header -----------------------------------*/ - -#header { - height: 40px; - margin: 10px auto 0; - -moz-box-shadow: 0 3px rgba(0,0,0,0.1), inset 0 -2px rgba(0,0,0,0.1); - -webkit-box-shadow: 0 3px rgba(0,0,0,0.1), inset 0 -2px rgba(0,0,0,0.1); - box-shadow: 0 3px rgba(0,0,0,0.1), inset 0 -2px rgba(0,0,0,0.1); -} - -#header h1 a, -#header h1 a:link, -#header h1 a:visited { - height: 40px; - width: 95px; - background: url(../../img/zamboni/global/wordmark.png) 15px 4px no-repeat; -} - -#header h1 a:hover, -#header h1 a:active { - background: -moz-radial-gradient(center 45deg, ellipse closest-side, rgba(255,255,255,0.3) 0%, rgba(255,255,255,0) 100%), - url(../../img/zamboni/global/wordmark.png) 15px 4px no-repeat; - -moz-transition: background 0.2s ease-in-out; -} - -#nav-main ul li a, -#nav-main ul li span { - padding: 10px 15px 0 15px; - height: 30px; - font-size: 12px; -} - -.html-rtl #nav-main li ul { - left: auto; - right: -999em; -} - -#nav-main li:hover ul, -#nav-main li.sfhover ul { - margin-top: 40px; -} - -.html-rtl.no-js #nav-main li:hover ul, -.html-rtl #nav-main li.sfhover ul { - left: auto; - right: 0; - opacity: 1; -} - -#header a.mozilla { - display: block; - float: right; - font-size: 16px; - height: 40px; - line-height: 35px; - margin-right: 15px; - text-align: right; - width: auto; - padding-top: 0; -} - -#header a.mozilla span { - color: #fff; -} - -#nav-access { - display: none; -} - -.site-title { - padding-top: 16px; - max-width: 600px; - margin-bottom: 0; -} - -html[lang=it] .site-title a { - font-size: 32px; -} -html[lang=it] #nav-main a { - font-size: 11px; -} - -.site-title img { - vertical-align: bottom; -} - -.site-title strong { - color: #d64203; -} - -.sunbird #footer #copyright, -.seamonkey #footer #copyright, -.thunderbird #footer #copyright, -.developer-hub #footer #copyright { - clear: none; - padding-top: 20px; -} - -.sunbird #footer #footer-logo, -.seamonkey #footer #footer-logo, -.thunderbird #footer #footer-logo, -.editor-tools #footer #footer-logo, -.developer-hub #footer #footer-logo { - display: none; -} - -/*---------------------------------- - Footer -----------------------------------*/ - -#footer { - background: #33559b url(../../img/zamboni/global/bg-footer.png) 0 0 repeat-x; - padding: 123px 0 5px 0; -} - -#footer-logo a, -#footer-logo a:link, -#footer-logo a:visited { - background: url(../../img/zamboni/global/header-logos.png) 15px 0 no-repeat; -} - -#footer-logo a:hover, -#footer-logo a:active { - background: -moz-radial-gradient(center 45deg, ellipse closest-side, rgba(255,255,255,0.3) 0%, rgba(255,255,255,0) 100%), -url(../../img/zamboni/global/header-logos.png) 15px 0 no-repeat; -} - -#footer-contents[dir="rtl"] { - text-align: right; -} - -/* AMO-stuff */ - -.footerlogo { - position: absolute; - right: 25px; - top: -64px; -} - -.html-rtl .footerlogo { - right: auto; - left: 25px; -} - -.developer-hub .footerlogo { - right: -10px; - top: -70px; -} - -.html-rtl.developer-hub .footerlogo { - right: auto; - left: -10px; -} - -#footer .section { - min-height: 0; - padding-bottom: 20px; -} - -#footer-content { - margin-top: 10px; -} - -#footer-logo { - margin-left: 3px; - width: 10%; -} -#footer-menu { - display: table; - width: 70%; -} -#footer-menu ul { - display: table-row; -} -#footer-menu li { - display: table-cell; - width: 10%; - padding: 11px 16px 0 0; - float: none; -} - -.footer-devhub-link { - width: 25%; -} - -#social-footer { - height: 68px; - margin-bottom: 4px; - display: table; - font-size: 18px; - font-style: italic; - width: 80%; - color: white; -} - -#social-footer a:after { - content: ' \00bb'; -} - -#social-footer a:link, -#social-footer a:visited { - color: white; -} - -#social-footer ul { - display: table-row; -} - -#social-footer ul li { - display: table-cell; - vertical-align: middle; - text-align: center; -} - -#social-footer ul li:first-child { - line-height: 1.2em; - font-size: 17px; - width: 128px; -} - -#social-footer ul li:first-child b { - display: block; - font-family: MetaBlack; - font-style: normal; - font-size: 22px; - text-transform: uppercase; -} - diff --git a/settings.py b/settings.py index 344b66435a..f283f195e5 100644 --- a/settings.py +++ b/settings.py @@ -436,13 +436,13 @@ MINIFY_BUNDLES = { 'css/legacy/autocomplete.css', 'css/zamboni/zamboni.css', 'css/global/headerfooter.css', - 'css/zamboni/amo_headerfooter.css', 'css/zamboni/tags.css', 'css/zamboni/tabs.css', 'css/impala/formset.less', 'css/impala/suggestions.less', 'css/impala/header.less', 'css/impala/moz-tab.css', + 'css/impala/footer.less', 'css/impala/faux-zamboni.less', ), 'zamboni/impala': (