Skip to content

Commit

Permalink
Merge pull request #477 from entur/fix/tooltip
Browse files Browse the repository at this point in the history
Readable tooltip for dark theme
  • Loading branch information
Collatty authored Oct 5, 2021
2 parents fddd864 + 337fbc9 commit a704a49
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 16 deletions.
20 changes: 8 additions & 12 deletions src/containers/Admin/EditTab/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,7 @@ import React, {
useCallback,
SyntheticEvent,
} from 'react'
import {
Heading2,
Heading3,
Heading4,
Label,
SubParagraph,
} from '@entur/typography'
import { Heading2, Heading3, Heading4, SubParagraph } from '@entur/typography'
import { Switch, TextField } from '@entur/form'
import { Tooltip } from '@entur/tooltip'
import { ValidationInfoIcon } from '@entur/icons'
Expand Down Expand Up @@ -72,11 +66,13 @@ const COLS: { [key: string]: number } = {
const toolTip = (
<Tooltip
content={
<Label className="weather-tooltip-text">
Tilgjengelig i visningstyper kompakt, kronologisk og kart.
Værdata fra YR (met.no). Noe værdata kan bli skjult ved liten
boksstørrelse.
</Label>
<div>
<SubParagraph className="tooltip-container-weather">
Tilgjengelig i visningstyper kompakt, kronologisk og kart.
Værdata fra YR (met.no). Noe værdata kan bli skjult ved
liten boksstørrelse.
</SubParagraph>
</div>
}
placement="top"
>
Expand Down
9 changes: 5 additions & 4 deletions src/containers/Admin/EditTab/styles.scss
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,11 @@
color: var(--tavla-box-background-color);
}
}
.tooltip-container-weather {
color: var(--tavla-box-background-color);
margin: 0;
}

.eds-form-control,
.eds-form-control__append {
font-size: inherit;
Expand Down Expand Up @@ -52,10 +57,6 @@
overflow-x: visible;
}

.weather-tooltip-text {
color: var(--tavla-input-font-color);
}

.eds-checkbox-icon {
background-color: var(--tavla-checkbox-color);
}
Expand Down

0 comments on commit a704a49

Please sign in to comment.