Skip to content

Commit 662e5f4

Browse files
committed
moved imported style to local component
1 parent 1899cdd commit 662e5f4

File tree

12 files changed

+60
-47
lines changed

12 files changed

+60
-47
lines changed

.vscode/settings.json

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,22 @@
66
"source.fixAll": "explicit",
77
"source.fixAll.eslint": "explicit"
88
},
9-
"eslint.validate": ["javascript", "typescript"],
9+
"eslint.validate": [
10+
"javascript",
11+
"typescript"
12+
],
1013
"eslint.codeAction.showDocumentation": {
1114
"enable": true
1215
},
1316
"eslint.alwaysShowStatus": true,
14-
"eslint.workingDirectories": ["src"],
17+
"eslint.workingDirectories": [
18+
"src"
19+
],
1520
"typescript.tsdk": "node_modules/typescript/lib",
1621
"[jsonc]": {
1722
"editor.defaultFormatter": "vscode.json-language-features"
23+
},
24+
"[typescriptreact]": {
25+
"editor.defaultFormatter": "vscode.typescript-language-features"
1826
}
19-
}
27+
}

src/components/accordion-menu/AccordionMenu.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import React, { HTMLProps } from 'react';
33
import classNames from 'classnames';
44
import Section, { SectionProps } from './components/Section';
55
import Link from './components/Link';
6+
import './_AccordionMenu.scss';
67

78
interface AccordionMenu extends React.FC<HTMLProps<HTMLDivElement>> {
89
Section: React.FC<SectionProps>;

src/components/header-with-logo/HeaderWithLogo.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import Content from './components/LocalContent';
1111
import TransactionalServiceName from './components/LocalTransactionalServiceName';
1212
import HeaderJs from './header';
1313
import Container from '@components/layout/Container';
14+
import './_headerWithLogo.scss'
1415

1516
const BaseHeaderLogo: FC<OrganisationalLogoProps & NHSLogoNavProps> = (props) => {
1617
const { orgName } = useContext<IHeaderContext>(HeaderContext);

src/components/ribbon-link/RibbonLink.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import React, { HTMLProps } from 'react';
33
import classNames from 'classnames';
44
import Bar from './components/Bar';
55
import { ArrowRightCircleIcon } from 'src'
6+
import './_RibbonLink.scss'
67

78
type RibbonFlavours = 'hot' | 'mild' | 'cool';
89

src/components/sub-navigation/SubNavigation.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
/* eslint-disable @typescript-eslint/no-redeclare */
22
import React, { HTMLProps } from 'react';
33
import classNames from 'classnames';
4+
import './_SubNavigation.scss';
45

56
const SubNavigationItem: React.FC<HTMLProps<HTMLAnchorElement>> = ({
67
className,

src/components/tab-set/TabSet.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
import React, { HTMLProps } from 'react';
33
import classNames from 'classnames';
44
import Tab, { TabProps } from './components/Tab';
5+
import './_TabSet.scss';
56

67
interface TabSet extends React.FC<HTMLProps<HTMLDivElement>> {
78
Tab: React.FC<TabProps>;

src/components/tag/Tag.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import React, { HTMLProps } from 'react';
22
import classNames from 'classnames';
3+
import './_Tag.scss';
34

45
type TagColours =
56
| 'white'

src/components/tag/_Tag.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
@use 'sass:color';
2-
@use '../../../node_modules/nhsuk-frontend/packages/core/settings/all' as settings;
3-
@import '../../../node_modules/nhsuk-frontend/packages/core/generic/font-face';
2+
// @use '../../../node_modules/nhsuk-frontend/packages/core/settings/all' as settings;
3+
// @import '../../../node_modules/nhsuk-frontend/packages/core/generic/font-face';
44

55
/* ==========================================================================
66
#TAG

src/components/timeline/Timeline.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import React from 'react';
22
import Event, { EventProps } from './components/Event';
3+
import './_Timeline.scss';
34

45
type TimelineProps = {
56
events: Array<EventProps>;

src/components/tooltip/Tooltip.tsx

Lines changed: 24 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,36 @@
11
import React, { HTMLProps } from 'react';
22
import classNames from 'classnames';
3+
import './_Tooltip.scss';
34

45
interface TooltipProps extends HTMLProps<HTMLDivElement> {
5-
textProps?: HTMLProps<HTMLSpanElement>;
6-
tooltip: string;
6+
textProps?: HTMLProps<HTMLSpanElement>;
7+
tooltip: string;
78
}
89

910
const Tooltip: React.FC<TooltipProps> = ({
10-
className,
11-
tooltip,
12-
textProps,
13-
children,
14-
id,
15-
...rest
11+
className,
12+
tooltip,
13+
textProps = {},
14+
children,
15+
id,
16+
...rest
1617
}) => (
17-
<div
18-
className={classNames('nhsuk-tooltip', className)}
19-
id={id}
20-
aria-labelledby={id === undefined ? undefined : `${id}-tooltip-text`}
21-
{...rest}
22-
>
23-
{children}
24-
<span
25-
id={id === undefined ? undefined : `${id}-tooltip-text`}
26-
className={classNames('nhsuk-tooltip__text', textProps?.className)}
27-
{...textProps}
28-
>
29-
{tooltip}
30-
</span>
31-
</div>
18+
<div
19+
className={classNames('nhsuk-tooltip', className)}
20+
id={id}
21+
aria-labelledby={id === undefined ? undefined : `${id}-tooltip-text`}
22+
{...rest}
23+
>
24+
{children}
25+
<span
26+
id={id === undefined ? undefined : `${id}-tooltip-text`}
27+
className={classNames('nhsuk-tooltip__text', textProps?.className)}
28+
{...textProps}
29+
>
30+
{tooltip}
31+
</span>
32+
</div>
3233
);
3334

34-
Tooltip.defaultProps = {
35-
textProps: {},
36-
};
3735

3836
export default Tooltip;

0 commit comments

Comments
 (0)