From 13d629fdb26f73ad21a3e5e50b4a0c66a0413d53 Mon Sep 17 00:00:00 2001 From: Norm Rasmussen Date: Mon, 11 Apr 2022 13:33:04 -0400 Subject: [PATCH] jnj addition --- .../JnJVision/_cards_course.html.liquid | 51 ++++---- .../_cards_featured_course.html.liquid | 33 +---- .../JnJVision/_course_banner.html.liquid | 1 - .../_course_desktop_view.html.liquid | 4 +- .../JnJVision/_course_mobile_view.html.liquid | 3 - .../JnJVision/_course_outline.html.liquid | 2 +- .../_course_progress_and_cta.html.liquid | 9 +- ...learning_path_progress_and_cta.html.liquid | 4 +- .../JnJVision/course.html.liquid | 2 +- .../JnJVision/homepage.html.liquid | 24 ++-- .../JnJVision/styles.css.liquid | 113 ++++++++---------- 11 files changed, 107 insertions(+), 139 deletions(-) diff --git a/NP_Custom_Templates/customer_templates/JnJVision/_cards_course.html.liquid b/NP_Custom_Templates/customer_templates/JnJVision/_cards_course.html.liquid index 51a9e32f..e909de68 100644 --- a/NP_Custom_Templates/customer_templates/JnJVision/_cards_course.html.liquid +++ b/NP_Custom_Templates/customer_templates/JnJVision/_cards_course.html.liquid @@ -1,4 +1,4 @@ -
+{% comment %}
@@ -10,7 +10,7 @@
-

+

{{ course.name }}

@@ -36,40 +36,49 @@
-
+
{% endcomment %} + + +
+
+ {{ course.name }} +
+ +
+

+ {{ course.name }} +

+
+ {% capture course_path %}{% route course, id: course.id %}{% endcapture %} + {% if course.has_to_restart? %} + {% include "course_version_outdated_popup", path: course_path %} + {% endif %} +
+
+ \ No newline at end of file diff --git a/NP_Custom_Templates/customer_templates/JnJVision/_cards_featured_course.html.liquid b/NP_Custom_Templates/customer_templates/JnJVision/_cards_featured_course.html.liquid index f206afa4..38d83998 100644 --- a/NP_Custom_Templates/customer_templates/JnJVision/_cards_featured_course.html.liquid +++ b/NP_Custom_Templates/customer_templates/JnJVision/_cards_featured_course.html.liquid @@ -25,8 +25,7 @@
{% if course.enrolled? == false %} {% t shared.enroll %} @@ -68,36 +67,6 @@
\ No newline at end of file diff --git a/NP_Custom_Templates/customer_templates/JnJVision/styles.css.liquid b/NP_Custom_Templates/customer_templates/JnJVision/styles.css.liquid index db2a5061..a7fe5956 100644 --- a/NP_Custom_Templates/customer_templates/JnJVision/styles.css.liquid +++ b/NP_Custom_Templates/customer_templates/JnJVision/styles.css.liquid @@ -53,9 +53,9 @@ body { font-family: "Lexend", "Roboto", sans-serif; } -div { +/* div { color: #fff; -} +} */ .np-color-white { color: #fff; } @@ -107,7 +107,7 @@ div { } .np-top-cta { - background: #555269; + /* background: #555269; */ border-radius: 0; } .np-text-light { @@ -245,7 +245,7 @@ div { max-height: 475px; } .np-homepage-hero-content { - padding: 5rem 4rem 2.25rem; + padding: 5rem 4rem 5rem; bottom: 0; } @@ -386,11 +386,11 @@ div { 2.4 - COURSE COVER PAGE */ #course-desktop .np-course-content { - background: #062531; + background: #fff; + color:#212121; padding: 0; } #course-mobile .np-card-container { - background: #062531; margin-top: 0; } .np-content-instructors-content-name { @@ -589,11 +589,7 @@ div { .np-footer + .np-powered-by { background: #002532 !important; } -.np-footer-navigation-link, -.np-footer-social-links-icon.np-button-color, -.np-footer-support-link.np-button-color { - color: #2bb24c; -} + .np-footer-support-item { color: rgba(255, 255, 255, 0.5); } @@ -618,10 +614,20 @@ div { .np-button.np-background-color, .np-button.np-top-button, .np-card-content-footer .np-button { - background: linear-gradient(90deg, #298e4e 0%, #035161 100%); text-transform: uppercase; } +.np-button.np-top-button { + border-radius:40px; + border:1px solid #006161; + transition:background-color 0.1s; +} + +.np-button.np-top-button:hover { + background-color:transparent; + color:#006161; +} + button.enwYlE, button.enwYlE:hover { background-color: transparent; @@ -648,7 +654,7 @@ button.jryxug { font-size: 1.25rem; } .np-text-title { - color: #fff; + /* color: #fff; */ font-size: 0.937rem; } @@ -668,12 +674,11 @@ button.jryxug { .np-card-container { height: auto; position: relative; - color: #fff; + /* color: #fff; */ } .np-card-container, .np-card-container-training-session { - background: #555269; border-radius: 0; box-shadow: none; } @@ -965,55 +970,56 @@ button.jryxug { font-size: 1.5rem; margin-bottom: 2rem; font-weight: bold; + color:#fff; } @media (min-width: 768px) { .np-course-banner-image { margin: 0 0 0 auto; - width: 50%; + width: 45%; + border-radius:0!important; } .np-course-banner-overlay { - background: linear-gradient( - 238.17deg, - rgba(3, 81, 97, 0) 55.34%, - #298e4e 111.28% - ), - linear-gradient( - 90deg, - #035262 0%, - #035161 49.48%, - rgba(3, 82, 98, 0) 73.44% - ); + background: #006161; position: absolute; - width: 100%; + width: 54%; height: 100%; left: 0; top: 0; - } - - .np-course-info.np-course-banner-info { - bottom: 2rem; - left: 2rem; - width: 75%; + border-radius:0; } .np-course-banner .np-course-title { font-size: 3rem; margin-bottom: 2.5rem; + flex: 2; + } + + .np-course-info.np-course-banner-info { + width: 54%; + background: #006161; + height: 100%; + left: 0; + bottom: 0; + padding: 32px; + position: absolute; + top: 0; + left: 0; + display: flex; + flex-direction: column; } } @media (min-width: 1170px) { - .np-course-info.np-course-banner-info { - bottom: 5.25rem; - left: 6.25rem; - width: 60%; - } .np-course-banner .np-course-title { - font-size: 4.125rem; - margin-bottom: 3.125rem; + font-size: 55px; + line-height: 62px; + } + + .np-course-banner-info .np-course-details { + max-width: 500px; } } @@ -1063,24 +1069,19 @@ button.jryxug { */ .np-card-progress-bar-container, .np-progress-bar-container { - background: #263e47; border-radius: 0; } .np-card-progress-bar { border-radius: 0; - background-color: #2bb24c; } .np-top-cta-progress-title { - color: #fff; + /* color: #fff; */ text-transform: none; margin-top: 0.7rem; margin-bottom: 0.7rem; } -.np-top-cta-progress-text { - color: #2bb24c; -} /* 3.12 - COURSE OUTLINE @@ -1093,22 +1094,6 @@ button.jryxug { border-bottom: 1px solid rgba(255, 255, 255, 0.15); } -.np-course-outline-content-activity-list { - border-bottom: 1px solid rgba(255, 255, 255, 0.15); - padding: 1rem 0; -} - -.np-course-outline-content-activity-link { - color: #809299; - font-size: 0.937rem; -} - -.np-course-outline-content-activity-link-completed { - color: #fff; - font-size: 0.937rem; - font-weight: 400; -} - .np-course-outline-content-activity-icon, .np-course-outline-content-activity-title { color: rgba(255, 255, 255, 0.5); @@ -1134,7 +1119,7 @@ button.jryxug { position: absolute; width: 16px; height: 2px; - background-color: rgba(255, 255, 255, 0.25); + background-color: #006161; left: 0; top: 5px; }