From 67168869f5edf94924f94c456d260bf0a21b715c Mon Sep 17 00:00:00 2001 From: Brian Talbot Date: Fri, 13 Feb 2015 11:32:54 -0500 Subject: [PATCH] Adjust styling for Open edX footer details --- cms/static/sass/elements/_footer.scss | 40 ++++++++++++---- cms/templates/widgets/footer.html | 67 +++++++++++++++------------ lms/static/sass/shared/_footer.scss | 4 +- lms/templates/footer.html | 8 ++-- 4 files changed, 76 insertions(+), 43 deletions(-) diff --git a/cms/static/sass/elements/_footer.scss b/cms/static/sass/elements/_footer.scss index 931c6d7aa9..48cddf308b 100644 --- a/cms/static/sass/elements/_footer.scss +++ b/cms/static/sass/elements/_footer.scss @@ -16,9 +16,13 @@ margin: 0 auto; color: $gray-l1; + .footer-content-primary { + @include clearfix(); + } + .colophon { width: flex-grid(4, 12); - float: left; + @include float(left); margin-right: flex-gutter(2); } @@ -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 { @@ -59,17 +63,37 @@ } } + .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); + margin-right: flex-gutter(2); + } + // platform Open edX logo and link - .powered-by { + .footer-about-openedx { @include float(right); width: flex-grid(3,12); - display: inline-block; - vertical-align: bottom; @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 aeb3aba10e..ae75880557 100644 --- a/cms/templates/widgets/footer.html +++ b/cms/templates/widgets/footer.html @@ -3,37 +3,46 @@
-
-

© ${settings.COPYRIGHT_YEAR} ${settings.PLATFORM_NAME}.

- ## Site operators: Please do not remove this paragraph! This attributes back to edX and makes your acknowledgement of edX's trademarks clear. -

- ## Translators: 'EdX', 'edX', 'Studio', and 'Open edX' are trademarks of 'edX Inc.'. Please do not translate any of these trademarks and company names. - ${_("EdX, Open edX, Studio, and the edX and Open edX logos are registered trademarks or trademarks of {link_start}edX Inc.{link_end}").format( - link_start=u"", - link_end=u"" - )} -

+ +
+
+

© ${settings.COPYRIGHT_YEAR} ${settings.PLATFORM_NAME}.

+
+ +
- -
- - ${_( - +
+
+ ## Site operators: Please do not remove this paragraph! This attributes back to edX and makes your acknowledgement of edX's trademarks clear. +

+ ## Translators: 'EdX', 'edX', 'Studio', and 'Open edX' are trademarks of 'edX Inc.'. Please do not translate any of these trademarks and company names. + ${_("EdX, Open edX, Studio, and the edX and Open edX logos are registered trademarks or trademarks of {link_start}edX Inc.{link_end}").format( + link_start=u"", + link_end=u"" + )} +

+
+ +
+ + ${_( + +
diff --git a/lms/static/sass/shared/_footer.scss b/lms/static/sass/shared/_footer.scss index e2b8d25a25..e6024f6318 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,7 +307,7 @@ $edx-footer-bg-color: rgb(252,252,252); @extend %edx-footer-title; } - .footer-about-logo, .footer-about-openedx-logo { + .footer-about-logo, .footer-about-openedx { margin-bottom: $edx-footer-spacing; img { 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')}