diff --git a/packages/dnb-ui-lib/src/components/button/Button.js b/packages/dnb-ui-lib/src/components/button/Button.js
index dd607bff56c..6abda6093ba 100644
--- a/packages/dnb-ui-lib/src/components/button/Button.js
+++ b/packages/dnb-ui-lib/src/components/button/Button.js
@@ -307,16 +307,6 @@ class Content extends PureComponent {
{text}
)
- } else {
- ret.push(
-
-
-
- )
}
if (icon) {
diff --git a/packages/dnb-ui-lib/src/components/button/style/_button.scss b/packages/dnb-ui-lib/src/components/button/style/_button.scss
index 0d4296aeedd..e58788e304e 100644
--- a/packages/dnb-ui-lib/src/components/button/style/_button.scss
+++ b/packages/dnb-ui-lib/src/components/button/style/_button.scss
@@ -47,10 +47,6 @@
font-size: var(--font-size-small); // has to be 16px
line-height: var(--button-height--small);
- &__helper {
- @include helper();
- }
-
&__icon {
svg:not([width]):not([height]) {
width: var(--button-icon-size);
diff --git a/packages/dnb-ui-lib/src/components/checkbox/Checkbox.js b/packages/dnb-ui-lib/src/components/checkbox/Checkbox.js
index 68d15b930c1..4a2e9a27a1e 100644
--- a/packages/dnb-ui-lib/src/components/checkbox/Checkbox.js
+++ b/packages/dnb-ui-lib/src/components/checkbox/Checkbox.js
@@ -7,6 +7,7 @@ import React, { Component } from 'react'
import PropTypes from 'prop-types'
import classnames from 'classnames'
import keycode from 'keycode'
+import AlignmentHelper from '../../shared/AlignmentHelper'
import {
isTrue,
makeUniqueId,
@@ -269,9 +270,7 @@ export default class Checkbox extends Component {
/>
)}
-
-
-
+
{label_position === 'left' && statusComp}
diff --git a/packages/dnb-ui-lib/src/components/checkbox/style/_checkbox.scss b/packages/dnb-ui-lib/src/components/checkbox/style/_checkbox.scss
index 7240cc415bb..8db79b9cd1e 100644
--- a/packages/dnb-ui-lib/src/components/checkbox/style/_checkbox.scss
+++ b/packages/dnb-ui-lib/src/components/checkbox/style/_checkbox.scss
@@ -21,12 +21,6 @@
flex-direction: column;
align-self: center;
}
- &__helper {
- @include helper();
-
- // since we don't have a vertical state, we set it to vertical by default
- @include helperVertical();
- }
&__shell {
user-select: none;
diff --git a/packages/dnb-ui-lib/src/components/date-picker/DatePicker.js b/packages/dnb-ui-lib/src/components/date-picker/DatePicker.js
index c4bd9532596..1c1532a5d0c 100644
--- a/packages/dnb-ui-lib/src/components/date-picker/DatePicker.js
+++ b/packages/dnb-ui-lib/src/components/date-picker/DatePicker.js
@@ -6,7 +6,7 @@
import React, { PureComponent } from 'react'
import PropTypes from 'prop-types'
import classnames from 'classnames'
-
+import AlignmentHelper from '../../shared/AlignmentHelper'
import {
isTrue,
makeUniqueId,
@@ -425,8 +425,8 @@ export default class DatePicker extends PureComponent {
)
if (
hidePicker &&
- (!isTrue(this.props.show_submit_button) &&
- !isTrue(this.props.show_cancel_button))
+ !isTrue(this.props.show_submit_button) &&
+ !isTrue(this.props.show_cancel_button)
) {
this.hidePicker(args)
}
@@ -719,9 +719,7 @@ export default class DatePicker extends PureComponent {
/>
)}
-
-
-
+
- Math.max.apply(null, arr.filter(v => v <= val))
+ Math.max.apply(
+ null,
+ arr.filter(v => v <= val)
+ )
let closestToTop = null,
closestToBottom = null,
tmpToTop,
@@ -1066,9 +1070,7 @@ export default class Dropdown extends PureComponent {
/>
)}
-
-
-
+
{showStatus && (
diff --git a/packages/dnb-ui-lib/src/components/dropdown/style/_dropdown.scss b/packages/dnb-ui-lib/src/components/dropdown/style/_dropdown.scss
index 944e28679f8..bb959184067 100644
--- a/packages/dnb-ui-lib/src/components/dropdown/style/_dropdown.scss
+++ b/packages/dnb-ui-lib/src/components/dropdown/style/_dropdown.scss
@@ -60,14 +60,6 @@
color: inherit;
}
- // if no label is provided, then make sure we have some text to align the button
- &__helper {
- @include helper();
- }
- &--vertical &__helper {
- @include helperVertical();
- }
-
&__shell {
position: relative;
diff --git a/packages/dnb-ui-lib/src/components/form-label/FormLabel.js b/packages/dnb-ui-lib/src/components/form-label/FormLabel.js
index 6abe1edbe5a..bb1b30e8a55 100644
--- a/packages/dnb-ui-lib/src/components/form-label/FormLabel.js
+++ b/packages/dnb-ui-lib/src/components/form-label/FormLabel.js
@@ -6,6 +6,7 @@
import React, { PureComponent } from 'react'
import PropTypes from 'prop-types'
import classnames from 'classnames'
+import AlignmentHelper from '../../shared/AlignmentHelper'
import {
extendPropsWithContext,
isTrue,
@@ -142,7 +143,7 @@ export default class FormLabel extends PureComponent {
if (isTrue(sr_only)) {
return (
-
+
)
}
diff --git a/packages/dnb-ui-lib/src/components/form-row/FormRow.js b/packages/dnb-ui-lib/src/components/form-row/FormRow.js
index f86ceae1477..2f26c0f9fc3 100644
--- a/packages/dnb-ui-lib/src/components/form-row/FormRow.js
+++ b/packages/dnb-ui-lib/src/components/form-row/FormRow.js
@@ -6,6 +6,7 @@
import React, { PureComponent } from 'react'
import PropTypes from 'prop-types'
import classnames from 'classnames'
+import AlignmentHelper from '../../shared/AlignmentHelper'
import {
extend,
extendPropsWithContext,
@@ -241,9 +242,7 @@ export default class FormRow extends PureComponent {