Skip to content

Commit e2e68d6

Browse files
Merge pull request #1 from navikt/FO-2772
Fo 2772
2 parents b14e7ee + 97eacda commit e2e68d6

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+559
-248
lines changed

package-lock.json

Lines changed: 13 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,8 @@
4444
"lodash.throttle": "^4.1.1",
4545
"nav-frontend-alertstriper": "^3.0.11",
4646
"nav-frontend-alertstriper-style": "^2.0.9",
47+
"nav-frontend-chevron": "^1.0.10",
48+
"nav-frontend-chevron-style": "^0.3.5",
4749
"nav-frontend-core": "^4.0.11",
4850
"nav-frontend-etiketter": "^1.0.30",
4951
"nav-frontend-etiketter-style": "^0.3.19",
@@ -59,7 +61,7 @@
5961
"nav-frontend-typografi": "^2.0.17",
6062
"nav-frontend-typografi-style": "^1.0.18",
6163
"prop-types": "^15.7.2",
62-
"react": "^16.13.0",
64+
"react": "^16.13.1",
6365
"react-dom": "^16.11.0",
6466
"react-scripts": "3.0.1",
6567
"react-select": "^3.0.8",

src/components/filter-etiketter/etikett/filter-etikett.less

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,16 @@
44
background-color: transparent;
55
border: none;
66
cursor: pointer;
7+
8+
&__icon {
9+
width: 12px;
10+
height: 12px;
11+
margin-left: 0.25rem;
12+
margin-bottom: -1px;
13+
}
14+
15+
.etikett {
16+
border-radius: 4px;
17+
background-color: #cce1f3;
18+
}
719
}

src/components/filter-etiketter/etikett/filter-etikett.tsx

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
import React from 'react';
22
import { EtikettInfo } from 'nav-frontend-etiketter';
3-
import './filter-etikett.less';
43
import { OnRemoveClicked } from '../filter-etiketter';
4+
import xIcon from './x.svg';
5+
import './filter-etikett.less';
56

67
interface FilterEtikettProps {
78
id: string;
@@ -14,7 +15,9 @@ export const FilterEtikett = (props: FilterEtikettProps) => {
1415

1516
return (
1617
<button className="filter-etikett" onClick={() => onRemoveClicked(id)}>
17-
<EtikettInfo>{tekst}</EtikettInfo>
18+
<EtikettInfo>
19+
{tekst} <img className="filter-etikett__icon" src={xIcon} alt="Fjern etikett" />
20+
</EtikettInfo>
1821
</button>
1922
);
2023
};
Lines changed: 1 addition & 0 deletions
Loading

src/components/filter-paneler/enhet-filter-panel/enhet-dropdown/enhet-dropdown.tsx

Lines changed: 0 additions & 44 deletions
This file was deleted.

src/components/filter-paneler/enhet-filter-panel/enhet-filter-panel.tsx

Lines changed: 0 additions & 32 deletions
This file was deleted.

src/components/filter-paneler/filter-panel/filter-panel.less

Lines changed: 0 additions & 11 deletions
This file was deleted.

src/components/filter-paneler/filter-panel/filter-panel.tsx

Lines changed: 0 additions & 19 deletions
This file was deleted.

src/components/filter-paneler/status-filter-panel/status-filter-panel.less

Whitespace-only changes.

0 commit comments

Comments
 (0)