@dhis2-ui/logo 9.11.0 → 9.11.1-beta.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/build/cjs/index.js +0 -1
- package/build/cjs/logo-icon-svg.js +1 -6
- package/build/cjs/logo-svg.js +1 -6
- package/build/cjs/logo.js +1 -15
- package/build/cjs/{logo.stories.js → logo.prod.stories.js} +9 -19
- package/build/es/logo.js +1 -1
- package/build/es/{logo.stories.js → logo.prod.stories.js} +6 -3
- package/package.json +5 -5
package/build/cjs/index.js
CHANGED
|
@@ -4,13 +4,9 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
6
|
exports.LogoIconSvg = LogoIconSvg;
|
|
7
|
-
|
|
8
7
|
var _propTypes = _interopRequireDefault(require("prop-types"));
|
|
9
|
-
|
|
10
8
|
var _react = _interopRequireDefault(require("react"));
|
|
11
|
-
|
|
12
|
-
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
|
13
|
-
|
|
9
|
+
function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
|
|
14
10
|
function LogoIconSvg(_ref) {
|
|
15
11
|
let {
|
|
16
12
|
iconColor,
|
|
@@ -33,7 +29,6 @@ function LogoIconSvg(_ref) {
|
|
|
33
29
|
d: "M191.73,101.46l-8.62-5.59-14.05,9.06,10.53,6.83-78.91,51.15a4.37,4.37,0,0,1-3.49,0l-77-52.5,10-6.47L16.55,94.57,8.31,99.91a12,12,0,0,0-.25,20.63L88.6,175.46a19.34,19.34,0,0,0,20.37.24l82.75-53.65a11.88,11.88,0,0,0,0-20.59Z"
|
|
34
30
|
}));
|
|
35
31
|
}
|
|
36
|
-
|
|
37
32
|
LogoIconSvg.propTypes = {
|
|
38
33
|
iconColor: _propTypes.default.string.isRequired,
|
|
39
34
|
className: _propTypes.default.string,
|
package/build/cjs/logo-svg.js
CHANGED
|
@@ -4,13 +4,9 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
6
|
exports.LogoSvg = LogoSvg;
|
|
7
|
-
|
|
8
7
|
var _propTypes = _interopRequireDefault(require("prop-types"));
|
|
9
|
-
|
|
10
8
|
var _react = _interopRequireDefault(require("react"));
|
|
11
|
-
|
|
12
|
-
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
|
13
|
-
|
|
9
|
+
function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
|
|
14
10
|
function LogoSvg(_ref) {
|
|
15
11
|
let {
|
|
16
12
|
iconColor,
|
|
@@ -55,7 +51,6 @@ function LogoSvg(_ref) {
|
|
|
55
51
|
d: "M544.06,118.59V115a8.65,8.65,0,0,1,2.79-6.55c1.85-1.75,4.89-3.19,9.11-4.29l15.8-3.92Q585,96.92,591,90.82t5.95-17.24q0-11.13-9.18-18.66-9.5-7.83-24.24-7.83-15.79,0-25.29,6.77Q528.26,61.09,528,74.64h19.72q1.5-12,16.71-12,6.92,0,10.83,3.31a10.42,10.42,0,0,1,3.92,8.29,11.34,11.34,0,0,1-3.39,8.35q-3.39,3.39-11.67,5.49L549.79,91.5q-12.21,3-17.77,9.33-5.71,6.77-5.72,19.26v14.76h71.2V118.59Z"
|
|
56
52
|
}));
|
|
57
53
|
}
|
|
58
|
-
|
|
59
54
|
LogoSvg.propTypes = {
|
|
60
55
|
iconColor: _propTypes.default.string.isRequired,
|
|
61
56
|
textColor: _propTypes.default.string.isRequired,
|
package/build/cjs/logo.js
CHANGED
|
@@ -4,17 +4,11 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
6
|
exports.LogoWhite = exports.LogoIconWhite = exports.LogoIcon = exports.Logo = void 0;
|
|
7
|
-
|
|
8
7
|
var _propTypes = _interopRequireDefault(require("prop-types"));
|
|
9
|
-
|
|
10
8
|
var _react = _interopRequireDefault(require("react"));
|
|
11
|
-
|
|
12
9
|
var _logoIconSvg = require("./logo-icon-svg.js");
|
|
13
|
-
|
|
14
10
|
var _logoSvg = require("./logo-svg.js");
|
|
15
|
-
|
|
16
|
-
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
|
17
|
-
|
|
11
|
+
function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
|
|
18
12
|
/*
|
|
19
13
|
* These are official colors for dhis2 logos.
|
|
20
14
|
*
|
|
@@ -27,7 +21,6 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
|
|
|
27
21
|
const blue = '#0080d4';
|
|
28
22
|
const white = '#ffffff';
|
|
29
23
|
const dark = '#212225';
|
|
30
|
-
|
|
31
24
|
const LogoIcon = _ref => {
|
|
32
25
|
let {
|
|
33
26
|
className,
|
|
@@ -39,7 +32,6 @@ const LogoIcon = _ref => {
|
|
|
39
32
|
dataTest: dataTest
|
|
40
33
|
});
|
|
41
34
|
};
|
|
42
|
-
|
|
43
35
|
exports.LogoIcon = LogoIcon;
|
|
44
36
|
LogoIcon.defaultProps = {
|
|
45
37
|
dataTest: 'dhis2-uicore-logoicon'
|
|
@@ -48,7 +40,6 @@ LogoIcon.propTypes = {
|
|
|
48
40
|
className: _propTypes.default.string,
|
|
49
41
|
dataTest: _propTypes.default.string
|
|
50
42
|
};
|
|
51
|
-
|
|
52
43
|
const LogoIconWhite = _ref2 => {
|
|
53
44
|
let {
|
|
54
45
|
className,
|
|
@@ -60,7 +51,6 @@ const LogoIconWhite = _ref2 => {
|
|
|
60
51
|
dataTest: dataTest
|
|
61
52
|
});
|
|
62
53
|
};
|
|
63
|
-
|
|
64
54
|
exports.LogoIconWhite = LogoIconWhite;
|
|
65
55
|
LogoIconWhite.defaultProps = {
|
|
66
56
|
dataTest: 'dhis2-uicore-logoiconwhite'
|
|
@@ -69,7 +59,6 @@ LogoIconWhite.propTypes = {
|
|
|
69
59
|
className: _propTypes.default.string,
|
|
70
60
|
dataTest: _propTypes.default.string
|
|
71
61
|
};
|
|
72
|
-
|
|
73
62
|
const Logo = _ref3 => {
|
|
74
63
|
let {
|
|
75
64
|
className,
|
|
@@ -82,7 +71,6 @@ const Logo = _ref3 => {
|
|
|
82
71
|
dataTest: dataTest
|
|
83
72
|
});
|
|
84
73
|
};
|
|
85
|
-
|
|
86
74
|
exports.Logo = Logo;
|
|
87
75
|
Logo.defaultProps = {
|
|
88
76
|
dataTest: 'dhis2-uicore-logo'
|
|
@@ -91,7 +79,6 @@ Logo.propTypes = {
|
|
|
91
79
|
className: _propTypes.default.string,
|
|
92
80
|
dataTest: _propTypes.default.string
|
|
93
81
|
};
|
|
94
|
-
|
|
95
82
|
const LogoWhite = _ref4 => {
|
|
96
83
|
let {
|
|
97
84
|
className,
|
|
@@ -104,7 +91,6 @@ const LogoWhite = _ref4 => {
|
|
|
104
91
|
dataTest: dataTest
|
|
105
92
|
});
|
|
106
93
|
};
|
|
107
|
-
|
|
108
94
|
exports.LogoWhite = LogoWhite;
|
|
109
95
|
LogoWhite.defaultProps = {
|
|
110
96
|
dataTest: 'dhis2-uicore-logowhite'
|
|
@@ -4,21 +4,21 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
6
|
exports.default = exports._LogoWhite = exports._LogoIconWhite = exports._LogoIcon = exports._Logo = void 0;
|
|
7
|
-
|
|
8
7
|
var _react = _interopRequireDefault(require("react"));
|
|
9
|
-
|
|
10
8
|
var _logo = require("./logo.js");
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
9
|
+
function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
|
|
10
|
+
const description = `
|
|
11
|
+
The master DHIS2 logo should be used overall, whenever possible. The master logo is a blue colored icon with black colored dhis2 wordmark.
|
|
12
|
+
|
|
13
|
+
\`\`\`js
|
|
14
|
+
import { Logo, LogoWhite, LogoIcon, LogoIconWhite } from '@dhis2/ui'
|
|
15
|
+
\`\`\`
|
|
16
|
+
`;
|
|
16
17
|
const Wrapper = fn => /*#__PURE__*/_react.default.createElement("div", {
|
|
17
18
|
style: {
|
|
18
19
|
width: '358px'
|
|
19
20
|
}
|
|
20
21
|
}, fn());
|
|
21
|
-
|
|
22
22
|
const Background = _ref => {
|
|
23
23
|
let {
|
|
24
24
|
children
|
|
@@ -29,8 +29,7 @@ const Background = _ref => {
|
|
|
29
29
|
}
|
|
30
30
|
}, children);
|
|
31
31
|
};
|
|
32
|
-
|
|
33
|
-
var _default = {
|
|
32
|
+
var _default = exports.default = {
|
|
34
33
|
title: 'Logo',
|
|
35
34
|
component: _logo.Logo,
|
|
36
35
|
decorators: [Wrapper],
|
|
@@ -42,14 +41,9 @@ var _default = {
|
|
|
42
41
|
}
|
|
43
42
|
}
|
|
44
43
|
};
|
|
45
|
-
exports.default = _default;
|
|
46
|
-
|
|
47
44
|
const _Logo = args => /*#__PURE__*/_react.default.createElement(_logo.Logo, args);
|
|
48
|
-
|
|
49
45
|
exports._Logo = _Logo;
|
|
50
|
-
|
|
51
46
|
const _LogoWhite = args => /*#__PURE__*/_react.default.createElement(Background, null, /*#__PURE__*/_react.default.createElement(_logo.LogoWhite, args));
|
|
52
|
-
|
|
53
47
|
exports._LogoWhite = _LogoWhite;
|
|
54
48
|
_LogoWhite.parameters = {
|
|
55
49
|
docs: {
|
|
@@ -58,9 +52,7 @@ _LogoWhite.parameters = {
|
|
|
58
52
|
}
|
|
59
53
|
}
|
|
60
54
|
};
|
|
61
|
-
|
|
62
55
|
const _LogoIcon = args => /*#__PURE__*/_react.default.createElement(_logo.LogoIcon, args);
|
|
63
|
-
|
|
64
56
|
exports._LogoIcon = _LogoIcon;
|
|
65
57
|
_LogoIcon.parameters = {
|
|
66
58
|
docs: {
|
|
@@ -69,7 +61,5 @@ _LogoIcon.parameters = {
|
|
|
69
61
|
}
|
|
70
62
|
}
|
|
71
63
|
};
|
|
72
|
-
|
|
73
64
|
const _LogoIconWhite = args => /*#__PURE__*/_react.default.createElement(Background, null, /*#__PURE__*/_react.default.createElement(_logo.LogoIconWhite, args));
|
|
74
|
-
|
|
75
65
|
exports._LogoIconWhite = _LogoIconWhite;
|
package/build/es/logo.js
CHANGED
|
@@ -2,6 +2,7 @@ import PropTypes from 'prop-types';
|
|
|
2
2
|
import React from 'react';
|
|
3
3
|
import { LogoIconSvg } from './logo-icon-svg.js';
|
|
4
4
|
import { LogoSvg } from './logo-svg.js';
|
|
5
|
+
|
|
5
6
|
/*
|
|
6
7
|
* These are official colors for dhis2 logos.
|
|
7
8
|
*
|
|
@@ -11,7 +12,6 @@ import { LogoSvg } from './logo-svg.js';
|
|
|
11
12
|
* https://github.com/dhis2/dhis2-identity
|
|
12
13
|
*
|
|
13
14
|
*/
|
|
14
|
-
|
|
15
15
|
const blue = '#0080d4';
|
|
16
16
|
const white = '#ffffff';
|
|
17
17
|
const dark = '#212225';
|
|
@@ -1,13 +1,17 @@
|
|
|
1
1
|
import React from 'react';
|
|
2
2
|
import { Logo, LogoWhite, LogoIcon, LogoIconWhite } from './logo.js';
|
|
3
|
-
const description =
|
|
3
|
+
const description = `
|
|
4
|
+
The master DHIS2 logo should be used overall, whenever possible. The master logo is a blue colored icon with black colored dhis2 wordmark.
|
|
4
5
|
|
|
6
|
+
\`\`\`js
|
|
7
|
+
import { Logo, LogoWhite, LogoIcon, LogoIconWhite } from '@dhis2/ui'
|
|
8
|
+
\`\`\`
|
|
9
|
+
`;
|
|
5
10
|
const Wrapper = fn => /*#__PURE__*/React.createElement("div", {
|
|
6
11
|
style: {
|
|
7
12
|
width: '358px'
|
|
8
13
|
}
|
|
9
14
|
}, fn());
|
|
10
|
-
|
|
11
15
|
const Background = _ref => {
|
|
12
16
|
let {
|
|
13
17
|
children
|
|
@@ -18,7 +22,6 @@ const Background = _ref => {
|
|
|
18
22
|
}
|
|
19
23
|
}, children);
|
|
20
24
|
};
|
|
21
|
-
|
|
22
25
|
export default {
|
|
23
26
|
title: 'Logo',
|
|
24
27
|
component: Logo,
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@dhis2-ui/logo",
|
|
3
|
-
"version": "9.11.
|
|
3
|
+
"version": "9.11.1-beta.2",
|
|
4
4
|
"description": "UI Logo",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -22,18 +22,18 @@
|
|
|
22
22
|
"access": "public"
|
|
23
23
|
},
|
|
24
24
|
"scripts": {
|
|
25
|
-
"start": "
|
|
25
|
+
"start": "storybook dev -c ../../storybook/config --port 5000",
|
|
26
26
|
"build": "d2-app-scripts build",
|
|
27
27
|
"test": "d2-app-scripts test --jestConfig ../../jest.config.shared.js"
|
|
28
28
|
},
|
|
29
29
|
"peerDependencies": {
|
|
30
|
-
"react": "^16.
|
|
31
|
-
"react-dom": "^16.
|
|
30
|
+
"react": "^16.13",
|
|
31
|
+
"react-dom": "^16.13",
|
|
32
32
|
"styled-jsx": "^4"
|
|
33
33
|
},
|
|
34
34
|
"dependencies": {
|
|
35
35
|
"@dhis2/prop-types": "^3.1.2",
|
|
36
|
-
"@dhis2/ui-constants": "9.11.
|
|
36
|
+
"@dhis2/ui-constants": "9.11.1-beta.2",
|
|
37
37
|
"classnames": "^2.3.1",
|
|
38
38
|
"prop-types": "^15.7.2"
|
|
39
39
|
},
|