Skip to content

Commit 3c35613

Browse files
authored
Merge pull request #1398 from undp/develop
Release 1.3.2
2 parents dce8fee + 80c14a2 commit 3c35613

27 files changed

+579
-804
lines changed

.storybook/main.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ export default {
1111
actions: false, // 👈 disable the actions addon
1212
},
1313
},
14-
'storybook-addon-rtl',
14+
// 'storybook-addon-rtl',
1515
'@storybook/blocks',
1616
'@storybook/addon-a11y',
1717
'@storybook/react-webpack5',

.storybook/preview-head.html

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
<link rel="stylesheet" href="https://use.typekit.net/icr3zpi.css">
1+
<link href="https://use.typekit.net/icr3zpi.css" rel="stylesheet">
2+
<link href="https://fonts.googleapis.com/css2?family=Noto+Sans+Arabic:[email protected]&family=Noto+Sans+JP:[email protected]&family=Noto+Sans+Myanmar:wght@100;200;300;400;500;600;700;800;900&display=swap" rel="stylesheet">
23
<!-- CSS to override doc page -->
34
<style type="text/css">
45
.sbdocs .sbdocs-a, .sbdocs a[aria-hidden="true"] {
@@ -38,11 +39,11 @@
3839
.sbdocs .sbdocs-h6 {
3940
font-family: proxima-nova, sans-serif;
4041
}
42+
4143
</style>
4244

4345
<!-- external libs-->
4446
<script src="https://cdn.jsdelivr.net/npm/jquery@3/dist/jquery.min.js"></script>
45-
<!-- <script src="https://cdn.jsdelivr.net/npm/jquery-ui-dist@1/jquery-ui.min.js"></script> -->
4647
<script src="https://cdn.jsdelivr.net/npm/gsap@3/dist/gsap.min.js"></script>
4748
<script src="https://cdn.jsdelivr.net/npm/gsap@3/dist/ScrollTrigger.min.js"></script>
4849
<script src="https://cdn.jsdelivr.net/npm/gsap@3/dist/EasePack.min.js"></script>

.storybook/preview.js

+17-8
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
// import { INITIAL_VIEWPORTS } from '@storybook/addon-viewport';
22
// import * as RTLAddon from 'storybook-addon-rtl';
3-
import renderToHTML from './renderToHTML';
4-
import { allModes } from './modes';
3+
import { allModes } from './modes'
4+
import renderToHTML from './renderToHTML'
55

66

77
// include base styling globally
8-
import '!style-loader!css-loader!sass-loader!../stories/assets/scss/base-minimal.scss';
9-
import '!style-loader!css-loader!sass-loader!../docs/css/components/documentation.min.css';
8+
import '!style-loader!css-loader!sass-loader!../docs/css/components/documentation.min.css'
9+
import '!style-loader!css-loader!sass-loader!../stories/assets/scss/base-minimal.scss'
1010

1111
// Log the contents of RTLAddon for debugging
1212

@@ -84,7 +84,13 @@ export const globalTypes = {
8484
{ value: 'arabic', title: 'Arabic' },
8585
{ value: 'burmese', title: 'Burmese' },
8686
{ value: 'japanese', title: 'Japanese' },
87-
{ value: 'ukrainian', title: 'Ukrainian' }
87+
{ value: 'ukrainian', title: 'Ukrainian' },
88+
// { value: 'azerbaijani', title: 'Azerbaijani' },
89+
// { value: 'georgian', title: 'Georgian' },
90+
// { value: 'khmer', title: 'Khmer' },
91+
// { value: 'nepali', title: 'Nepali' },
92+
// { value: 'chinese', title: 'Chinese' },
93+
// { value: 'korean', title: 'Korean' }
8894
],
8995
},
9096
},
@@ -122,15 +128,18 @@ const getLangCode = (Story, context) => {
122128
'arabic': 'ar',
123129
'burmese': 'my',
124130
'japanese': 'ja',
125-
'ukrainian': 'uk'
131+
'ukrainian': 'uk',
126132
};
127133

128134
if (typeof langArr[activeLang] == 'undefined') {
129135
activeLang = 'english';
130136
}
131137

132-
const htmlElem = document.querySelector('html');
133-
htmlElem.setAttribute('lang', langArr[activeLang]);
138+
const htmlElem = document.querySelectorAll('#storybook-root, .sb-story');
139+
htmlElem.forEach(ele => {
140+
ele.setAttribute('lang', langArr[activeLang]);
141+
ele.setAttribute('dir', activeLang === 'arabic' ? 'rtl' : 'ltr');
142+
});
134143

135144
return (
136145
<Story {...context} />

.storybook/theme.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { create } from '@storybook/theming';
22

33
export default create({
4-
base: 'light',
4+
base: window.matchMedia && window.matchMedia('(prefers-color-scheme: dark)').matches ? 'dark' : 'light',
55
brandTitle: 'UNDP Design system',
66
brandUrl: 'https://www.undp.org/',
77
brandImage: './images/undp-logo-blue.svg'

docs/css/base-minimal-no-grid.min.css

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/css/base-minimal.min.css

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/css/components/accordion.min.css

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/css/components/documentation.min.css

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/css/components/language-switcher.min.css

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/css/components/menu-multi-level.min.css

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/css/components/menu-overflow.min.css

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/css/components/menu.min.css

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/css/components/page-hero.min.css

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)