Skip to content

Commit

Permalink
Merge branch 'main' into main-lmp-popover-fluidity
Browse files Browse the repository at this point in the history
  • Loading branch information
julien-deramond authored Jan 31, 2024
2 parents 56a8baa + 859e69f commit 244d94b
Show file tree
Hide file tree
Showing 77 changed files with 2,760 additions and 4,220 deletions.
2 changes: 1 addition & 1 deletion .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ Please check that the following tests projects are still working:

- [ ] `docs/examples`
- [ ] `test/angular-ngx-echarts`
- [ ] `test/angular-tour-of-heroes`
- [ ] `test/angular-echarts`
- [ ] `test/html`
- [ ] `test/react`
- [ ] `test/vue`
Expand Down
2 changes: 1 addition & 1 deletion .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ updates:
development-dependencies:
dependency-type: "development"
- package-ecosystem: npm
directory: "/test/angular-tour-of-heroes"
directory: "/test/angular-echarts"
labels:
- dependencies
schedule:
Expand Down
18 changes: 16 additions & 2 deletions NOTICE.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
Copyright (C) 2023 - 2024 Orange SA All rights reserved

The following parts are proprietary information of Orange.
You shall not use or display any trade names, trademarks, service marks, products names, illustrations or designs used within the software
or displayed on this website and owned by Orange SA and its subsidiaries,
Expand All @@ -11,5 +13,17 @@ docs/images/ods-line-charts.png
docs/images/ods-mixed-charts.png
docs/images/ods-stacked-bar-charts.png
docs/images/orange-logo.svg

End of the parts list under Orange SA Copyright
docs/images/favicons/android-chrome-192x192.png
docs/images/favicons/android-chrome-512x512.png
docs/images/favicons/apple-touch-icon.png
docs/images/favicons/browserconfig.xml
docs/images/favicons/favicon-16x16.png
docs/images/favicons/favicon-32x32.png
docs/images/favicons/favicon.ico
docs/images/favicons/manifest.json
docs/images/favicons/mstile-144x144.png
docs/images/favicons/mstile-150x150.png
docs/images/favicons/mstile-310x150.png
docs/images/favicons/mstile-310x310.png
docs/images/favicons/mstile-70x70.png
docs/images/favicons/safari-pinned-tab.svg
8 changes: 8 additions & 0 deletions docs/examples/bar-chart.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,14 @@
rel="preconnect"
crossorigin="anonymous"
/>
<link rel="apple-touch-icon" href="../images/favicons/apple-touch-icon.png" sizes="180x180">
<link rel="icon" href="../images/favicons/favicon-32x32.png" sizes="32x32" type="image/png">
<link rel="icon" href="../images/favicons/favicon-16x16.png" sizes="16x16" type="image/png">
<link rel="manifest" href="../images/favicons/manifest.json">
<link rel="mask-icon" href="../images/favicons/safari-pinned-tab.svg" color="#000">
<link rel="icon" href="../images/favicons/favicon.ico">
<meta name="msapplication-config" content="../images/favicons/browserconfig.xml">
<meta name="theme-color" content="#000">

<!--------------------------------------------------
Echarts
Expand Down
8 changes: 8 additions & 0 deletions docs/examples/bar-line-chart.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,14 @@
rel="preconnect"
crossorigin="anonymous"
/>
<link rel="apple-touch-icon" href="../images/favicons/apple-touch-icon.png" sizes="180x180">
<link rel="icon" href="../images/favicons/favicon-32x32.png" sizes="32x32" type="image/png">
<link rel="icon" href="../images/favicons/favicon-16x16.png" sizes="16x16" type="image/png">
<link rel="manifest" href="../images/favicons/manifest.json">
<link rel="mask-icon" href="../images/favicons/safari-pinned-tab.svg" color="#000">
<link rel="icon" href="../images/favicons/favicon.ico">
<meta name="msapplication-config" content="../images/favicons/browserconfig.xml">
<meta name="theme-color" content="#000">

<!--------------------------------------------------
Echarts
Expand Down
8 changes: 8 additions & 0 deletions docs/examples/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,14 @@
integrity="sha384-zYFw+mxKy6r9zpAc1NoGiYBfQmxfvg7ONEMr81WeU+WLPPaLC9QTrNGFJTBi3EIn"
crossorigin="anonymous"
/>
<link rel="apple-touch-icon" href="../images/favicons/apple-touch-icon.png" sizes="180x180">
<link rel="icon" href="../images/favicons/favicon-32x32.png" sizes="32x32" type="image/png">
<link rel="icon" href="../images/favicons/favicon-16x16.png" sizes="16x16" type="image/png">
<link rel="manifest" href="../images/favicons/manifest.json">
<link rel="mask-icon" href="../images/favicons/safari-pinned-tab.svg" color="#000">
<link rel="icon" href="../images/favicons/favicon.ico">
<meta name="msapplication-config" content="../images/favicons/browserconfig.xml">
<meta name="theme-color" content="#000">
<script>
if (document.location.href.endsWith('/examples')) {
document.location.href = document.location.href + '/';
Expand Down
8 changes: 8 additions & 0 deletions docs/examples/multiple-line-chart.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,14 @@
rel="preconnect"
crossorigin="anonymous"
/>
<link rel="apple-touch-icon" href="../images/favicons/apple-touch-icon.png" sizes="180x180">
<link rel="icon" href="../images/favicons/favicon-32x32.png" sizes="32x32" type="image/png">
<link rel="icon" href="../images/favicons/favicon-16x16.png" sizes="16x16" type="image/png">
<link rel="manifest" href="../images/favicons/manifest.json">
<link rel="mask-icon" href="../images/favicons/safari-pinned-tab.svg" color="#000">
<link rel="icon" href="../images/favicons/favicon.ico">
<meta name="msapplication-config" content="../images/favicons/browserconfig.xml">
<meta name="theme-color" content="#000">

<!--------------------------------------------------
Echarts
Expand Down
8 changes: 8 additions & 0 deletions docs/examples/single-line-chart.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,14 @@
rel="preconnect"
crossorigin="anonymous"
/>
<link rel="apple-touch-icon" href="../images/favicons/apple-touch-icon.png" sizes="180x180">
<link rel="icon" href="../images/favicons/favicon-32x32.png" sizes="32x32" type="image/png">
<link rel="icon" href="../images/favicons/favicon-16x16.png" sizes="16x16" type="image/png">
<link rel="manifest" href="../images/favicons/manifest.json">
<link rel="mask-icon" href="../images/favicons/safari-pinned-tab.svg" color="#000">
<link rel="icon" href="../images/favicons/favicon.ico">
<meta name="msapplication-config" content="../images/favicons/browserconfig.xml">
<meta name="theme-color" content="#000">

<!--------------------------------------------------
Echarts
Expand Down
8 changes: 8 additions & 0 deletions docs/examples/stacked-bar-chart.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,14 @@
rel="preconnect"
crossorigin="anonymous"
/>
<link rel="apple-touch-icon" href="../images/favicons/apple-touch-icon.png" sizes="180x180">
<link rel="icon" href="../images/favicons/favicon-32x32.png" sizes="32x32" type="image/png">
<link rel="icon" href="../images/favicons/favicon-16x16.png" sizes="16x16" type="image/png">
<link rel="manifest" href="../images/favicons/manifest.json">
<link rel="mask-icon" href="../images/favicons/safari-pinned-tab.svg" color="#000">
<link rel="icon" href="../images/favicons/favicon.ico">
<meta name="msapplication-config" content="../images/favicons/browserconfig.xml">
<meta name="theme-color" content="#000">

<!--------------------------------------------------
Echarts
Expand Down
Binary file added docs/images/favicons/android-chrome-192x192.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/images/favicons/android-chrome-512x512.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/images/favicons/apple-touch-icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 9 additions & 0 deletions docs/images/favicons/browserconfig.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<browserconfig>
<msapplication>
<tile>
<square150x150logo src="./mstile-150x150.png"/>
<TileColor>#000000</TileColor>
</tile>
</msapplication>
</browserconfig>
Binary file added docs/images/favicons/favicon-16x16.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/images/favicons/favicon-32x32.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/images/favicons/favicon.ico
Binary file not shown.
20 changes: 20 additions & 0 deletions docs/images/favicons/manifest.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"name": "Orange Design System Charts",
"short_name": "ODS Charts",
"icons": [
{
"src": "android-chrome-192x192.png",
"sizes": "192x192",
"type": "image/png"
},
{
"src": "android-chrome-512x512.png",
"sizes": "512x512",
"type": "image/png"
}
],
"start_url": "/",
"theme_color": "#000000",
"background_color": "#000000",
"display": "standalone"
}
Binary file added docs/images/favicons/mstile-144x144.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/images/favicons/mstile-150x150.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/images/favicons/mstile-310x150.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/images/favicons/mstile-310x310.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/images/favicons/mstile-70x70.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
60 changes: 60 additions & 0 deletions docs/images/favicons/safari-pinned-tab.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 8 additions & 0 deletions docs/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,14 @@
integrity="sha384-zYFw+mxKy6r9zpAc1NoGiYBfQmxfvg7ONEMr81WeU+WLPPaLC9QTrNGFJTBi3EIn"
crossorigin="anonymous"
/>
<link rel="apple-touch-icon" href="images/favicons/apple-touch-icon.png" sizes="180x180">
<link rel="icon" href="images/favicons/favicon-32x32.png" sizes="32x32" type="image/png">
<link rel="icon" href="images/favicons/favicon-16x16.png" sizes="16x16" type="image/png">
<link rel="manifest" href="images/favicons/manifest.json">
<link rel="mask-icon" href="images/favicons/safari-pinned-tab.svg" color="#000">
<link rel="icon" href="images/favicons/favicon.ico">
<meta name="msapplication-config" content="images/favicons/browserconfig.xml">
<meta name="theme-color" content="#000">
<script>
if (document.location.href.endsWith('/docs')) {
document.location.href = document.location.href + '/';
Expand Down
Loading

0 comments on commit 244d94b

Please sign in to comment.