Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add new info callout for ODS recommendation #1709

Merged
merged 14 commits into from
Mar 13, 2023
Merged

Add new info callout for ODS recommendation #1709

merged 14 commits into from
Mar 13, 2023

Commits on Dec 15, 2022

  1. Add new info callout for ODs recommendation

    @hannahiss
    hannahiss committed Dec 15, 2022
    Configuration menu
    Copy the full SHA
    2e8db9e View commit details
    Browse the repository at this point in the history

Commits on Jan 16, 2023

  1. Merge branch 'main' into main-his-tables-reco-callouts 

    # Conflicts:
#	site/content/docs/5.2/content/tables.md
    @hannahiss
    hannahiss committed Jan 16, 2023
    Configuration menu
    Copy the full SHA
    606bd64 View commit details
    Browse the repository at this point in the history

Commits on Feb 6, 2023

  1. Mutualise danger and info alerts shortcodes

    @hannahiss
    hannahiss committed Feb 6, 2023
    Configuration menu
    Copy the full SHA
    26bc7b1 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into main-his-tables-reco-callouts

    @hannahiss
    hannahiss committed Feb 6, 2023
    Configuration menu
    Copy the full SHA
    db21403 View commit details
    Browse the repository at this point in the history

Commits on Feb 8, 2023

  1. Merge branch 'main' into main-his-tables-reco-callouts

    @hannahiss
    hannahiss committed Feb 8, 2023
    Configuration menu
    Copy the full SHA
    880e6fd View commit details
    Browse the repository at this point in the history

  2. remove bd-ods-alert class from html (not used anymore) and add info o… 

    …n table reco callout..
    @hannahiss
    hannahiss committed Feb 8, 2023
    Configuration menu
    Copy the full SHA
    3463276 View commit details
    Browse the repository at this point in the history

Commits on Mar 6, 2023

  1. Merge branch 'main' into main-his-tables-reco-callouts

    @hannahiss
    hannahiss committed Mar 6, 2023
    Configuration menu
    Copy the full SHA
    d3358f3 View commit details
    Browse the repository at this point in the history

  2. change ods-incompatibility-alert to ods-alert (generic for both incom… 

    …patibility and recommandation)
    @hannahiss
    hannahiss committed Mar 6, 2023
    Configuration menu
    Copy the full SHA
    dbccb90 View commit details
    Browse the repository at this point in the history

  3. Update site/layouts/shortcodes/ods-alert.html 

    Co-authored-by: Julien Déramond <julien.deramond@orange.com>
    @hannahiss @julien-deramond
    hannahiss and julien-deramond authored Mar 6, 2023
    Configuration menu
    Copy the full SHA
    54c520a View commit details
    Browse the repository at this point in the history

  4. Update site/layouts/shortcodes/ods-alert.html 

    Co-authored-by: Julien Déramond <julien.deramond@orange.com>
    @hannahiss @julien-deramond
    hannahiss and julien-deramond authored Mar 6, 2023
    Configuration menu
    Copy the full SHA
    c62d829 View commit details
    Browse the repository at this point in the history

Commits on Mar 13, 2023

  1. Merge branch 'main' into main-his-tables-reco-callouts

    @hannahiss
    hannahiss committed Mar 13, 2023
    Configuration menu
    Copy the full SHA
    bd9b607 View commit details
    Browse the repository at this point in the history

  2. improve doc text 

    Co-authored-by: Julien Déramond <julien.deramond@orange.com>
    @hannahiss @julien-deramond
    hannahiss and julien-deramond authored Mar 13, 2023
    Configuration menu
    Copy the full SHA
    7e6139b View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'origin/main-his-tables-reco-callouts' i… 

    …nto main-his-tables-reco-callouts
    @hannahiss
    hannahiss committed Mar 13, 2023
    Configuration menu
    Copy the full SHA
    cc88d61 View commit details
    Browse the repository at this point in the history

  4. Changes after Julien's review: 

    - removing unneeded boosted mod comments
- adding info about blue design callout in introduction and update text about red ones
- removing h4 class to callout title

Also:
- renaming ods-alert shortcode to design-callout-alert to be easier to find and refer
    @hannahiss
    hannahiss committed Mar 13, 2023
    Configuration menu
    Copy the full SHA
    9790d14 View commit details
    Browse the repository at this point in the history