From 8504f42d588a6ee01116743bf76f6061d5649fd6 Mon Sep 17 00:00:00 2001 From: Matt Claypotch Date: Mon, 24 Jan 2011 00:30:08 -0800 Subject: [PATCH] Bug 625959, moving onto django-moz-header --- .gitmodules | 9 + media/css/global | 1 + media/css/global/headerfooter.css | 772 ------------------ media/css/zamboni/headerfooter.css | 366 +++++++++ media/js/global | 1 + media/js/zamboni/l10n.js | 5 +- settings.py | 3 +- templates/global | 1 + templates/{global => global.old}/footer.html | 0 templates/{global => global.old}/header.html | 0 .../{global => global.old}/menu_links.html | 0 templates/menu_links.html | 17 +- 12 files changed, 399 insertions(+), 776 deletions(-) create mode 160000 media/css/global delete mode 100644 media/css/global/headerfooter.css create mode 100644 media/css/zamboni/headerfooter.css create mode 160000 media/js/global create mode 160000 templates/global rename templates/{global => global.old}/footer.html (100%) rename templates/{global => global.old}/header.html (100%) rename templates/{global => global.old}/menu_links.html (100%) diff --git a/.gitmodules b/.gitmodules index ac9f49964a..19e5b04173 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,3 +4,12 @@ [submodule "lib/product_details/json"] path = lib/product_details/json url = git://github.com/jbalogh/mozilla-product-details.git +[submodule "templates/global"] + path = templates/global + url = git://github.com/mozilla/django-moz-header.git +[submodule "media/css/global"] + path = media/css/global + url = git://github.com/mozilla/django-moz-header.git +[submodule "media/js/global"] + path = media/js/global + url = git://github.com/mozilla/django-moz-header.git diff --git a/media/css/global b/media/css/global new file mode 160000 index 0000000000..52030a014e --- /dev/null +++ b/media/css/global @@ -0,0 +1 @@ +Subproject commit 52030a014e08a23e1e44df5ab66e44acd5b5731c diff --git a/media/css/global/headerfooter.css b/media/css/global/headerfooter.css deleted file mode 100644 index 63148740da..0000000000 --- a/media/css/global/headerfooter.css +++ /dev/null @@ -1,772 +0,0 @@ -#header:after, -.amo-header:after, -.header-search form:after { - content: "."; - display: block; - clear: both; - height: 0; - visibility: hidden; -} - - -@font-face { - font-family: 'MetaBlack'; - src: url('https://www.mozilla.com/img/fonts/MetaWebPro-Black.woff') format('woff'); - font-weight: bold; - font-style: normal; -} - -/*---------------------------------- - Header -----------------------------------*/ - -#header { - background: #33589f; - background: -webkit-gradient( - linear, - left bottom, - left top, - color-stop(0, rgb(42,65,135)), - color-stop(1, rgb(59,105,177)) - ); - background: -moz-linear-gradient( - center bottom, - rgb(42,65,135) 0%, - rgb(59,105,177) 100% - ); - background: linear-gradient( - center bottom, - rgb(42,65,135) 0%, - rgb(59,105,177) 100% - ); - height: 40px; - margin: 10px auto 0; - font-family: verdana; - -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); - -webkit-border-radius: 6px; - -moz-border-radius: 6px; - border-radius: 6px; - text-align: center; - filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#3B69B1', endColorstr='#2D488D',GradientType=0 ); /* ie */ -/* width: 980px;*/ -} - -#header h1 { - margin: 0; - float: left; - font-family: MetaBold; -} - -#header h1 a, -#header h1 a:link, -#header h1 a:visited { - display: block; - height: 40px; - width: 95px; - background: url(../../img/zamboni/global/wordmark.png) 15px 4px no-repeat; - text-indent: -9999px; - overflow: hidden; - -moz-transition: background 0.2s ease-in-out; -} - -#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 { - display: inline-block; - text-align: left; -} - -#nav-main, #nav-main ul, #nav-main li { - list-style: none; -} - -#nav-main ul { - float: left; - z-index: 99; - left: auto; - margin: 0; - padding: 0; -} - -#nav-main li { - float: left; - background: none; - margin: 0; - padding: 0; - position: relative; -} - -#nav-main a, -#nav-main span { - display: block; - color: #fff; - font-weight: bold; - font-size: 12px; -} - -#nav-main ul { - font-family: "Trebuchet MS", MetaBlack, sans-serif; -} - -#nav-main ul ul { - font-family: "Trebuchet MS", sans-serif; -} - -#nav-main ul { - border-right: 1px solid rgb(83,115,176); - border-left: 1px solid rgb(47,80,140); -} - -#nav-main ul { - border-right-color: rgba(255,255,255,0.15); - border-right-color: rgba(255,255,255,0.15); - border-left-color: rgba(0,0,0,0.2); -} - -#nav-main ul li a, -#nav-main ul li span { - padding: 10px 15px 0 15px; - height: 30px; - display: block; - float: left; - text-transform: uppercase; - border-left: 1px solid rgb(83,115,176); - border-right: 1px solid rgb(47,80,140); -} - -#nav-main ul li a { - border-left-color: rgba(255,255,255,0.15); - border-right-color: rgba(0,0,0,0.2); -} - -#nav-main li ul { - position: absolute; - left: -999em; - opacity: 0; -} - -.html-rtl #nav-main li ul { - position: absolute; - left: auto; - right: -999em; - opacity: 0; -} - -#nav-main li:hover ul, -#nav-main li.sfhover ul { - margin-top: 40px; - left: 0; - opacity: 1; - -moz-transition: opacity 0.2s ease-in-out; - -webkit-transition: opacity 0.2s ease-in-out; -} - -.html-rtl #nav-main li:hover ul, -.html-rtl #nav-main li.sfhover ul { - left: auto; - right: 0; -} - -#nav-main ul li ul li { - float: none; -} - -#nav-main ul li a, -#nav-main ul li a:link, -#nav-main ul li a:visited { - color: #fff; - text-decoration: none; - -moz-transition: background 0.2s linear; - -webkit-transition: background 0.2s linear; -} - -#nav-main ul li.current a, -#nav-main ul li.current a:link -#nav-main ul li.current a:visited { - -webkit-transition: none; -} - -#nav-main ul li a:hover, -#nav-main ul li a:active, -#nav-main ul li.current { - color: #fff; - background: #263c7b; - background: rgba(38,60,123,0.9); - -moz-transition: background 0.1s ease-in; - -webkit-transition: background 0.1s ease-in; -} - -#nav-main ul li li.current span, -#nav-main ul li li.current a, -#nav-main ul li li.current a:link, -#nav-main ul li li.current a:visited, -#nav-main ul li.current li a, -#nav-main ul li.current li a:link, -#nav-main ul li.current li a:visited { - height: auto; - -moz-box-shadow: none; - -webkit-box-shadow: none; - box-shadow: none; -} - -/*#nav-main ul li.current, -#nav-main ul li.current { - -moz-box-shadow: inset 0 -5px rgba(102,155,225,0.8); - -webkit-box-shadow: inset 0 -5px rgba(102,155,225,0.8); - box-shadow: inset 0 -5px rgba(102,155,225,0.8); -} -*/ -/*#nav-main ul li.current { - border-bottom: 4px solid #5784bf; - -moz-box-shadow: inset 0 -5px #669be1; - -webkit-box-shadow: inset 0 -5px #669be1; - box-shadow: inset 0 -5px #669be1; -} -*/ -#nav-main ul ul li.current { - border-bottom: 0; - -moz-box-shadow: none; - -webkit-box-shadow: none; - box-shadow: none; -} - -#nav-main ul ul, -#nav-main ul ul li { - height: auto; - border: 0; -} - -#nav-main ul ul { - border-top: 0; - padding: 0 0 4px 0; - width: 190px; - background: #263c7b; - background: rgba(38,60,123,0.9); - -webkit-border-bottom-right-radius: 4px; - -webkit-border-bottom-left-radius: 4px; - -moz-border-radius-bottomright: 4px; - -moz-border-radius-bottomleft: 4px; - border-bottom-right-radius: 4px; - border-bottom-left-radius: 4px; - -moz-box-shadow: 0 3px rgba(0,0,0,0.1), inset 0 -4px rgba(0,0,0,0.1), 0 5px 10px rgba(0,0,0,0.2); - -webkit-box-shadow: 0 3px rgba(0,0,0,0.1), inset 0 -4px rgba(0,0,0,0.1), 0 5px 10px rgba(0,0,0,0.2); - box-shadow: 0 3px rgba(0,0,0,0.1), inset 0 -4px rgba(0,0,0,0.1), 0 5px 10px rgba(0,0,0,0.2); - text-shadow: 1px 1px 0 #1b3b6a, 0 0 5px #1b3b6a; -} - -#nav-main ul li ul li a, -#nav-main ul li ul li a:link, -#nav-main ul li ul li a:visited, -#nav-main ul li ul li span { - padding: 5px 15px; - margin: 0; - height: auto; - float: none; - display: block; - font-size: 11px; - font-weight: normal; - border: 0; - background-image: none; - position: relative; - text-transform: none; - -moz-transition: background 0.1s ease-in; - -webkit-transition: background 0.1s ease-in; -} - -#nav-main ul li ul li a:hover, -#nav-main ul li ul li a:active { - background: #263c7b; - background: rgba(38,60,123,0.9); - padding-top: 4px; - padding-bottom: 4px; - border-bottom: 1px solid #496288; - border-top: 1px solid #162f55; - -moz-transition: background 0.1s ease-out; - -webkit-transition: background 0.1s ease-out; -} - -#header a.mozilla { - color: #a0c8da; - font-family: georgia, serif; - font-weight: normal; - font-style: italic; - float: right; - display: block; - text-align: right; - margin-right: 15px; - height: 40px; - line-height: 35px; - font-size: 16px; -} - -#header a.mozilla:hover, -#header a.mozilla:active { - text-decoration: none; - background: -moz-radial-gradient(center 45deg, ellipse closest-side, rgba(255,255,255,0.3) 0%, rgba(255,255,255,0) 100%); - -moz-transition: opacity 0.2s ease-in-out; - -webkit-transition: opacity 0.2s ease-in-out; -} - -#header a.mozilla span { - color: #fff; -} - -#nav-access { - display: none; -} - -.amo-header { - margin-top: 4px; - height: 128px; - font-family: Georgia; -} - -.amo-header a { - color: #3d6db5; -} - -/** Search */ - -div.header-search { - margin: 0; - width: 380px; - clear: right; - float: right; -} - -.html-rtl div.header-search { - clear: left; - float: left; -} - -div.header-search span.wrap { - width: 288px; -} - -div.header-search form { - margin: 0; - border-radius: 6px; - -moz-border-radius: 6px; - -webkit-border-radius: 6px; - padding: 6px; -} - -div.header-search span.wrap { - background: #fff url(../../img/zamboni/global/icon-search.png) no-repeat 7px center; - border-radius: 5px; - -moz-border-radius: 5px; - -webkit-border-radius: 5px; - float: left; - padding: 2px 0 0 36px; -} - -div.header-search input.text { - border: none; - outline: none; - box-shadow: none; - font-size: 16px; - width: 270px; - height: 26px; - line-height: 25px; -} - -div.header-search input.submit { - box-shadow: none; - float: left; - height: 33px; - margin: 0 0 0 6px; - width: 37px; -} - -#masthead { - position: absolute; -} - -.site-title { - padding-top: 16px; - max-width: 512px; - margin-bottom: 0; - display: inline-block; -} - -.site-title a, -.site-title a:visited, -.site-title a:hover, -.site-title a:focus { - font-family: MetaBlack, 'Trebuchet MS', sans-serif; - font-weight: bold; - color: #444; - font-size: 48px; - line-height: 60px; - text-decoration: none; - text-transform: uppercase; - vertical-align: top; -} - -.developer-hub .site-title { - padding-top:36px; -} - -.developer-hub .site-title small { - display: block; - padding-left: 3px; -} - -.developer-hub .site-title small:first-child { - margin-top: -20px; -} - -.developer-hub .site-title strong { - display: block; - line-height: 40px; - font-size: 48px; -} - -.developer-hub .site-title a { - font-size: 32px; - line-height: 40px; -} - -.developer-hub .header-search { - margin-top: 12px; -} - -.developer-hub .site-title a { - font-size: 32px; - line-height: 40px; -} - -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; -} - -#minimal-header a.mozilla { - -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); - -moz-border-radius: 0 0 6px 6px; - -webkit-border-radius: 0 0 6px 6px; - color: #a0c8da; - border-radius: 0 0 6px 6px; - margin: 0 0 0 16px; - float: right; - padding: 5px 14px; - line-height: 19px; - font-family: georgia, serif; - font-size: 15px; - font-style: italic; - position: relative; - top: -6px; -} - -.html-rtl #minimal-header a.mozilla { - float: left; - margin: 0 16px 0 0; -} - -#minimal-header a.mozilla span { - color: #fff; -} - -.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, -.developer-hub #footer #footer-logo { - display: none; -} - -/*---------------------------------- - Footer -----------------------------------*/ - -#footer { - background: #33559b url(../../img/zamboni/global/bg-footer.png) 0 0 repeat-x; - clear: both; - color: #476FBE; - display: block; - font-family: Georgia, serif; - min-width: 978px; - padding: 123px 0 5px 0; -} - -#footer-logo a, -#footer-logo a:link, -#footer-logo a:visited { - display: block; - height: 57px; - width: 110px; - background: url(../../img/zamboni/global/header-logos.png) 15px 0 no-repeat; - text-indent: -200px; - overflow: hidden; - -moz-transition: background 0.2s ease-in-out; -} - -#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; - -moz-transition: background 0.2s ease-in-out; -} - -#footer a:link, -#footer a:visited { - color: #669BE1; - text-decoration: none; -} - -#footer a:hover, -#footer a:active { - color: #fff; - text-decoration: underline; -} - -#footer-contents { - margin: auto; - text-align: left; - width: 980px; -} - -#footer-contents[dir="rtl"] { - text-align: right; -} - -#footer-logo { - display: inline; - float: left; - margin: 0 50px 0 10px; -} - -#footer-logo a, -#footer-logo a:link, -#footer-logo a:visited { - font-size: 28px; - padding: 0; -} - -#footer-menu, -#footer-menu ul { - left: auto; - list-style: none; - margin: 0; - padding: 0; -} - -#footer-menu li { - background: none; - display: inline; - float: left; - font-weight: bold; - list-style-type: none; - margin: 15px 10px 0 0; - padding: 0; - position: relative; - width: 115px; -} - -#footer-menu li a, -#footer-menu li a:link, -#footer-menu li a:visited, -#footer #lang_form label { - color: #fff; - font-family: MetaBlack, "Trebuchet MS", sans-serif; - font-size: 14px; - font-weight: bold; - text-transform: uppercase; -} - -#footer li li a:link, -#footer li li a:visited { - color: #669BE1; - font-family: Georgia, serif; - font-size: 12px; - font-weight: normal; - text-transform: none; -} - -#footer li li a:hover, -#footer li li a:active { - color: #fff; -} - -#footer-menu ul li ul { - margin: 4px 0 15px; -} - -#footer-menu li.last { - margin-right: 0; -} - -#footer-menu ul ul li { - display: block; - float: none; - font-weight: normal; - margin: 0; - padding: 0 0 0.3em; - width: auto; -} - -#footer #footer-right { - float: right; - width: 180px; -} - -#footer #lang_form { - margin: 0 0 15px 27px; -} - -#footer #lang_form label { - display: block; - margin: 10px 0 4px; -} - -#footer #lang_form select { - font-family: sans-serif; - font-size: 11px; - width: 140px; -} - -#footer #lang_form div { - display: inline; -} - -#footer #copyright { - clear: both; -} - -#footer #copyright p { - font-size: 85%; - margin-bottom: 0.5em; -} - -#footer #copyright a:hover, -#footer #copyright a:active { - text-decoration: underline; -} - -#footer #footer-links { - font-size: 85%; -} - -/* 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/media/css/zamboni/headerfooter.css b/media/css/zamboni/headerfooter.css new file mode 100644 index 0000000000..a7933b1473 --- /dev/null +++ b/media/css/zamboni/headerfooter.css @@ -0,0 +1,366 @@ +.amo-header:after, +.header-search form:after { + content: "."; + display: block; + clear: both; + height: 0; + visibility: hidden; +} + + +@font-face { + font-family: 'MetaBlack'; + src: url('https://www.mozilla.com/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 { + position: absolute; + left: auto; + right: -999em; + opacity: 0; +} + +#nav-main li:hover ul, +#nav-main li.sfhover ul { + margin-top: 40px; +} + +.html-rtl #nav-main li:hover ul, +.html-rtl #nav-main li.sfhover ul { + left: auto; + right: 0; +} + +#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; +} + +.amo-header { + margin-top: 4px; + height: 128px; + font-family: Georgia; +} + +.amo-header a { + color: #3d6db5; +} + +/** Search */ + +div.header-search { + margin: 0; + width: 380px; + clear: right; + float: right; +} + +.html-rtl div.header-search { + clear: left; + float: left; +} + +div.header-search span.wrap { + width: 288px; +} + +div.header-search form { + margin: 0; + border-radius: 6px; + -moz-border-radius: 6px; + -webkit-border-radius: 6px; + padding: 6px; +} + +div.header-search span.wrap { + background: #fff url(../../img/zamboni/global/icon-search.png) no-repeat 7px center; + border-radius: 5px; + -moz-border-radius: 5px; + -webkit-border-radius: 5px; + float: left; + padding: 2px 0 0 36px; +} + +div.header-search input.text { + border: none; + outline: none; + box-shadow: none; + font-size: 16px; + width: 270px; + height: 26px; + line-height: 25px; +} + +div.header-search input.submit { + box-shadow: none; + float: left; + height: 33px; + margin: 0 0 0 6px; + width: 37px; +} + +#masthead { + position: absolute; +} + +.site-title { + padding-top: 16px; + max-width: 512px; + margin-bottom: 0; + display: inline-block; +} + +.site-title a, +.site-title a:visited, +.site-title a:hover, +.site-title a:focus { + font-family: MetaBlack, 'Trebuchet MS', sans-serif; + font-weight: bold; + color: #444; + font-size: 48px; + line-height: 60px; + text-decoration: none; + text-transform: uppercase; + vertical-align: top; +} + +.developer-hub .site-title { + padding-top:36px; +} + +.developer-hub .site-title small { + display: block; + padding-left: 3px; +} + +.developer-hub .site-title small:first-child { + margin-top: -20px; +} + +.developer-hub .site-title strong { + display: block; + line-height: 40px; + font-size: 48px; +} + +.developer-hub .site-title a { + font-size: 32px; + line-height: 40px; +} + +.developer-hub .header-search { + margin-top: 12px; +} + +.developer-hub .site-title a { + font-size: 32px; + line-height: 40px; +} + +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, +.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/media/js/global b/media/js/global new file mode 160000 index 0000000000..6affd2086b --- /dev/null +++ b/media/js/global @@ -0,0 +1 @@ +Subproject commit 6affd2086b4e5580901fbc5831f19f5f1959d90c diff --git a/media/js/zamboni/l10n.js b/media/js/zamboni/l10n.js index ba1dbce08e..362768095c 100644 --- a/media/js/zamboni/l10n.js +++ b/media/js/zamboni/l10n.js @@ -87,7 +87,7 @@ $(document).ready(function () { function switchLocale(e) { e.preventDefault(); $tgt = $(this); - var new_locale = $tgt.attr("data-lang") ||$tgt.attr("href").substring(1); + var new_locale = $tgt.attr("data-lang") || $tgt.attr("href").substring(1); var unsaved = $("form .trans .unsaved"); if (unsaved.length) { unsavedModal.children(".msg") @@ -197,6 +197,7 @@ $(document).ready(function () { if ($el.children(".trans-init").length) { var $ni = $el.children(".trans-init").clone(); $ni.attr({ + "class": "", lang: lang, id: format('id_{0}_{1}', field, lang), name: [field,lang].join('_'), @@ -206,7 +207,7 @@ $(document).ready(function () { } else { var $ni = $el.find(format("[lang={0}]",dl)).clone(); $ni.attr({ - 'class': "cloned", + "class": "cloned", lang: lang }); } diff --git a/settings.py b/settings.py index 92c98a51db..409f9b0f61 100644 --- a/settings.py +++ b/settings.py @@ -358,9 +358,10 @@ MINIFY_BUNDLES = { 'css/legacy/jquery-lightbox.css', 'css/legacy/autocomplete.css', 'css/zamboni/zamboni.css', + 'css/global/headerfooter.css', + 'css/zamboni/headerfooter.css', 'css/zamboni/tags.css', 'css/zamboni/tabs.css', - 'css/global/headerfooter.css', ), 'zamboni/discovery-pane': ( 'css/zamboni/discovery-pane.css', diff --git a/templates/global b/templates/global new file mode 160000 index 0000000000..52030a014e --- /dev/null +++ b/templates/global @@ -0,0 +1 @@ +Subproject commit 52030a014e08a23e1e44df5ab66e44acd5b5731c diff --git a/templates/global/footer.html b/templates/global.old/footer.html similarity index 100% rename from templates/global/footer.html rename to templates/global.old/footer.html diff --git a/templates/global/header.html b/templates/global.old/header.html similarity index 100% rename from templates/global/header.html rename to templates/global.old/header.html diff --git a/templates/global/menu_links.html b/templates/global.old/menu_links.html similarity index 100% rename from templates/global/menu_links.html rename to templates/global.old/menu_links.html diff --git a/templates/menu_links.html b/templates/menu_links.html index 9fe60ef25c..533754834c 100644 --- a/templates/menu_links.html +++ b/templates/menu_links.html @@ -1,3 +1,18 @@ {% extends "global/menu_links.html" %} -{% block amo_class %}current{% endblock %} \ No newline at end of file +{% block amo_links %} +
  • {{ _('Add-ons') }} + +
    • +{% endblock %}