diff --git a/ecommerce/templates/checkout_interstitial.html b/ecommerce/templates/checkout_interstitial.html index d01ccd9255..1dcc03a83a 100644 --- a/ecommerce/templates/checkout_interstitial.html +++ b/ecommerce/templates/checkout_interstitial.html @@ -4,7 +4,7 @@ {% block title %}{% trans "mitxonline" %}{% endblock %} {% block content %} -
+
diff --git a/frontend/public/scss/auth.scss b/frontend/public/scss/auth.scss index 3f0326dcd9..4074ca1419 100644 --- a/frontend/public/scss/auth.scss +++ b/frontend/public/scss/auth.scss @@ -23,87 +23,6 @@ font-size: 16px; } } - - .confirm-sent-page { - font-size: 16px; - letter-spacing: 1.05px; - line-height: 20px; - padding: 49px 95px 40px; - position: relative; - box-shadow: inset 0 1px 3px 0 rgba(0, 0, 0, 0.5), -4px 3px 17px -4px rgba(0, 0, 0, 0.25); - background-color: $very-light-gray; - - &:before { - position: absolute; - left: 0; - top: 0; - right: 0; - content: ""; - height: 8px; - background: linear-gradient( - to right, - rgba(61, 189, 191, 1) 0%, - rgba(241, 186, 70, 1) 100% - ); - } - - .email { - color: $link-blue; - font-weight: 600; - } - - a { - color: $link-blue; - } - - div:first-of-type { - font-weight: 600; - } - - .font-weight-600 { - font-weight: 600; - } - - .contact-support { - padding-top: 20px; - line-height: 21px; - } - - ol { - padding-top: 5px; - padding-left: 18px; - letter-spacing: 0.55px; - line-height: 21px; - margin-bottom: 0; - - li { - margin-bottom: 4px; - } - } - - .browse-courses { - padding-top: 41px; - } - } - - &.account-settings-page { - max-width: 800px; - - .email-section { - margin: 30px 0 0; - border: 1px solid $tab-color; - border-width: 1px 0 0; - padding: 23px 0 0; - - h4 { - font-size: 23px; - line-height: 28px; - font-weight: 600; - margin-top: 5px; - padding-bottom: 10px; - } - } - } } .auth-card { @@ -136,17 +55,6 @@ } } - .contact-support { - padding-top: 5px; - line-height: 19px; - - a { - color: $footer-bg; - text-decoration: underline; - } - - } - hr.hr-class-margin { margin-top: 5px; margin-bottom: 30px; @@ -154,14 +62,6 @@ } -.additional-street { - cursor: pointer; - color: $light-blue; - font-style: italic; - border: none; - background: none; -} - .register-error-icon { margin: 0 auto 15px; diff --git a/frontend/public/scss/certificates/certificate.scss b/frontend/public/scss/certificates/certificate.scss index e0c3f07e95..ada8100eed 100644 --- a/frontend/public/scss/certificates/certificate.scss +++ b/frontend/public/scss/certificates/certificate.scss @@ -38,11 +38,6 @@ $blue: #355b6b; } } -.cer-head { - background: white; - padding: 20px 15px 5px; -} - .cer-user-info { border: 1px solid #979797; background-color: $navy-blue; diff --git a/frontend/public/scss/common.scss b/frontend/public/scss/common.scss index 64ef3aaa30..9be5a4080e 100644 --- a/frontend/public/scss/common.scss +++ b/frontend/public/scss/common.scss @@ -44,29 +44,6 @@ h4 { font-weight: 600; } -a.link-button { - display: inline-block; - padding: 10px; - text-align: center; - text-decoration: none; - - &:hover, &:visited { - text-decoration: none; - } - - &.red { - border-radius: 5px; - background-color: rgb(163, 31, 52); - color: #ffffff; - } - - &.light-blue { - border-radius: 5px; - background-color: $light-blue; - color: #ffffff; - } -} - .form-error { color: $primary; } @@ -169,42 +146,12 @@ button.btn-secondary.unstyled { } } -.link-light-blue { - &, &:hover, &:visited, &:active { - color: $light-blue; - } -} - .link-black { text-decoration: underline; color: black; font-weight: bold; } -.text-ribbon { - position: relative; - width: 160px; - height: 40px; - - svg { - width: 160px; - height: 40px; - -webkit-filter: drop-shadow(-1px 2px 2px rgba(0, 0, 0, 0.4)); // sass-lint:disable-line no-vendor-prefixes - filter: drop-shadow(-1px 2px 2px rgba(0, 0, 0, 0.4)); - fill: black; - } - - .text { - position: absolute; - top: 0; - left: 0; - width: 100%; - line-height: 40px; - text-align: center; - color: white; - } -} - .card { background-color: #ffffff; border: 0; @@ -243,11 +190,6 @@ button.btn-secondary.unstyled { width: 120px; } -.dotted { - border-bottom: 2px dashed #8a8b8c; - margin-top: 25px; -} - .dropdown-menu { box-shadow: 0 2px 4px 0 rgba(0,0,0,0.5), 0 13px 11px 8px rgba(0,0,0,0.12); border-color: $white-smoke; @@ -292,22 +234,6 @@ button.btn-secondary.unstyled { cursor: pointer; } -.flexible-pricing-head { - margin-left: 15px; - - h1 { - font-size: 38px; - line-height: 38px; - font-weight: bold; - } - - p { - line-height: 24px; - font-size: 18px; - font-weight: 100; - } -} - .flexible-price-certificate-btn { float: left; margin-top: 28px; @@ -318,94 +244,6 @@ button.btn-secondary.unstyled { } } -.flexible-pricing-form { - margin-top: 44px; - margin-left: auto; - margin-right: auto; - max-width: 425px; - padding: 24px 24px 32px 24px !important; - border-width: 0 !important; - - .form-group { - margin-bottom: 1.5rem; - padding-bottom: 0; - } - - .auth-header { - .tell-us-about-your-income { - font-size: 22px; - line-height: 22px; - } - } - - div { - button { - line-height: 59px; - width: 285px; - padding: 0 50px !important; - margin-top: 7px; - } - } - - .form-group { - margin-bottom: 1.5rem; - - input[type=number], select { - height: 48px; - max-width: 377px; - } - - #your_income_label { - margin-top: 16px; - font-size: 16px; - line-height: 16px; - @include media-breakpoint-down(sm) { - margin-top: 15px; - } - } - - .income_currency_label { - float: right; - margin: 5px 0; - height: 16px; - width: 192px; - color: #666666; - font-size: 14px; - letter-spacing: 0; - line-height: 16px; - text-align: right; - - @include media-breakpoint-down(sm) { - font-size: 12px; - margin: -27px 0 0 0; - } - } - /* Chrome, Safari, Edge, Opera */ - #your_income::-webkit-outer-spin-button, - #your_income::-webkit-inner-spin-button { - -webkit-appearance: none; - margin: 0; - } - - /* Firefox */ - #your_income{ - -moz-appearance: textfield; - } - - .financial-assist-testify { - color: grey; - max-width: 350px; - line-height: 16px; - display: inline-flex; - text-align: left; - font-size: 14px; - @include media-breakpoint-down(sm) { - max-width: 275px; - } - } - } -} - .form-group { padding-bottom: 1rem; @@ -423,8 +261,3 @@ button.btn-secondary.unstyled { .display-none { display: none !important; } - -.alert-dark-success { - background-color: rgba(40, 151, 126, 1); - color: white; -} diff --git a/frontend/public/scss/footer.scss b/frontend/public/scss/footer.scss index b39fae22f4..1226d383e7 100644 --- a/frontend/public/scss/footer.scss +++ b/frontend/public/scss/footer.scss @@ -170,319 +170,3 @@ } } - - -//old footer -.footer { - - background: $footer-bg; - color: white; - padding: 0 0 42px; - margin-top: 10%; - - @include media-breakpoint-down(sm) { - padding: 0 0 10px; - } - - .support-links { - background: white; - position: relative; - padding-top: 40px; - - &:after { - position: absolute; - left: 0; - top: 0; - right: 0; - content: ''; - height: 10px; - background: $gray-darker; - } - - .content-holder { - max-width: 966px; - - .row { - justify-content: space-between; - - h2 { - color: $primary; - } - - p { - color: black; - } - - .col-sm-6 { - padding: 0 15px 20px; - text-align: center; - - @include media-breakpoint-up(sm) { - max-width: 400px; - text-align: left; - } - - img { - margin: 0 0 15px; - width: 70px; - height: 70px; - color: black; - - @include media-breakpoint-up(sm) { - float: left; - margin: 0 45px 0 0; - } - } - - .info { - overflow: hidden; - font-size: 20px; - font-weight: 500; - line-height: 26px; - } - } - } - } -} - - .footer-top { - padding-top: 30px; - - &:after { - clear: both; - content: ''; - display: block; - } - } - - .footer-bottom { - padding-top: 54px; - flex-direction: row-reverse; - - @include media-breakpoint-down(sm) { - padding-top: 5px; - flex-direction: row; - } - } - - a { - color: white; - } - - .mit-info { - font-size: 14px; - line-height: 24px; - padding: 0 0 32px 16px; - - @include media-breakpoint-up(md) { - padding: 0; - float: left; - width: 44%; - } - - img { - width: 92px; - height: 48px; - margin: 0 auto 15px; - - @include media-breakpoint-up(md) { - margin: 5px 15px 0 0; - float: left; - } - - @include media-breakpoint-up(lg) { - margin: 5px 22px 0 0; - } - } - - address { - overflow: hidden; - display: block; - margin: 0; - } - - .copyright { - text-align: left; - } - } - - .right-info { - text-align: center; - padding: 0 0 20px; - // TODO: remove that line while adding hubspot form in the footer - display: none; - - @include media-breakpoint-up(md) { - float: right; - text-align: left; - padding: 0; - } - } - - .footer-nav { - padding: 0; - margin: 0; - list-style: none; - @include media-breakpoint-up(md) { - float: left; - } - - li { - display: inline-block; - vertical-align: top; - margin: 0 0 0 10px; - font-size: 18px; - line-height: 28px; - - @include media-breakpoint-up(lg) { - margin: 0 0 0 15px; - } - - &:first-child { - margin: 0; - } - } - } - - .hbspt-form { - - @include media-breakpoint-up(md) { - float: left; - margin: 0 0 0 65px; - width: 208px; - } - - label, .hs_error_rollup { - display: none; - } - - .hs-form input[type="email"] { - border: none; - border-bottom: 1px solid $footer-border; - background: none; - color: white; - height: 30px; - font-size: 16px; - line-height: 30px; - outline: none; - font-family: inherit; - width: 100%; - } - - .hs_email { - display: inline-block; - vertical-align: top; - width: calc(100% - 43px); - margin: 0 10px 0 0; - @include media-breakpoint-up(md) { - width: 180px; - } - } - - .hs_submit { - display: inline-block; - vertical-align: top; - margin: 6px 0 0; - line-height: 0; - } - - .hs-form .hs-button { - color: white; - background: url("#{$static-path}/images/arrow-circle-right.svg") no-repeat; - background-size: 18px 18px; - border: none; - padding: 0; - opacity: .7; - width: 18px; - height: 18px; - cursor: pointer; - text-indent: -9999px; - overflow: hidden; - } - - .submitted-message { - margin-left: 0; - color: $blue; - font-size: 12px; - font-weight: 600; - letter-spacing: 0; - line-height: 14px; - text-align: center; - width: auto; - padding: 10px 0 0; - } - - .no-list { - margin: 0; - padding: 5px 0 0; - list-style: none; - - label { - display: block; - font-size: 12px; - line-height: 15px; - color: $primary; - } - } - } - - .footer-sub-nav { - padding: 0; - margin: 0 0 5px; - list-style: none; - text-align: right; - font-size: 15px; - line-height: 20px; - - @include media-breakpoint-down(md) { - text-align: left; - padding: 0 0 20px 16px; - } - - @include media-breakpoint-up(md) { - margin: 0; - } - - li { - display: inline-block; - vertical-align: top; - margin: 0 5px; - - @include media-breakpoint-down(sm) { - display: block; - margin: 0; - padding: 0 0 12px; - } - - &:first-child { - &::before { - display: none; - } - } - } - } - - .copyright { - display: block; - text-align: left; - font-size: 15px; - line-height: 18px; - margin: 5px 0; - - @media (max-width: 576px) { - padding-bottom: 10px; - } - - @include media-breakpoint-up(md) { - margin: 0; - } - } - - .container { - max-width: 100%; - - @include media-breakpoint-up(md) { - padding: 0 32px; - } - } -} diff --git a/frontend/public/scss/layout.scss b/frontend/public/scss/layout.scss index 1a67c0b691..36e0332e7b 100644 --- a/frontend/public/scss/layout.scss +++ b/frontend/public/scss/layout.scss @@ -22,7 +22,6 @@ @import "dashboard"; @import "home"; @import "product-details"; -@import "product-faculty-members"; @import "cart"; @import "receipt"; @import "certificates/certificate"; diff --git a/frontend/public/scss/product-details.scss b/frontend/public/scss/product-details.scss index 1b5cb49302..aa0e8f6e59 100644 --- a/frontend/public/scss/product-details.scss +++ b/frontend/public/scss/product-details.scss @@ -1,7 +1,6 @@ // sass-lint:disable mixins-before-declarations .product-page { - position: relative; @include media-breakpoint-down(sm) { h2 { @@ -14,478 +13,19 @@ line-height: 26px; } } - - .container { - max-width: 1260px; - padding: 0 15px; - box-sizing: border-box; - margin: 0 auto; - } - - .btn-primary.highlight { - @include media-breakpoint-down(sm) { - display: block; - width: 100%; - } - } - - .hero-block { - font-size: 20px; - line-height: 2rem; - color: $black; - padding: 20px 0; - - @include media-breakpoint-up(md) { - font-size: 24px; - line-height: 36px; - } - - @include media-breakpoint-down(md) { - padding: 0; - } - - @include media-breakpoint-up(lg) { - padding: 38px 0 5px; - } - - .content-row { - @include media-breakpoint-up(lg) { - display: flex; - flex-flow: row wrap; - margin: 0 -15px; - } - - @include media-breakpoint-down(md) { - display: flex; - flex-flow: column-reverse; - } - - .content-col { - padding: 0 0 26px; - - @include media-breakpoint-up(lg) { - width: calc(100% - 497px); - padding: 0 15px; - box-sizing: border-box; - } - - &:only-child { - width: 100%; - } - - &.hero-media { - padding-bottom: 0; - - @include media-breakpoint-down(md) { - margin: 0px -15px; - } - - @include media-breakpoint-up(lg) { - width: 497px; - padding: 6px 15px; - flex-shrink: 0; - } - - img, .video-js { - width: 100%; - height: 217px; - object-fit: cover; - - @include media-breakpoint-up(md) { - height: 263px; - } - } - } - - .text { - padding-top: 7px !important; - - @include media-breakpoint-down(md) { - padding-top: 25px !important; - } - } - } - } - - .video-js { - .vjs-big-play-button { - background: black; - opacity: 0.8; - width: 64px; - height: 64px; - border: none; - border-radius: 50%; - - &:hover { - opacity: 0.6; - } - } - - .vjs-poster { - height: fit-content; - } - } - - .video-js .vjs-big-play-button .vjs-icon-placeholder:before { - top: 0.3em; - } - - .vjs-youtube { - - .vjs-big-play-button { - display: none; - } - } - - .video-holder { - background: $sirocco; - margin-top: 10px; - min-height: 200px; - - img { - display: block; - width: 100%; - } - } - - .text-info { - @include media-breakpoint-up(lg) { - max-width: 625px; - } - } - - p { - margin: 0 0 30px 0; - } - } - - .info-block { - padding-bottom: 25px; - font-size: 14px; - line-height: 16px; - color: $black; - - @include media-breakpoint-up(lg) { - padding: 30px 0; - } - - .stats-row { - display: flex; - flex-flow: row wrap; - margin: 0 -8px; - align-items: baseline; - - @include media-breakpoint-up(xl) { - margin: 0 -18px; - } - - .btn-enrollment-button { - width: 350px; - height: 50px; - padding: 0!important; - } - - .enrollment-info-box { - border: 1px solid #d1d1d1; - border-left: none; - border-right: none; - - margin: 10px 0; - padding: 10px 0; - - .row { - margin: 20px 0; - } - - .enrollment-info-icon { - width: 20px; - margin-right: 12px; - } - - .enrollment-info-text { - width: auto; - flex-grow: 1; - - .enrollment-effort { - font-size: smaller; - } - - .badge-pacing { - background-color: $black; - text-transform: uppercase; - margin-left: .5rem; - padding: 3px; - font-weight: normal; - } - } - } - - .stat-col { - margin: 0 8px 16px; - background: $white; - border-radius: 3px; - overflow: hidden; - text-align: center; - display: flex; - flex-flow: column; - flex-grow: 1; - width: calc(50% - 16px); - box-shadow: 0 2px 2px 0 rgba(0, 0, 0, 0.14); - - @include media-breakpoint-up(lg) { - width: auto; - } - - @include media-breakpoint-up(xl) { - margin: 0 18px; - width: 180px; - flex-grow: inherit; - } - - &.small { - font-size: 14px; - @include media-breakpoint-up(xl) { - width: 140px; - } - } - - &.large { - flex-grow: 1; - text-align: left; - } - } - - .text { - padding: 14px 20px; - width: 100%; - flex-grow: 1; - display: inline-block; - align-items: center; - justify-content: center; - box-sizing: border-box; - font-size: 13px; - - p { - margin: 0; - } - - a:link { - color: $link-blue; - text-decoration: underline; - } - } - - .more-dates { - padding-bottom: 6px; - width: 100%; - font-size: 12px; - - .dates-tooltip { - font-weight: bolder; - color: $link-blue !important; - text-decoration: underline; - background-color: transparent; - border: none; - } - } - - .date-links-text { - padding-bottom: 7px !important; - } - - .title { - background-color: $sirocco; - font-weight: 500; - color: $tile-background; - text-align: center; - padding: 9px 8px; - width: 100%; - box-sizing: border-box; - height: 34px; - text-transform: uppercase; - } - } - - a { - color: $black; - - &:hover { - text-decoration: none; - } - } - } - - .text-block { - color: $black; - padding: 0; - - @include media-breakpoint-up(lg) { - padding: 25px 0 10px; - } - - p { - margin: 0 0 25px; - line-height: 28px; - } - - .text-holder { - max-width: 1020px; - - a { - font-weight: 700; - color: $black; - } - - .content-data { - @include media-breakpoint-up(lg) { - padding-bottom: 20px; - } - } - - } - - .more { - font-weight: 700; - color: $black; - } - - ul:not(class) { - margin: 0 0 6px; - padding: 0; - list-style: none; - - li { - position: relative; - padding: 0 0 0 18px; - - &:before { - position: absolute; - left: 0; - top: 11px; - content: ''; - background: $black; - width: 6px; - height: 6px; - border-radius: 100%; - } - } - } - - #upsellCard { - width: 497px; - padding: 0 24px 24px 24px; - flex-shrink: 0; - float: right; - - @include media-breakpoint-down(lg) { - width: 100%; - padding: 0 12px 12px 12px; - } - - div.card { - padding: 24px; - } - - p { - line-height: 24px; - } - - div.upsell-header { - margin-left: 0; - margin-right: 0; - - span.badge { - font-weight: normal; - font-size: .85rem; - margin-bottom: .25rem !important; - padding: 0.35rem !important; - } - - span.bg-danger { - background-color: #fae8e8 !important; - color: #b43e3e; - } - } - form { - margin-bottom: 20px; - } - } - } - - .about-text { - padding-bottom: 37px; - - @include media-breakpoint-down(sm) { - padding-bottom: 20px; - } - } - - .ofac-message { - clear: both; - } } -.upgrade-enrollment-modal { +.upgrade-enrollment-modal { // This should be renamed as it's used across different modals max-width: 550px; - .modal-content { - padding: 5px 12px; - - .required { - color: $brand-button-bg; - } - } - - .modal-header { - font-weight: 600; - font-size: large; - border-bottom: none; - padding-bottom: 0; - - h5 { - font-size: 30px; - } - - span { - font-size: 45px; - font-weight: 200; - } - } - a { text-decoration: underline; } - .modal-subheader { - font-weight: 600; - font-size: 20px; - margin-bottom: 20px; - padding-left: 15px; - padding-right: 15px; - } - - .cancel-link, .faq-link { + .cancel-link { margin: 20px 0; } - .faq-link { - text-align: center !important; - } - - .faq-link a { - color: black; - font-weight: bold; - } - - .faq-link a:visited { - color: rgba(0, 0, 0, 0.14); - } - - .upgrade-icon { - background: url("https://via.placeholder.com/150 ") left no-repeat; - height: 70px; - } - .enroll-now-free { text-decoration: underline; box-shadow: none; @@ -500,10 +40,6 @@ .cancel-link button { text-align: left; } - - .cancel-enrollment-button { - float: right; - } } .financial-assistance-link { @@ -541,12 +77,3 @@ background-color: transparent; border: none; } - -.date-link-disabled { - padding: 5px 5px 0; - margin: 0; -} - -.instructor-modal .modal-dialog { - z-index: 2000; -} diff --git a/frontend/public/scss/product-faculty-members.scss b/frontend/public/scss/product-faculty-members.scss deleted file mode 100644 index 5c5787944b..0000000000 --- a/frontend/public/scss/product-faculty-members.scss +++ /dev/null @@ -1,114 +0,0 @@ -// sass-lint:disable mixins-before-declarations -.faculty-section { - margin: 0 0 35px; - - h2 { - margin: 0 0 35px; - - @include media-breakpoint-down(sm) { - margin: 0 0 27px; - } - } -} - -body.new-design { - - .faculty-members { - li { - width: calc(50% - 20px); - margin: 0 10px 10px; - min-width: 275px; - - img { - margin: 0 15px 0 0; - } - } - .member-card { - padding: 15px; - - .member-info { - overflow: hidden; - margin: 0; - - button { - font-size: 16px; - font-weight: 700; - line-height: normal; - border: 0; - background-color: white; - padding: 0 0 8px 0; - text-align: left; - - &:hover { - color: $brand-button-bg; - } - } - - .title { - font-size: 13px; - font-weight: 400; - line-height: normal; - margin-bottom: 0; - } - } - } - } -} -.faculty-members { - li { - @include media-breakpoint-down(md) { - width: calc(100% - 44px); - } - - width: calc(50% - 44px); - margin: 0 22px 24px; - min-width: min-content; - - .member-card { - padding: 24px; - border-radius: 4px !important; - box-shadow: 0 1px 0 0 rgb(0 0 0 / 12%); - display: flex; - - .member-info { - margin-top: 7px; - display: flow-root; - - @include media-breakpoint-down(md) { - margin-top: 20px; - } - - p { - font-size: 14px; - } - - .description { - p { - margin: 0; - color: $label-subtitle; - } - } - } - - &:hover { - h3 { - color: $brand-button-bg; - } - } - } - - img { - float: left; - height: 110px; - width: 110px; - border-radius: 50%; - object-fit: cover; - margin: 0 24px 20px 0; - - @include media-breakpoint-down(sm) { - display: block; - float: none; - } - } - } -} diff --git a/frontend/public/scss/product-page/product-details.scss b/frontend/public/scss/product-page/product-details.scss index e9f07d63af..abd0d704bf 100644 --- a/frontend/public/scss/product-page/product-details.scss +++ b/frontend/public/scss/product-page/product-details.scss @@ -27,6 +27,13 @@ body.new-design { flex: none; } + .container { + max-width: 1260px; + padding: 0 15px; + box-sizing: border-box; + margin: 0 auto; + } + .breadcrumb-item { color: var(--GreyText, #6F7175); font-size: 14px; @@ -169,7 +176,6 @@ body.new-design { } .ofac-message { - border: 1px solid #e4e9ef; padding: 2rem; clear: both; } @@ -614,6 +620,7 @@ body.new-design { .modal-dialog { max-width: 770px; border-radius: 5px; + z-index: 2000; @include media-breakpoint-down(md) { width:500px; diff --git a/frontend/public/scss/product-page/product-faculty-members.scss b/frontend/public/scss/product-page/product-faculty-members.scss index f3f61f1b04..4b79989d79 100644 --- a/frontend/public/scss/product-page/product-faculty-members.scss +++ b/frontend/public/scss/product-page/product-faculty-members.scss @@ -1,5 +1,72 @@ // sass-lint:disable mixins-before-declarations -body.new-design .faculty-members img { - border-radius: 5px; - object-position: 50% 0; + +body.new-design { + + .faculty-section { + margin: 0 0 35px; + + h2 { + margin: 0 0 35px; + + @include media-breakpoint-down(sm) { + margin: 0 0 27px; + } + } + + .faculty-members { + li { + width: calc(50% - 20px); + margin: 0 10px 10px; + min-width: 275px; + + img { + border-radius: 5px; + object-position: 50% 0; + margin: 0 15px 0 0; + float: left; + height: 110px; + width: 110px; + object-fit: cover; + + @include media-breakpoint-down(sm) { + display: block; + float: none; + } + } + } + .member-card { + padding: 15px; + border-radius: 4px !important; + box-shadow: 0 1px 0 0 rgb(0 0 0 / 12%); + display: flex; + + .member-info { + overflow: hidden; + margin: 0; + display: flow-root; + + button { + font-size: 16px; + font-weight: 700; + line-height: normal; + border: 0; + background-color: white; + padding: 0 0 8px 0; + text-align: left; + + &:hover { + color: $brand-button-bg; + } + } + + .title { + font-size: 13px; + font-weight: 400; + line-height: normal; + margin-bottom: 0; + } + } + } + } + } } diff --git a/frontend/public/scss/top-app-bar.scss b/frontend/public/scss/top-app-bar.scss index b4e207f54d..dc1eb15ad8 100644 --- a/frontend/public/scss/top-app-bar.scss +++ b/frontend/public/scss/top-app-bar.scss @@ -20,84 +20,6 @@ header.site-header { } } -// old design -.full-screen-menu { - display: block; - - @include media-breakpoint-down(md) { - display: none; - } - - ul { - display: flex; - list-style-type: none; - padding: 0; - margin: 0; - - li { - font-weight: 600; - padding: 0 0 0 25px; - - a { - color: black; - text-decoration: none; - display: block; - - &:hover { - color: $primary; - } - - &.simple { - padding: 5px 16px; - } - - &.button { - transition: .25s; - - @include media-breakpoint-up(md) { - background: $primary; - color: white; - border-radius: 3px; - box-shadow: inset 0 0 2px 0 rgba(255, 255, 255, 0.57); - - &:hover { - background: black; - } - } - } - } - } - } -} - -.mobile-menu { - display: none; - - @include media-breakpoint-down(md) { - display: block; - } - - li.mobile-dropdown-item { - display: block; - padding: 10px 0; - margin: 0 auto; - max-width: 170px; - - a { - color: white; - font-size: 18px; - font-weight: 600; - line-height: 25px; - padding: 0; - margin-top: 5px; - - &:hover { - color: white; - } - } - } -} - .user-menu-overlay { display: none; margin: 0; @@ -130,52 +52,6 @@ header.site-header { } -.site-logo { - width: 65px; - height: 35px; - @include media-breakpoint-down(sm) { - width: 46px; - height: 25px; - } -} - -// old design -.navbar-brand { - display: inline-flex; - align-items: center; - padding: 0; - - .mitx-online-link { - font-size: 24px; - color: black; - font-weight: bold; - line-height: 24px; - letter-spacing: 0; - - @include media-breakpoint-down(md) { - font-size: 18px; - line-height: 18px; - } - } - - .logo-link { - @include media-breakpoint-down(md) { - display: inline-flex; - } - } - - .divider-large { - width: 1px; - height: 48px; - margin: 0 15px; - background: black; - @include media-breakpoint-down(md) { - height: 34px; - margin: 0 8px; - } - } -} - .navbar-toggler { position: relative; width: 24px; @@ -246,7 +122,6 @@ header.site-header { } } -// New Design header.site-header.new-design { box-shadow: 0 2px 2px 0 rgba(0, 0, 0, 0.14); background-color: $white; diff --git a/frontend/public/scss/user-menu.scss b/frontend/public/scss/user-menu.scss index 940faecad5..d44ac3bb0d 100644 --- a/frontend/public/scss/user-menu.scss +++ b/frontend/public/scss/user-menu.scss @@ -1,12 +1,3 @@ -.profile-image { - border-radius: 100%; - background-color: $cornflower-blue; - color: $white; - width: 34px; - height: 34px; - overflow: hidden; -} - .collapsed.dropdown-toggle::after { border-top: 0.3em solid transparent; border-left: 0.3em solid; @@ -69,12 +60,6 @@ } } -.icon-dashboard { - background: url("#{$static-path}/images/icon-dashboard.png") left no-repeat; - height: 25px; - width: 25px; -} - .user-menu-button { @include media-breakpoint-down(sm) { diff --git a/frontend/public/scss/variables.scss b/frontend/public/scss/variables.scss index 506aceb7a3..ac7a08cec3 100644 --- a/frontend/public/scss/variables.scss +++ b/frontend/public/scss/variables.scss @@ -4,44 +4,25 @@ $material-icon-height: 24px; $primary: #a31f34; $gray: #363636; -$gray-85: #d9d9d9; -$gray-darker: #c2c2c2; $green-darker: #3E775D; $red-darker: #B43E3E; $success: #28977e; -$success-dark: rgba(40, 151, 126, 1); $light-gray: #666666; -$very-light-gray: #f5f5f5; -$soft-light-gray: #d8d8d8; $white-smoke: #f1f1f1; $blue: #355b6b; $light-blue: #15729b; $navy-blue: #355b6b; $link-blue: #126f9a; -$cornflower-blue: #579cf9; $denim-blue: #16729b; -$deep-sky-blue: #07a3ff; $tile-background: #fff; -$tiles-background: rgba(53, 53, 53, 97); -$tab-color: #c2c0bf; $label-subtitle: #666666; -$gray-bg: #ebebeb; -$catalog-text: #909090; -$detail-grid-border-color: #b4b4b4; -$featured-banner-background: #a32034; -$featured-banner-border: #5e0c19; - -$events-background: #e3e3e3; $body-bg: #f0f5f7; $footer-bg: #000000; -$footer-border: #686461; $footer-blue-bg: #03152D; -$dc-background: #f2f2f2; -$subtitle-color: #ff4a68; $sirocco: #465a5b; $brand-button-bg: #a41e34; $brand-lighter-bg: #c5264e; diff --git a/frontend/public/src/components/CourseInfoBox.js b/frontend/public/src/components/CourseInfoBox.js index 509a26abee..9fbac03e18 100644 --- a/frontend/public/src/components/CourseInfoBox.js +++ b/frontend/public/src/components/CourseInfoBox.js @@ -96,7 +96,7 @@ export default class CourseInfoBox extends React.PureComponent this.togglePacingInfoDialogVisibility("Archived")} > Learn More @@ -249,7 +249,7 @@ export default class CourseInfoBox extends React.PureComponent Self-paced