Skip to content

[release/10.11.0] PBI AB#97569 [Tech Debt] - Healthy Church Widgets Framework - Ensure CSS shipped with widgets CANNOT affect anything on consuming page, outside of widget's container #495

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
groberts314 merged 10 commits into from
May 23, 2024
Merged

[release/10.11.0] PBI AB#97569 [Tech Debt] - Healthy Church Widgets Framework - Ensure CSS shipped with widgets CANNOT affect anything on consuming page, outside of widget's container #495

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
dcfa080
Wrapping all CSS styles into the single root class .react-cm-ui
IlyaRadinsky Apr 26, 2024
8dbc80a
Merge branch 'dev' of https://github.com/saddlebackdev/react-cm-ui in…
IlyaRadinsky Apr 29, 2024
6e70e05
Global .react-cm-ui replaced by .hc-ui
IlyaRadinsky Apr 30, 2024
33d075f
Merge branch 'release/10.11.0' into features/97569-css-bundle
groberts314 Apr 30, 2024
b924672
Merge branch 'release/10.11.0' into features/97569-css-bundle
groberts314 May 1, 2024
e7c989a
<html/> / <body/> related stuff moved from the typography.scss to the…
IlyaRadinsky May 7, 2024
b6f96e8
Merge branch 'release/10.11.0' into features/97569-css-bundle
groberts314 May 8, 2024
e5cacc3
fix: other stylesheet imports
groberts314 May 8, 2024
1bff88e
Font import moved to the top
IlyaRadinsky May 10, 2024
c9ab9d7
Merge branch 'release/10.11.0' into features/97569-css-bundle
groberts314 May 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/global/constants.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,3 +56,5 @@ export const EMAIL_LINK_CLASSES = `${UI_CLASS_NAME} ${BEM_EMAIL_LINK}`;
export const PERSON_CORE_MILESTONES_CLASSES = `${UI_CLASS_NAME} ${BEM_PERSON_CORE_MILESTONES}`;
export const PERSON_CONTACT_INFO_CLASSES = `${UI_CLASS_NAME} ${BEM_PERSON_CONTACT_INFO}`;
export const TELEPHONE_LINK_CLASSES = `${UI_CLASS_NAME} ${BEM_TELEPHONE_LINK}`;

export const UI_LIBRARY_ROOT_CLASS = '.hc-ui';
19 changes: 19 additions & 0 deletions src/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,20 @@
// Source Sans Pro
@import url(https://fonts.googleapis.com/css?family=Source+Sans+Pro:200,300,400,600,700,600italic,400italic,700italic);

.hc-ui {
@import './styles/colors', './styles/fonts', './styles/fontSizeCalculator';

color: color(color);
font-family: $fontFamily;
font-size: em(16px);
font-weight: $fontWeightRegular;
//letter-spacing: .7px;
line-height: 1.375;
-moz-osx-font-smoothing: grayscale;
-ms-text-size-adjust: 100%;
-webkit-text-size-adjust: 100%;
-webkit-font-smoothing: antialiased;

// Base
@import './styles/normalize';
@import './styles/typography';
Expand Down Expand Up @@ -63,3 +80,5 @@
@import './surfaces/infoBar/infoBar';
@import './surfaces/modalDeprecated/modalDeprecated';
@import './surfaces/titleBar/titleBar';

}
42 changes: 23 additions & 19 deletions src/styles/normalize.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,28 @@
/*! normalize.css v3.0.2 | MIT License | git.io/normalize */

/**
* 1. Set default font family to sans-serif.
* 2. Prevent iOS text size adjust after orientation change, without disabling
* user zoom.
*/

html {
font-family: sans-serif; /* 1 */
-ms-text-size-adjust: 100%; /* 2 */
-webkit-text-size-adjust: 100%; /* 2 */
}

/**
* Remove default margin.
*/

body {
margin: 0;
}
//
// Need to prevent any impact on html/body elements by react-cm-ui library
// so that the library works correctly in widgets
//
// /**
// * 1. Set default font family to sans-serif.
// * 2. Prevent iOS text size adjust after orientation change, without disabling
// * user zoom.
// */

// html {
// font-family: sans-serif; /* 1 */
// -ms-text-size-adjust: 100%; /* 2 */
// -webkit-text-size-adjust: 100%; /* 2 */
// }

// /**
// * Remove default margin.
// */

// body {
// margin: 0;
// }
Comment thread
groberts314 marked this conversation as resolved.

/* HTML5 display definitions
========================================================================== */
Expand Down
13 changes: 0 additions & 13 deletions src/styles/typography.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,6 @@
@import './colors', './fonts', './fontSizeCalculator';

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

html { font-size: 100%; }
body {
color: color(color);
font-family: $fontFamily;
font-size: em(16px);
-moz-osx-font-smoothing: grayscale;
-webkit-font-smoothing: antialiased;
font-weight: $fontWeightRegular;
//letter-spacing: .7px;
line-height: 1.375;
}
//Links
a {
color: color(colorLink);
Expand Down