richie-education 2.34.1-dev2 → 2.34.1-dev22

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "richie-education",
-  "version": "2.34.1-dev2",
+  "version": "2.34.1-dev22",
   "description": "A CMS to build learning portals for Open Education",
   "main": "sandbox/manage.py",
   "scripts": {
@@ -38,75 +38,75 @@
     "not dead"
   ],
   "dependencies": {
-    "@babel/core": "7.26.0",
+    "@babel/core": "7.26.9",
     "@babel/plugin-syntax-dynamic-import": "7.8.3",
     "@babel/plugin-transform-modules-commonjs": "7.26.3",
-    "@babel/preset-env": "7.26.0",
+    "@babel/preset-env": "7.26.9",
     "@babel/preset-react": "7.26.3",
     "@babel/preset-typescript": "7.26.0",
-    "@faker-js/faker": "9.3.0",
-    "@formatjs/cli": "6.3.14",
-    "@formatjs/intl-relativetimeformat": "11.4.8",
-    "@hookform/resolvers": "3.9.1",
+    "@faker-js/faker": "9.6.0",
+    "@formatjs/cli": "6.6.1",
+    "@formatjs/intl-relativetimeformat": "11.4.10",
+    "@hookform/resolvers": "4.1.3",
     "@lyracom/embedded-form-glue": "1.4.2",
     "@openfun/cunningham-react": "3.0.0",
     "@openfun/cunningham-tokens": "2.2.0",
-    "@sentry/browser": "8.42.0",
-    "@sentry/types": "8.42.0",
-    "@storybook/addon-actions": "8.4.7",
-    "@storybook/addon-essentials": "8.4.7",
-    "@storybook/addon-interactions": "8.4.7",
-    "@storybook/addon-links": "8.4.7",
-    "@storybook/react": "8.4.7",
-    "@storybook/react-webpack5": "8.4.7",
-    "@storybook/test": "8.4.7",
-    "@tanstack/query-core": "5.62.3",
-    "@tanstack/query-sync-storage-persister": "5.62.3",
-    "@tanstack/react-query": "5.62.3",
-    "@tanstack/react-query-devtools": "5.62.3",
-    "@tanstack/react-query-persist-client": "5.62.3",
+    "@sentry/browser": "9.5.0",
+    "@sentry/types": "9.5.0",
+    "@storybook/addon-actions": "8.6.4",
+    "@storybook/addon-essentials": "8.6.4",
+    "@storybook/addon-interactions": "8.6.4",
+    "@storybook/addon-links": "8.6.4",
+    "@storybook/react": "8.6.4",
+    "@storybook/react-webpack5": "8.6.4",
+    "@storybook/test": "8.6.4",
+    "@tanstack/query-core": "5.67.2",
+    "@tanstack/query-sync-storage-persister": "5.67.2",
+    "@tanstack/react-query": "5.67.2",
+    "@tanstack/react-query-devtools": "5.67.2",
+    "@tanstack/react-query-persist-client": "5.67.2",
     "@testing-library/dom": "10.4.0",
     "@testing-library/jest-dom": "6.6.3",
-    "@testing-library/react": "16.1.0",
-    "@testing-library/user-event": "14.5.2",
-    "@types/fetch-mock": "7.3.8",
-    "@types/iframe-resizer": "3.5.13",
+    "@testing-library/react": "16.2.0",
+    "@testing-library/user-event": "14.6.1",
+    "@types/fetch-mock": "9.2.2",
+    "@types/iframe-resizer": "4.0.0",
     "@types/jest": "29.5.14",
     "@types/js-cookie": "3.0.6",
     "@types/lodash-es": "4.17.12",
     "@types/node-fetch": "2.6.12",
     "@types/query-string": "6.3.0",
-    "@types/react": "19.0.1",
+    "@types/react": "19.0.10",
     "@types/react-autosuggest": "10.1.11",
-    "@types/react-dom": "19.0.1",
+    "@types/react-dom": "19.0.4",
     "@types/react-modal": "3.16.3",
-    "@typescript-eslint/eslint-plugin": "8.17.0",
-    "@typescript-eslint/parser": "8.17.0",
+    "@typescript-eslint/eslint-plugin": "8.26.0",
+    "@typescript-eslint/parser": "8.26.0",
     "babel-jest": "29.7.0",
-    "babel-loader": "9.2.1",
+    "babel-loader": "10.0.0",
     "babel-plugin-react-intl": "8.2.25",
     "bootstrap": ">=4.6.0 <5",
     "classnames": "2.5.1",
     "cljs-merge": "1.1.1",
-    "core-js": "3.39.0",
+    "core-js": "3.41.0",
     "downshift": "9.0.8",
     "eslint": ">=8.57.0 <9",
     "eslint-config-airbnb": "19.0.4",
     "eslint-config-airbnb-typescript": "18.0.0",
-    "eslint-config-prettier": "9.1.0",
-    "eslint-import-resolver-webpack": "0.13.9",
-    "eslint-plugin-compat": "6.0.1",
-    "eslint-plugin-formatjs": "5.2.8",
+    "eslint-config-prettier": "10.1.1",
+    "eslint-import-resolver-webpack": "0.13.10",
+    "eslint-plugin-compat": "6.0.2",
+    "eslint-plugin-formatjs": "5.2.14",
     "eslint-plugin-import": "2.31.0",
     "eslint-plugin-jsx-a11y": "6.10.2",
-    "eslint-plugin-prettier": "5.2.1",
-    "eslint-plugin-react": "7.37.2",
-    "eslint-plugin-react-hooks": "5.1.0",
-    "eslint-plugin-storybook": "0.11.1",
+    "eslint-plugin-prettier": "5.2.3",
+    "eslint-plugin-react": "7.37.4",
+    "eslint-plugin-react-hooks": "5.2.0",
+    "eslint-plugin-storybook": "0.11.4",
     "fetch-mock": "<10",
     "file-loader": "6.2.0",
-    "glob": "11.0.0",
-    "i18n-iso-countries": "7.13.0",
+    "glob": "11.0.1",
+    "i18n-iso-countries": "7.14.0",
     "iframe-resizer": "<5",
     "intl-pluralrules": "2.0.1",
     "jest": "29.7.0",
@@ -114,35 +114,35 @@
     "js-cookie": "3.0.5",
     "lodash-es": "4.17.21",
     "mdn-polyfills": "5.20.0",
-    "msw": "2.6.8",
+    "msw": "2.7.3",
     "node-fetch": ">2.6.6 <3",
-    "nodemon": "3.1.7",
-    "prettier": "3.4.2",
+    "nodemon": "3.1.9",
+    "prettier": "3.5.3",
     "query-string": "9.1.1",
     "react": "19.0.0",
     "react-autosuggest": "10.1.0",
     "react-dom": "19.0.0",
-    "react-hook-form": "7.54.0",
-    "react-intl": "7.0.4",
-    "react-modal": "3.16.1",
-    "react-router": "7.0.2",
-    "sass": "1.82.0",
+    "react-hook-form": "7.54.2",
+    "react-intl": "7.1.6",
+    "react-modal": "3.16.3",
+    "react-router": "7.3.0",
+    "sass": "1.85.1",
     "source-map-loader": "5.0.0",
-    "storybook": "8.4.7",
+    "storybook": "8.6.4",
     "tsconfig-paths-webpack-plugin": "4.2.0",
-    "typescript": "5.7.2",
-    "uuid": "11.0.3",
-    "webpack": "5.97.1",
-    "webpack-cli": "5.1.4",
+    "typescript": "5.8.2",
+    "uuid": "11.1.0",
+    "webpack": "5.98.0",
+    "webpack-cli": "6.0.1",
     "whatwg-fetch": "3.6.20",
     "xhr-mock": "2.5.1",
     "yargs": "17.7.2",
-    "yup": "1.5.0"
+    "yup": "1.6.1"
   },
   "resolutions": {
     "@testing-library/dom": "10.4.0",
-    "@types/react": "19.0.1",
-    "@types/react-dom": "19.0.1",
+    "@types/react": "19.0.10",
+    "@types/react-dom": "19.0.4",
     "react": "19.0.0",
     "react-dom": "19.0.0"
   },
@@ -154,7 +154,7 @@
     "yarn": "1.22.22"
   },
   "devDependencies": {
-    "@storybook/addon-mdx-gfm": "8.4.7",
-    "@storybook/addon-webpack5-compiler-babel": "3.0.3"
+    "@storybook/addon-mdx-gfm": "8.6.4",
+    "@storybook/addon-webpack5-compiler-babel": "3.0.5"
   }
 }

package/scss/colors/_theme.scss

@@ -47,6 +47,14 @@ $r-theme: (
     item-cta-hollow-background: transparent,
     item-cta-hollow-border: transparent,
     item-divider-border: r-color('light-grey'),
+    dropdown-border-radius: 8px,
+    dropdown-padding: 0.5rem,
+    dropdown-gap: 0.5rem,
+    dropdown-background-color: r-color('azure2'),
+    dropdown-item-background-color: r-color('indianred3'),
+    dropdown-item-text-color: r-color('white'),
+    dropdown-item-border-radius: 4px,
+    dropdown-item-padding: 0.5rem 1rem,
   ),
   body-content: (
     base-color: r-color('black'),
@@ -483,6 +491,8 @@ $r-theme: (
   ),
   program-detail: (
     cover-empty-background: r-color('smoke'),
+    checkmark-list-decoration: url('../../richie/images/components/checkmark.svg'),
+    checkmark-list-decoration-color: r-color('indianred3'),
   ),
   registered-credit-card: (
     title-color: r-color('charcoal'),

package/scss/components/_header.scss

@@ -168,6 +168,10 @@
       flex-wrap: nowrap;
     }
 
+    & > .topbar__list {
+      position: relative;
+    }
+
     // Aside menu variation
     &--aside {
       @include sv-flex(1, 0, auto);
@@ -197,6 +201,76 @@
   // Menu item element
   &__item {
     $item-selector: &;
+    &.dropdown {
+      display: block;
+      position: static;
+
+      & > button {
+        width: 100%;
+
+        & > .icon {
+          height: 1rem;
+          margin-left: 0.5rem;
+          width: 1rem;
+        }
+      }
+
+      & ul[role='menu'] {
+        padding-left: 0.5rem;
+      }
+    }
+
+    @include media-breakpoint-up($r-topbar-breakpoint) {
+      &.dropdown {
+        // See header_menu.html for the definition of the variables
+        --active-background-color: #{r-theme-val(topbar, dropdown-item-background-color)};
+        --active-text-color: #{r-theme-val(topbar, dropdown-item-text-color)};
+
+        & > button[aria-expanded='true'] {
+          background-color: r-theme-val(topbar, dropdown-background-color);
+        }
+
+        & > button[aria-expanded='true'] + .topbar__sublist {
+          display: block;
+        }
+
+        & > .topbar__sublist {
+          background: r-theme-val(topbar, dropdown-background-color);
+          box-shadow: 0 1px 1px rgba(0, 0, 0, 0.1);
+          border-radius: r-theme-val(topbar, dropdown-border-radius);
+          display: none;
+          position: absolute;
+          transform: translateX(-8px);
+          max-width: 100%;
+
+          &--full-width {
+            left: 0;
+            transform: inherit;
+          }
+
+          & > ul[role='menu'] {
+            display: flex;
+            flex-wrap: wrap;
+            gap: r-theme-val(topbar, dropdown-gap);
+            padding: r-theme-val(topbar, dropdown-padding);
+          }
+
+          & .topbar__item > a {
+            background-color: #fff;
+            border-radius: r-theme-val(topbar, dropdown-item-border-radius);
+            padding: r-theme-val(topbar, dropdown-item-padding);
+            &::after {
+              display: none;
+            }
+
+            &:is(:focus, :hover) {
+              background-color: var(--active-background-color);
+              color: var(--active-text-color);
+            }
+          }
+        }
+      }
+    }
 
     @include sv-flex(1, 0, auto);
     display: flex;
@@ -213,15 +287,23 @@
       --r--menu--item--hover--color: #{r-theme-val(topbar, item-hover-color)};
     }
 
-    & > a {
+    & > button {
+      @include button-reset-style();
+      --radius: #{r-theme-val(topbar, dropdown-border-radius)};
+      border-radius: var(--radius) var(--radius) 0 0;
+    }
+
+    & > a,
+    & > button {
       @include sv-flex(1, 0, 100%);
+      align-items: center;
+      color: inherit;
       display: flex;
-      padding: 1rem 0.2rem 1rem 1rem;
       flex-direction: row;
-      align-items: center;
       font-family: inherit;
       font-weight: inherit;
-      color: inherit;
+      justify-content: space-between;
+      padding: 1rem 0.2rem 1rem 1rem;
 
       @include media-breakpoint-up($r-topbar-breakpoint) {
         padding: 1rem 1rem;
@@ -235,18 +317,22 @@
 
           // If there is no default hover color we assume there is also no variant
           @if r-theme-val(topbar, item-hover-color) {
-            &::after {
-              content: '';
-              position: absolute;
-              bottom: 0;
-              left: 0;
-              right: 0;
-              height: 8px;
+            &:is(a)::after {
               background-color: var(--r--menu--item--hover--color);
               border-top-left-radius: 0.2rem;
               border-top-right-radius: 0.2rem;
+              bottom: 0;
+              content: '';
+              height: 8px;
+              left: 0;
+              position: absolute;
+              right: 0;
             }
           }
+
+          &:is(button) {
+            background-color: r-theme-val(topbar, dropdown-background-color);
+          }
         }
       }
     }
@@ -257,8 +343,10 @@
 
     // Current page item or current ancestor
     &--selected,
-    &--ancestor {
-      & > a {
+    &--ancestor,
+    &:has(.topbar__sublist .topbar__item.topbar__item--selected) {
+      & > a,
+      & > button {
         position: relative;
         color: r-theme-val(topbar, item-active-color);
 
@@ -328,7 +416,8 @@
     }
 
     // Item divider
-    & + #{$item-selector} {
+    & + #{$item-selector},
+    & > .topbar__list #{$item-selector} {
       @if r-theme-val(topbar, item-divider-border) {
         border-top: $onepixel solid r-theme-val(topbar, item-divider-border);
       }

package/scss/components/_styleguide.scss

@@ -5,7 +5,8 @@
 // Draw a background grid in pure CSS
 @mixin draw-grid($line-color: null, $border-color: null) {
   @if $line-color {
-    background: linear-gradient(-90deg, $line-color $onepixel, transparent $onepixel),
+    background:
+      linear-gradient(-90deg, $line-color $onepixel, transparent $onepixel),
       linear-gradient($line-color $onepixel, transparent $onepixel),
       linear-gradient(-90deg, $line-color $onepixel, transparent $onepixel),
       linear-gradient($line-color $onepixel, transparent $onepixel),

package/scss/components/templates/courses/cms/_program_detail.scss

@@ -2,11 +2,13 @@
 //
 
 .program-detail {
+  $detail-selector: &;
   margin: 0 auto;
   padding: 0;
 
   &__block {
     @include detail-block;
+
     @if $body-padding-fix {
       @include content-padding-fix($target: '&:last-child');
     }
@@ -54,6 +56,75 @@
     padding-right: $grid-gutter-width;
   }
 
+  &__objectives {
+    ul {
+      padding-left: 0.3rem;
+      list-style-type: none;
+
+      li {
+        position: relative;
+        margin-top: 0.5rem;
+        font-size: 1rem;
+        padding-left: 1.5rem;
+
+        &::before {
+          content: '';
+          display: block;
+          position: absolute;
+          top: 0.2rem;
+          left: 0;
+          width: 0.8rem;
+          height: 0.8rem;
+          background-repeat: no-repeat;
+          background-color: r-theme-val(program-detail, checkmark-list-decoration-color);
+          -webkit-mask: r-theme-val(program-detail, checkmark-list-decoration);
+          mask: r-theme-val(program-detail, checkmark-list-decoration);
+          -webkit-mask-size: cover;
+          mask-size: cover;
+        }
+      }
+    }
+  }
+
+  &__content {
+    @include media-breakpoint-up(lg) {
+      padding-right: 3rem;
+    }
+  }
+
+  &__aside {
+    padding: 1rem 0;
+
+    @include media-breakpoint-up(lg) {
+      @include sv-flex(1, 0, $r-program-aside);
+      padding: 3rem 1rem;
+    }
+
+    #{$detail-selector}__row {
+      margin-bottom: 1.5rem;
+    }
+
+    #{$detail-selector}__title {
+      @include font-size($h3-font-size);
+      padding-bottom: 1rem;
+
+      @if r-theme-val(course-detail, aside-title-border) {
+        border-bottom: $onepixel solid r-theme-val(course-detail, aside-title-border);
+      }
+    }
+  }
+
+  &__main {
+    @include media-breakpoint-up(lg) {
+      @include sv-flex(1, 0, calc(100% - #{$r-program-subheader-aside}));
+      display: flex;
+      justify-content: flex-start;
+      align-content: flex-start;
+      align-items: flex-start;
+      flex-wrap: wrap;
+    }
+  }
+
   &__courses {
     @include make-col-ready();
     @include make-col(12);

package/scss/objects/_selector.scss

@@ -1,5 +1,6 @@
 .selector {
   position: relative;
+  z-index: 200;
 
   &__button {
     appearance: none;

package/scss/settings/_variables.scss

@@ -152,11 +152,13 @@ $r-footer-logo-width-lg: 11.875rem !default;
 // full width like common blocks. Usefull if you plan to remove course run from
 // template
 $r-course-aside: 35% !default;
+$r-program-aside: 25% !default;
 
 // Subheader aside column width in course detail. Unlike, $r-course-aside this
 // variable cannot be null. Otherwise to homegenize layout, it should have the
 // same value than $r-course-aside.
 $r-course-subheader-aside: 35% !default;
+$r-program-subheader-aside: 25% !default;
 
 // Course search page shared variables
 $r-search-filters-gutter: 0.2rem !default;