@dhis2-ui/logo 8.1.10 → 8.2.1
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 +6 -6
- package/build/cjs/logo-icon-svg.js +6 -5
- package/build/cjs/logo-svg.js +7 -6
- package/build/cjs/logo.js +47 -35
- package/build/cjs/logo.stories.js +13 -16
- package/build/es/logo-icon-svg.js +6 -5
- package/build/es/logo-svg.js +7 -6
- package/build/es/logo.js +46 -34
- package/build/es/logo.stories.js +12 -15
- package/package.json +2 -2
package/build/cjs/index.js
CHANGED
|
@@ -9,12 +9,6 @@ Object.defineProperty(exports, "Logo", {
|
|
|
9
9
|
return _logo.Logo;
|
|
10
10
|
}
|
|
11
11
|
});
|
|
12
|
-
Object.defineProperty(exports, "LogoWhite", {
|
|
13
|
-
enumerable: true,
|
|
14
|
-
get: function () {
|
|
15
|
-
return _logo.LogoWhite;
|
|
16
|
-
}
|
|
17
|
-
});
|
|
18
12
|
Object.defineProperty(exports, "LogoIcon", {
|
|
19
13
|
enumerable: true,
|
|
20
14
|
get: function () {
|
|
@@ -27,5 +21,11 @@ Object.defineProperty(exports, "LogoIconWhite", {
|
|
|
27
21
|
return _logo.LogoIconWhite;
|
|
28
22
|
}
|
|
29
23
|
});
|
|
24
|
+
Object.defineProperty(exports, "LogoWhite", {
|
|
25
|
+
enumerable: true,
|
|
26
|
+
get: function () {
|
|
27
|
+
return _logo.LogoWhite;
|
|
28
|
+
}
|
|
29
|
+
});
|
|
30
30
|
|
|
31
31
|
var _logo = require("./logo.js");
|
|
@@ -11,11 +11,12 @@ var _react = _interopRequireDefault(require("react"));
|
|
|
11
11
|
|
|
12
12
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
|
13
13
|
|
|
14
|
-
function LogoIconSvg({
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
14
|
+
function LogoIconSvg(_ref) {
|
|
15
|
+
let {
|
|
16
|
+
iconColor,
|
|
17
|
+
className,
|
|
18
|
+
dataTest
|
|
19
|
+
} = _ref;
|
|
19
20
|
return /*#__PURE__*/_react.default.createElement("svg", {
|
|
20
21
|
xmlns: "http://www.w3.org/2000/svg",
|
|
21
22
|
viewBox: "0 0 200 182",
|
package/build/cjs/logo-svg.js
CHANGED
|
@@ -11,12 +11,13 @@ var _react = _interopRequireDefault(require("react"));
|
|
|
11
11
|
|
|
12
12
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
|
13
13
|
|
|
14
|
-
function LogoSvg({
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
14
|
+
function LogoSvg(_ref) {
|
|
15
|
+
let {
|
|
16
|
+
iconColor,
|
|
17
|
+
textColor,
|
|
18
|
+
className,
|
|
19
|
+
dataTest
|
|
20
|
+
} = _ref;
|
|
20
21
|
return /*#__PURE__*/_react.default.createElement("svg", {
|
|
21
22
|
xmlns: "http://www.w3.org/2000/svg",
|
|
22
23
|
viewBox: "0 0 600 182",
|
package/build/cjs/logo.js
CHANGED
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
Object.defineProperty(exports, "__esModule", {
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
|
-
exports.LogoWhite = exports.
|
|
6
|
+
exports.LogoWhite = exports.LogoIconWhite = exports.LogoIcon = exports.Logo = void 0;
|
|
7
7
|
|
|
8
8
|
var _propTypes = _interopRequireDefault(require("prop-types"));
|
|
9
9
|
|
|
@@ -28,14 +28,17 @@ const blue = '#0080d4';
|
|
|
28
28
|
const white = '#ffffff';
|
|
29
29
|
const dark = '#212225';
|
|
30
30
|
|
|
31
|
-
const LogoIcon =
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
31
|
+
const LogoIcon = _ref => {
|
|
32
|
+
let {
|
|
33
|
+
className,
|
|
34
|
+
dataTest
|
|
35
|
+
} = _ref;
|
|
36
|
+
return /*#__PURE__*/_react.default.createElement(_logoIconSvg.LogoIconSvg, {
|
|
37
|
+
iconColor: blue,
|
|
38
|
+
className: className,
|
|
39
|
+
dataTest: dataTest
|
|
40
|
+
});
|
|
41
|
+
};
|
|
39
42
|
|
|
40
43
|
exports.LogoIcon = LogoIcon;
|
|
41
44
|
LogoIcon.defaultProps = {
|
|
@@ -46,14 +49,17 @@ LogoIcon.propTypes = {
|
|
|
46
49
|
dataTest: _propTypes.default.string
|
|
47
50
|
};
|
|
48
51
|
|
|
49
|
-
const LogoIconWhite =
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
52
|
+
const LogoIconWhite = _ref2 => {
|
|
53
|
+
let {
|
|
54
|
+
className,
|
|
55
|
+
dataTest
|
|
56
|
+
} = _ref2;
|
|
57
|
+
return /*#__PURE__*/_react.default.createElement(_logoIconSvg.LogoIconSvg, {
|
|
58
|
+
iconColor: white,
|
|
59
|
+
className: className,
|
|
60
|
+
dataTest: dataTest
|
|
61
|
+
});
|
|
62
|
+
};
|
|
57
63
|
|
|
58
64
|
exports.LogoIconWhite = LogoIconWhite;
|
|
59
65
|
LogoIconWhite.defaultProps = {
|
|
@@ -64,15 +70,18 @@ LogoIconWhite.propTypes = {
|
|
|
64
70
|
dataTest: _propTypes.default.string
|
|
65
71
|
};
|
|
66
72
|
|
|
67
|
-
const Logo =
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
73
|
+
const Logo = _ref3 => {
|
|
74
|
+
let {
|
|
75
|
+
className,
|
|
76
|
+
dataTest
|
|
77
|
+
} = _ref3;
|
|
78
|
+
return /*#__PURE__*/_react.default.createElement(_logoSvg.LogoSvg, {
|
|
79
|
+
iconColor: blue,
|
|
80
|
+
textColor: dark,
|
|
81
|
+
className: className,
|
|
82
|
+
dataTest: dataTest
|
|
83
|
+
});
|
|
84
|
+
};
|
|
76
85
|
|
|
77
86
|
exports.Logo = Logo;
|
|
78
87
|
Logo.defaultProps = {
|
|
@@ -83,15 +92,18 @@ Logo.propTypes = {
|
|
|
83
92
|
dataTest: _propTypes.default.string
|
|
84
93
|
};
|
|
85
94
|
|
|
86
|
-
const LogoWhite =
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
+
const LogoWhite = _ref4 => {
|
|
96
|
+
let {
|
|
97
|
+
className,
|
|
98
|
+
dataTest
|
|
99
|
+
} = _ref4;
|
|
100
|
+
return /*#__PURE__*/_react.default.createElement(_logoSvg.LogoSvg, {
|
|
101
|
+
iconColor: white,
|
|
102
|
+
textColor: white,
|
|
103
|
+
className: className,
|
|
104
|
+
dataTest: dataTest
|
|
105
|
+
});
|
|
106
|
+
};
|
|
95
107
|
|
|
96
108
|
exports.LogoWhite = LogoWhite;
|
|
97
109
|
LogoWhite.defaultProps = {
|
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
Object.defineProperty(exports, "__esModule", {
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
|
-
exports.
|
|
6
|
+
exports.default = exports._LogoWhite = exports._LogoIconWhite = exports._LogoIcon = exports._Logo = void 0;
|
|
7
7
|
|
|
8
8
|
var _react = _interopRequireDefault(require("react"));
|
|
9
9
|
|
|
@@ -11,13 +11,7 @@ var _logo = require("./logo.js");
|
|
|
11
11
|
|
|
12
12
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
|
13
13
|
|
|
14
|
-
const description =
|
|
15
|
-
The master DHIS2 logo should be used overall, whenever possible. The master logo is a blue colored icon with black colored dhis2 wordmark.
|
|
16
|
-
|
|
17
|
-
\`\`\`js
|
|
18
|
-
import { Logo, LogoWhite, LogoIcon, LogoIconWhite } from '@dhis2/ui'
|
|
19
|
-
\`\`\`
|
|
20
|
-
`;
|
|
14
|
+
const description = "\nThe master DHIS2 logo should be used overall, whenever possible. The master logo is a blue colored icon with black colored dhis2 wordmark.\n\n```js\nimport { Logo, LogoWhite, LogoIcon, LogoIconWhite } from '@dhis2/ui'\n```\n";
|
|
21
15
|
|
|
22
16
|
const Wrapper = fn => /*#__PURE__*/_react.default.createElement("div", {
|
|
23
17
|
style: {
|
|
@@ -25,16 +19,19 @@ const Wrapper = fn => /*#__PURE__*/_react.default.createElement("div", {
|
|
|
25
19
|
}
|
|
26
20
|
}, fn());
|
|
27
21
|
|
|
28
|
-
const Background =
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
22
|
+
const Background = _ref => {
|
|
23
|
+
let {
|
|
24
|
+
children
|
|
25
|
+
} = _ref;
|
|
26
|
+
return /*#__PURE__*/_react.default.createElement("div", {
|
|
27
|
+
style: {
|
|
28
|
+
backgroundColor: '#276696'
|
|
29
|
+
}
|
|
30
|
+
}, children);
|
|
31
|
+
};
|
|
35
32
|
|
|
36
33
|
var _default = {
|
|
37
|
-
title: '
|
|
34
|
+
title: 'Logo',
|
|
38
35
|
component: _logo.Logo,
|
|
39
36
|
decorators: [Wrapper],
|
|
40
37
|
parameters: {
|
|
@@ -1,10 +1,11 @@
|
|
|
1
1
|
import PropTypes from 'prop-types';
|
|
2
2
|
import React from 'react';
|
|
3
|
-
export function LogoIconSvg({
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
3
|
+
export function LogoIconSvg(_ref) {
|
|
4
|
+
let {
|
|
5
|
+
iconColor,
|
|
6
|
+
className,
|
|
7
|
+
dataTest
|
|
8
|
+
} = _ref;
|
|
8
9
|
return /*#__PURE__*/React.createElement("svg", {
|
|
9
10
|
xmlns: "http://www.w3.org/2000/svg",
|
|
10
11
|
viewBox: "0 0 200 182",
|
package/build/es/logo-svg.js
CHANGED
|
@@ -1,11 +1,12 @@
|
|
|
1
1
|
import PropTypes from 'prop-types';
|
|
2
2
|
import React from 'react';
|
|
3
|
-
export function LogoSvg({
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
3
|
+
export function LogoSvg(_ref) {
|
|
4
|
+
let {
|
|
5
|
+
iconColor,
|
|
6
|
+
textColor,
|
|
7
|
+
className,
|
|
8
|
+
dataTest
|
|
9
|
+
} = _ref;
|
|
9
10
|
return /*#__PURE__*/React.createElement("svg", {
|
|
10
11
|
xmlns: "http://www.w3.org/2000/svg",
|
|
11
12
|
viewBox: "0 0 600 182",
|
package/build/es/logo.js
CHANGED
|
@@ -15,14 +15,17 @@ import { LogoSvg } from './logo-svg.js';
|
|
|
15
15
|
const blue = '#0080d4';
|
|
16
16
|
const white = '#ffffff';
|
|
17
17
|
const dark = '#212225';
|
|
18
|
-
export const LogoIcon =
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
18
|
+
export const LogoIcon = _ref => {
|
|
19
|
+
let {
|
|
20
|
+
className,
|
|
21
|
+
dataTest
|
|
22
|
+
} = _ref;
|
|
23
|
+
return /*#__PURE__*/React.createElement(LogoIconSvg, {
|
|
24
|
+
iconColor: blue,
|
|
25
|
+
className: className,
|
|
26
|
+
dataTest: dataTest
|
|
27
|
+
});
|
|
28
|
+
};
|
|
26
29
|
LogoIcon.defaultProps = {
|
|
27
30
|
dataTest: 'dhis2-uicore-logoicon'
|
|
28
31
|
};
|
|
@@ -30,14 +33,17 @@ LogoIcon.propTypes = {
|
|
|
30
33
|
className: PropTypes.string,
|
|
31
34
|
dataTest: PropTypes.string
|
|
32
35
|
};
|
|
33
|
-
export const LogoIconWhite =
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
36
|
+
export const LogoIconWhite = _ref2 => {
|
|
37
|
+
let {
|
|
38
|
+
className,
|
|
39
|
+
dataTest
|
|
40
|
+
} = _ref2;
|
|
41
|
+
return /*#__PURE__*/React.createElement(LogoIconSvg, {
|
|
42
|
+
iconColor: white,
|
|
43
|
+
className: className,
|
|
44
|
+
dataTest: dataTest
|
|
45
|
+
});
|
|
46
|
+
};
|
|
41
47
|
LogoIconWhite.defaultProps = {
|
|
42
48
|
dataTest: 'dhis2-uicore-logoiconwhite'
|
|
43
49
|
};
|
|
@@ -45,15 +51,18 @@ LogoIconWhite.propTypes = {
|
|
|
45
51
|
className: PropTypes.string,
|
|
46
52
|
dataTest: PropTypes.string
|
|
47
53
|
};
|
|
48
|
-
export const Logo =
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
54
|
+
export const Logo = _ref3 => {
|
|
55
|
+
let {
|
|
56
|
+
className,
|
|
57
|
+
dataTest
|
|
58
|
+
} = _ref3;
|
|
59
|
+
return /*#__PURE__*/React.createElement(LogoSvg, {
|
|
60
|
+
iconColor: blue,
|
|
61
|
+
textColor: dark,
|
|
62
|
+
className: className,
|
|
63
|
+
dataTest: dataTest
|
|
64
|
+
});
|
|
65
|
+
};
|
|
57
66
|
Logo.defaultProps = {
|
|
58
67
|
dataTest: 'dhis2-uicore-logo'
|
|
59
68
|
};
|
|
@@ -61,15 +70,18 @@ Logo.propTypes = {
|
|
|
61
70
|
className: PropTypes.string,
|
|
62
71
|
dataTest: PropTypes.string
|
|
63
72
|
};
|
|
64
|
-
export const LogoWhite =
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
+
export const LogoWhite = _ref4 => {
|
|
74
|
+
let {
|
|
75
|
+
className,
|
|
76
|
+
dataTest
|
|
77
|
+
} = _ref4;
|
|
78
|
+
return /*#__PURE__*/React.createElement(LogoSvg, {
|
|
79
|
+
iconColor: white,
|
|
80
|
+
textColor: white,
|
|
81
|
+
className: className,
|
|
82
|
+
dataTest: dataTest
|
|
83
|
+
});
|
|
84
|
+
};
|
|
73
85
|
LogoWhite.defaultProps = {
|
|
74
86
|
dataTest: 'dhis2-uicore-logowhite'
|
|
75
87
|
};
|
package/build/es/logo.stories.js
CHANGED
|
@@ -1,12 +1,6 @@
|
|
|
1
1
|
import React from 'react';
|
|
2
2
|
import { Logo, LogoWhite, LogoIcon, LogoIconWhite } from './logo.js';
|
|
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.
|
|
5
|
-
|
|
6
|
-
\`\`\`js
|
|
7
|
-
import { Logo, LogoWhite, LogoIcon, LogoIconWhite } from '@dhis2/ui'
|
|
8
|
-
\`\`\`
|
|
9
|
-
`;
|
|
3
|
+
const description = "\nThe master DHIS2 logo should be used overall, whenever possible. The master logo is a blue colored icon with black colored dhis2 wordmark.\n\n```js\nimport { Logo, LogoWhite, LogoIcon, LogoIconWhite } from '@dhis2/ui'\n```\n";
|
|
10
4
|
|
|
11
5
|
const Wrapper = fn => /*#__PURE__*/React.createElement("div", {
|
|
12
6
|
style: {
|
|
@@ -14,16 +8,19 @@ const Wrapper = fn => /*#__PURE__*/React.createElement("div", {
|
|
|
14
8
|
}
|
|
15
9
|
}, fn());
|
|
16
10
|
|
|
17
|
-
const Background =
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
11
|
+
const Background = _ref => {
|
|
12
|
+
let {
|
|
13
|
+
children
|
|
14
|
+
} = _ref;
|
|
15
|
+
return /*#__PURE__*/React.createElement("div", {
|
|
16
|
+
style: {
|
|
17
|
+
backgroundColor: '#276696'
|
|
18
|
+
}
|
|
19
|
+
}, children);
|
|
20
|
+
};
|
|
24
21
|
|
|
25
22
|
export default {
|
|
26
|
-
title: '
|
|
23
|
+
title: 'Logo',
|
|
27
24
|
component: Logo,
|
|
28
25
|
decorators: [Wrapper],
|
|
29
26
|
parameters: {
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@dhis2-ui/logo",
|
|
3
|
-
"version": "8.1
|
|
3
|
+
"version": "8.2.1",
|
|
4
4
|
"description": "UI Logo",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -32,7 +32,7 @@
|
|
|
32
32
|
},
|
|
33
33
|
"dependencies": {
|
|
34
34
|
"@dhis2/prop-types": "^3.0.0-beta.1",
|
|
35
|
-
"@dhis2/ui-constants": "8.1
|
|
35
|
+
"@dhis2/ui-constants": "8.2.1",
|
|
36
36
|
"classnames": "^2.3.1",
|
|
37
37
|
"prop-types": "^15.7.2"
|
|
38
38
|
},
|