diff --git a/cms/static/sass/elements/_footer.scss b/cms/static/sass/elements/_footer.scss index 31b95dec44..2cc6eff83b 100644 --- a/cms/static/sass/elements/_footer.scss +++ b/cms/static/sass/elements/_footer.scss @@ -16,10 +16,14 @@ margin: 0 auto; color: $gray-l1; + .footer-content-primary { + @include clearfix(); + } + .colophon { width: flex-grid(4, 12); - float: left; - margin-right: flex-gutter(2); + @include float(left); + @include margin-right(flex-gutter(2)); } a { @@ -32,15 +36,15 @@ .nav-peripheral { width: flex-grid(6, 12); - float: right; - text-align: right; + @include float(right); + @include text-align(right); .nav-item { display: inline-block; - margin-right: ($baseline/4); + @include margin-right($baseline/4); &:last-child { - margin-right: 0; + @include margin-right(0); } a { @@ -53,10 +57,47 @@ @extend %t-action3; display: inline-block; vertical-align: middle; - margin-right: ($baseline/4); + @include margin-right($baseline/4); } } } } + + .footer-content-secondary { + @include clearfix(); + margin-top: $baseline; + } + + .footer-about-copyright, .footer-about-openedx { + display: inline-block; + vertical-align: middle; + } + + // platform trademarks + .footer-about-copyright { + width: flex-grid(4, 12); + @include float(left); + @include margin-right(flex-gutter(2)); + } + + // platform Open edX logo and link + .footer-about-openedx { + @include float(right); + width: flex-grid(3,12); + @include text-align(right); + + a { + display: inline-block; + + img { + display: block; + width: ($baseline* 6); + } + + &:hover { + border-bottom: none; + } + } + } } } diff --git a/cms/templates/widgets/footer.html b/cms/templates/widgets/footer.html index cfaa16dbcf..ae75880557 100644 --- a/cms/templates/widgets/footer.html +++ b/cms/templates/widgets/footer.html @@ -3,33 +3,47 @@
diff --git a/lms/static/sass/shared/_footer.scss b/lms/static/sass/shared/_footer.scss index 0734248493..e40c21f1f1 100644 --- a/lms/static/sass/shared/_footer.scss +++ b/lms/static/sass/shared/_footer.scss @@ -159,7 +159,7 @@ } // platform Open edX logo and link - .powered-by { + .footer-about-openedx { @include float(right); width: flex-grid(3,12); display: inline-block; @@ -307,14 +307,35 @@ $edx-footer-bg-color: rgb(252,252,252); @extend %edx-footer-title; } - .footer-about-logo { + .footer-about-logo, .footer-about-openedx { margin-bottom: $edx-footer-spacing; + + img { + height: 47px; + } + + a { + display: block; + + &:hover { + border-bottom: 0; + } + } + } + + .footer-about-logo { + @include float(left); + } + + .footer-about-openedx-logo { + @include float(right); } .footer-about-copy { @extend %t-copy-sub1; margin-bottom: $edx-footer-spacing; color: rgb(61, 62, 63); + clear: both; p { // NOTE: needed for poor LMS span styling diff --git a/lms/templates/footer-edx-new.html b/lms/templates/footer-edx-new.html index af6a9a0c91..5072e66700 100644 --- a/lms/templates/footer-edx-new.html +++ b/lms/templates/footer-edx-new.html @@ -43,6 +43,12 @@

+
+ + ${_( + +
+
${_("Terms of Service and Honor Code")} ${_("Privacy Policy")} diff --git a/lms/templates/footer.html b/lms/templates/footer.html index 32408fa163..14a90ef741 100644 --- a/lms/templates/footer.html +++ b/lms/templates/footer.html @@ -91,16 +91,16 @@
## please leave this link and use one of the logos provided -
+

## standard powered-by logo ## Translators: 'Open edX' is a brand, please keep this untranslated. See http://openedx.org for more information. - ${_('Powered by Open edX')} + ${_('Powered by Open edX')} ## greyscale logo for dark background - ## ${_('Powered by Open edX')} + ## ${_('Powered by Open edX')} ## greyscale logo for light background - ## ${_('Powered by Open edX')} + ## ${_('Powered by Open edX')}