From 89252ec12d0af8cef8a0c45ce7f3ff0205f27162 Mon Sep 17 00:00:00 2001 From: David Baumgold Date: Thu, 22 Jan 2015 12:59:18 -0500 Subject: [PATCH 1/4] Put Open edX logo in LMS edx.org footer --- lms/static/sass/shared/_footer.scss | 23 ++++++++++++++++++++++- lms/templates/footer-edx-new.html | 6 ++++++ 2 files changed, 28 insertions(+), 1 deletion(-) diff --git a/lms/static/sass/shared/_footer.scss b/lms/static/sass/shared/_footer.scss index 0734248493..e2b8d25a25 100644 --- a/lms/static/sass/shared/_footer.scss +++ b/lms/static/sass/shared/_footer.scss @@ -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-logo { margin-bottom: $edx-footer-spacing; + + img { + height: 47px; + } + + a { + display: block; + + &:hover { + border-bottom: 0; + } + } + } + + .footer-about-logo { + float: left; + } + + .footer-about-openedx-logo { + 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")} From 8abfe4a850bffdb9dcfc3b93604795a92342c62a Mon Sep 17 00:00:00 2001 From: David Baumgold Date: Mon, 9 Feb 2015 09:51:58 -0500 Subject: [PATCH 2/4] Put Open edX logo in CMS footer --- cms/static/sass/elements/_footer.scss | 17 +++++++++++++++++ cms/templates/widgets/footer.html | 5 +++++ 2 files changed, 22 insertions(+) diff --git a/cms/static/sass/elements/_footer.scss b/cms/static/sass/elements/_footer.scss index 31b95dec44..931c6d7aa9 100644 --- a/cms/static/sass/elements/_footer.scss +++ b/cms/static/sass/elements/_footer.scss @@ -58,5 +58,22 @@ } } } + + // platform Open edX logo and link + .powered-by { + @include float(right); + width: flex-grid(3,12); + display: inline-block; + vertical-align: bottom; + @include text-align(right); + + a { + display: inline-block; + + &:hover { + border-bottom: none; + } + } + } } } diff --git a/cms/templates/widgets/footer.html b/cms/templates/widgets/footer.html index cfaa16dbcf..aeb3aba10e 100644 --- a/cms/templates/widgets/footer.html +++ b/cms/templates/widgets/footer.html @@ -30,6 +30,11 @@ % endif +
+ + ${_( + +
From 67168869f5edf94924f94c456d260bf0a21b715c Mon Sep 17 00:00:00 2001 From: Brian Talbot Date: Fri, 13 Feb 2015 11:32:54 -0500 Subject: [PATCH 3/4] 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')}

From d66bb883acc1abf05f5207dae98e1f8b7bd20b70 Mon Sep 17 00:00:00 2001 From: Sarina Canelake Date: Wed, 25 Mar 2015 15:36:58 -0400 Subject: [PATCH 4/4] Fix footer stylings for RTL --- cms/static/sass/elements/_footer.scss | 6 +++--- lms/static/sass/shared/_footer.scss | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cms/static/sass/elements/_footer.scss b/cms/static/sass/elements/_footer.scss index 48cddf308b..2cc6eff83b 100644 --- a/cms/static/sass/elements/_footer.scss +++ b/cms/static/sass/elements/_footer.scss @@ -23,7 +23,7 @@ .colophon { width: flex-grid(4, 12); @include float(left); - margin-right: flex-gutter(2); + @include margin-right(flex-gutter(2)); } a { @@ -57,7 +57,7 @@ @extend %t-action3; display: inline-block; vertical-align: middle; - margin-right: ($baseline/4); + @include margin-right($baseline/4); } } } @@ -77,7 +77,7 @@ .footer-about-copyright { width: flex-grid(4, 12); @include float(left); - margin-right: flex-gutter(2); + @include margin-right(flex-gutter(2)); } // platform Open edX logo and link diff --git a/lms/static/sass/shared/_footer.scss b/lms/static/sass/shared/_footer.scss index e6024f6318..e40c21f1f1 100644 --- a/lms/static/sass/shared/_footer.scss +++ b/lms/static/sass/shared/_footer.scss @@ -324,11 +324,11 @@ $edx-footer-bg-color: rgb(252,252,252); } .footer-about-logo { - float: left; + @include float(left); } .footer-about-openedx-logo { - float: right; + @include float(right); } .footer-about-copy {