diff --git a/cms/templates/cms/program_page.html b/cms/templates/cms/program_page.html index c938e6d746..118ccb3f55 100644 --- a/cms/templates/cms/program_page.html +++ b/cms/templates/cms/program_page.html @@ -152,7 +152,7 @@

{% if page.program.has_mitxonline_courses %} {% else %} diff --git a/static/images/favicon.ico b/static/images/favicon.ico index 67203a5c95..95d530203d 100644 Binary files a/static/images/favicon.ico and b/static/images/favicon.ico differ diff --git a/static/images/logo-micromasters.png b/static/images/logo-micromasters.png deleted file mode 100644 index d469b751ca..0000000000 Binary files a/static/images/logo-micromasters.png and /dev/null differ diff --git a/static/images/logo-micromasters@2x.png b/static/images/logo-micromasters@2x.png deleted file mode 100644 index b7b7f78f35..0000000000 Binary files a/static/images/logo-micromasters@2x.png and /dev/null differ diff --git a/static/images/logo-mitxonline.png b/static/images/logo-mitxonline.png deleted file mode 100644 index 9fca13054b..0000000000 Binary files a/static/images/logo-mitxonline.png and /dev/null differ diff --git a/static/images/micromasters_logo.svg b/static/images/micromasters_logo.svg deleted file mode 100644 index f90c8277eb..0000000000 --- a/static/images/micromasters_logo.svg +++ /dev/null @@ -1 +0,0 @@ -Asset 2 \ No newline at end of file diff --git a/static/images/micromasters_logo_black.svg b/static/images/micromasters_logo_black.svg new file mode 100644 index 0000000000..48be4e376e --- /dev/null +++ b/static/images/micromasters_logo_black.svg @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/static/images/micromasters_logo_on.svg b/static/images/micromasters_logo_on.svg deleted file mode 100644 index 796cb37798..0000000000 --- a/static/images/micromasters_logo_on.svg +++ /dev/null @@ -1 +0,0 @@ -Asset 1 \ No newline at end of file diff --git a/static/images/micromasters_logo_on_programs.svg b/static/images/micromasters_logo_on_programs.svg deleted file mode 100644 index fa21cc265f..0000000000 --- a/static/images/micromasters_logo_on_programs.svg +++ /dev/null @@ -1,12 +0,0 @@ - - - - - MITx MicroMasters Programs - diff --git a/static/images/micromasters_logo_programs.svg b/static/images/micromasters_logo_programs.svg deleted file mode 100644 index 4724d0e141..0000000000 --- a/static/images/micromasters_logo_programs.svg +++ /dev/null @@ -1,12 +0,0 @@ - - - - - MITx MicroMasters Programs - diff --git a/static/images/micromasters_logo_white.svg b/static/images/micromasters_logo_white.svg new file mode 100755 index 0000000000..9743b98b74 --- /dev/null +++ b/static/images/micromasters_logo_white.svg @@ -0,0 +1,101 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/static/images/mitxonline_logo.png b/static/images/mitxonline_logo.png new file mode 100644 index 0000000000..0cab1b1639 Binary files /dev/null and b/static/images/mitxonline_logo.png differ diff --git a/static/images/open_learning_logo.svg b/static/images/open_learning_logo.svg new file mode 100755 index 0000000000..7c15f63bb6 --- /dev/null +++ b/static/images/open_learning_logo.svg @@ -0,0 +1,56 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/static/js/components/Navbar.js b/static/js/components/Navbar.js index 97241903b9..6756945eb1 100644 --- a/static/js/components/Navbar.js +++ b/static/js/components/Navbar.js @@ -86,31 +86,28 @@ export default class Navbar extends React.Component { renderProfileHeader = () => [ MIT, - - MITx MicroMasters Programs - + /> ] renderAuthenticatedHeader = (link: string) => [ - MIT - , - - MITx MicroMasters Programs - + MicroMasters Programs + ] renderUnauthenticatedHeader = (link: string) => [ - MIT - , - - MITx MicroMasters Programs - + MicroMasters Programs + ] programSelector = (): React$Element<*> => { diff --git a/static/js/components/Navbar_test.js b/static/js/components/Navbar_test.js index cfa87224af..442fdc64e9 100644 --- a/static/js/components/Navbar_test.js +++ b/static/js/components/Navbar_test.js @@ -30,7 +30,6 @@ describe("Navbar", () => { "/dashboard", "/learner/jane", "/settings", - "/dashboard", "/dashboard" ]) }) @@ -48,7 +47,6 @@ describe("Navbar", () => { "/automaticemails", "/learner/jane", "/settings", - "/learners", "/learners" ]) } diff --git a/static/js/containers/LearnerPage_test.js b/static/js/containers/LearnerPage_test.js index cdb76e93b1..1fe4d48a4c 100644 --- a/static/js/containers/LearnerPage_test.js +++ b/static/js/containers/LearnerPage_test.js @@ -145,7 +145,7 @@ describe("LearnerPage", function() { return renderComponent(`/learner/${username}`, userActions).then( ([wrapper]) => { assert.equal( - 2, + 1, wrapper.find(".micromasters-nav").find("a[href='/dashboard']") .length ) @@ -1329,7 +1329,7 @@ describe("LearnerPage", function() { return renderComponent(`/learner/${username}`, anonymousUserActions).then( ([wrapper]) => { assert.equal( - 2, + 1, wrapper.find(".micromasters-nav").find("a[href='/']").length ) } diff --git a/static/scss/certificate.scss b/static/scss/certificate.scss index 966fc478fe..23821ab335 100644 --- a/static/scss/certificate.scss +++ b/static/scss/certificate.scss @@ -288,8 +288,8 @@ } .wrapper-accomplishment-orgs img { - max-width: 275px; - max-height: 100px; + width: 275px; + height: 100px; } .wrapper-accomplishment-orgs .wrapper-organization:first-child:nth-last-child(3), diff --git a/static/scss/homepage.scss b/static/scss/homepage.scss index 26d1931c1a..348a36905e 100644 --- a/static/scss/homepage.scss +++ b/static/scss/homepage.scss @@ -33,30 +33,18 @@ a { float: left; } - .brand-logo, - .micromasters-logo { + .brand-logo { float: left; /* background image from background-images.css */ background-repeat: no-repeat; - height: 36px; - width: 51px; overflow: visible; position: relative; - } - - .brand-logo { - height: 36px; - width: 51px; + height: 48px; + width: 250px; top: 2px; margin-right: 15px; } - .micromasters-logo { - height: 23px; - width: 263px; - top: 8px; - } - .divider-large { width: 1px; height: 32px; diff --git a/static/scss/navbar.scss b/static/scss/navbar.scss index dc666e6be0..1600885509 100644 --- a/static/scss/navbar.scss +++ b/static/scss/navbar.scss @@ -179,7 +179,7 @@ @include breakpoint(desktop) { img { - height: 27px; + height: 35px; margin-right: 25px; } } diff --git a/ui/templates/background-images.css b/ui/templates/background-images.css index 84240b9aae..01097e5f35 100644 --- a/ui/templates/background-images.css +++ b/ui/templates/background-images.css @@ -3,16 +3,7 @@ background-image: url({% static "images/homepage.jpg" %}); } .navbar .navbar-header .brand-logo { - background-image: url({% static "images/mit_logo.svg" %}); -} -.navbar .navbar-header .brand-logo:hover { - background-image: url({% static "images/mit_logo_on.svg" %}); -} -.navbar .navbar-header .micromasters-logo { - background-image: url({% static "images/micromasters_logo_programs.svg" %}); -} -.navbar .navbar-header .micromasters-logo:hover { - background-image: url({% static "images/micromasters_logo_on_programs.svg" %}); + background-image: url({% static "images/micromasters_logo_white.svg" %}); } .how-it-works-section .reasons-images-wrap::after { content: url({% static "images/hiw-arrow2.png" %}); diff --git a/ui/templates/certificate.html b/ui/templates/certificate.html index 09a00bdc97..bcd4c9e3ad 100644 --- a/ui/templates/certificate.html +++ b/ui/templates/certificate.html @@ -66,7 +66,7 @@

Supported by the following organiz diff --git a/ui/templates/footer.html b/ui/templates/footer.html index 902ff9091d..d59831ffdd 100644 --- a/ui/templates/footer.html +++ b/ui/templates/footer.html @@ -4,7 +4,7 @@
- MIT + MIT {% if is_public %}
diff --git a/ui/templates/header.html b/ui/templates/header.html index 60570b478a..8d2f126b34 100644 --- a/ui/templates/header.html +++ b/ui/templates/header.html @@ -1,13 +1,9 @@