Skip to content

Commit 3809e6a

Browse files
committed
Merge branch 'release/10.11.0'
2 parents e907a6a + ea8d968 commit 3809e6a

8 files changed

Lines changed: 51 additions & 35 deletions

File tree

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
# Change Log
22
This project adheres to [Semantic Versioning](http://semver.org/).
33

4+
## 10.11.0
5+
_May 23, 2024_
6+
- Adds a new parent class name for all CSS from the React CM UI library, to assist with controlling styling bundled with Healthy Church widgets. [PR #495](https://github.com/saddlebackdev/react-cm-ui/pull/495)
7+
48
## 10.10.1
59
_May 1, 2024_
610
- Incorporate change from `10.9.9-hotfix1` into `latest`.

package-lock.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@saddlebackchurch/react-cm-ui",
3-
"version": "10.10.1",
3+
"version": "10.11.0",
44
"description": "React UI for Healthy Church",
55
"jsnext:main": "src/",
66
"main": "core/",

src/global/constants.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,3 +56,5 @@ export const EMAIL_LINK_CLASSES = `${UI_CLASS_NAME} ${BEM_EMAIL_LINK}`;
5656
export const PERSON_CORE_MILESTONES_CLASSES = `${UI_CLASS_NAME} ${BEM_PERSON_CORE_MILESTONES}`;
5757
export const PERSON_CONTACT_INFO_CLASSES = `${UI_CLASS_NAME} ${BEM_PERSON_CONTACT_INFO}`;
5858
export const TELEPHONE_LINK_CLASSES = `${UI_CLASS_NAME} ${BEM_TELEPHONE_LINK}`;
59+
60+
export const UI_LIBRARY_ROOT_CLASS = '.hc-ui';

src/style.scss

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,20 @@
1+
// Source Sans Pro
2+
@import url(https://fonts.googleapis.com/css?family=Source+Sans+Pro:200,300,400,600,700,600italic,400italic,700italic);
3+
4+
.hc-ui {
5+
@import './styles/colors', './styles/fonts', './styles/fontSizeCalculator';
6+
7+
color: color(color);
8+
font-family: $fontFamily;
9+
font-size: em(16px);
10+
font-weight: $fontWeightRegular;
11+
//letter-spacing: .7px;
12+
line-height: 1.375;
13+
-moz-osx-font-smoothing: grayscale;
14+
-ms-text-size-adjust: 100%;
15+
-webkit-text-size-adjust: 100%;
16+
-webkit-font-smoothing: antialiased;
17+
118
// Base
219
@import './styles/normalize';
320
@import './styles/typography';
@@ -63,3 +80,5 @@
6380
@import './surfaces/infoBar/infoBar';
6481
@import './surfaces/modalDeprecated/modalDeprecated';
6582
@import './surfaces/titleBar/titleBar';
83+
84+
}

src/styles/normalize.scss

Lines changed: 23 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,28 @@
11
/*! normalize.css v3.0.2 | MIT License | git.io/normalize */
22

3-
/**
4-
* 1. Set default font family to sans-serif.
5-
* 2. Prevent iOS text size adjust after orientation change, without disabling
6-
* user zoom.
7-
*/
8-
9-
html {
10-
font-family: sans-serif; /* 1 */
11-
-ms-text-size-adjust: 100%; /* 2 */
12-
-webkit-text-size-adjust: 100%; /* 2 */
13-
}
14-
15-
/**
16-
* Remove default margin.
17-
*/
18-
19-
body {
20-
margin: 0;
21-
}
3+
//
4+
// Need to prevent any impact on html/body elements by react-cm-ui library
5+
// so that the library works correctly in widgets
6+
//
7+
// /**
8+
// * 1. Set default font family to sans-serif.
9+
// * 2. Prevent iOS text size adjust after orientation change, without disabling
10+
// * user zoom.
11+
// */
12+
13+
// html {
14+
// font-family: sans-serif; /* 1 */
15+
// -ms-text-size-adjust: 100%; /* 2 */
16+
// -webkit-text-size-adjust: 100%; /* 2 */
17+
// }
18+
19+
// /**
20+
// * Remove default margin.
21+
// */
22+
23+
// body {
24+
// margin: 0;
25+
// }
2226

2327
/* HTML5 display definitions
2428
========================================================================== */

src/styles/typography.scss

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,6 @@
11
@import './colors', './fonts', './fontSizeCalculator';
22

3-
// Source Sans Pro
4-
@import url(https://fonts.googleapis.com/css?family=Source+Sans+Pro:200,300,400,600,700,600italic,400italic,700italic);
53

6-
html { font-size: 100%; }
7-
body {
8-
color: color(color);
9-
font-family: $fontFamily;
10-
font-size: em(16px);
11-
-moz-osx-font-smoothing: grayscale;
12-
-webkit-font-smoothing: antialiased;
13-
font-weight: $fontWeightRegular;
14-
//letter-spacing: .7px;
15-
line-height: 1.375;
16-
}
174
//Links
185
a {
196
color: color(colorLink);

src/versions.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
const versions = {
2020
'react-cm-ui': {
21-
package: '10.10.1',
21+
package: '10.11.0',
2222
components: {
2323
dataDisplay: {
2424
chip: {

0 commit comments

Comments
 (0)