feat: do not set button icon size - this gets handled by the icon itself

dnbexperience · Nov 26, 2018 · baeee69 · baeee69
1 parent bafd1fd
commit baeee69
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 7 deletions.
diff --git a/packages/dnb-ui-lib/src/components/button/Button.js b/packages/dnb-ui-lib/src/components/button/Button.js
@@ -223,7 +223,7 @@ class Content extends PureComponent {
     title: null,
     content: null,
     icon: null,
-    icon_size: DefaultIconSize
+    icon_size: null
   }
   render() {
     const { text, title, content, icon, icon_size } = this.props

diff --git a/packages/dnb-ui-lib/src/components/button/__tests__/__snapshots__/Button.test.js.snap b/packages/dnb-ui-lib/src/components/button/__tests__/__snapshots__/Button.test.js.snap
@@ -379,7 +379,7 @@ exports[`Button scss have to match snapshot 1`] = `
   /* Firefox includes a hidden border which messes up button dimensions */ }
   .dnb-button__icon {
     line-height: 0; }
-    .dnb-button__icon svg:not([width]):not([height]) {
+    .dnb-button__icon:not(.dnb-icon) svg:not([width]):not([height]) {
       width: var(--button-icon-size);
       height: var(--button-icon-size); }
   .dnb-button__text {

diff --git a/packages/dnb-ui-lib/src/components/button/style/_button.scss b/packages/dnb-ui-lib/src/components/button/style/_button.scss
@@ -47,7 +47,7 @@
 
   &__icon {
     line-height: 0;
-    svg:not([width]):not([height]) {
+    &:not(.dnb-icon) svg:not([width]):not([height]) {
       width: var(--button-icon-size);
       height: var(--button-icon-size);
     }

diff --git a/packages/dnb-ui-lib/src/components/dropdown/__tests__/__snapshots__/Dropdown.test.js.snap b/packages/dnb-ui-lib/src/components/dropdown/__tests__/__snapshots__/Dropdown.test.js.snap
@@ -388,7 +388,7 @@ body:not(:-moz-handler-blocked) fieldset {
   /* Firefox includes a hidden border which messes up button dimensions */ }
   .dnb-button__icon {
     line-height: 0; }
-    .dnb-button__icon svg:not([width]):not([height]) {
+    .dnb-button__icon:not(.dnb-icon) svg:not([width]):not([height]) {
       width: var(--button-icon-size);
       height: var(--button-icon-size); }
   .dnb-button__text {

diff --git a/...s/dnb-ui-lib/src/components/input-masked/__tests__/__snapshots__/InputMasked.test.js.snap b/...s/dnb-ui-lib/src/components/input-masked/__tests__/__snapshots__/InputMasked.test.js.snap
@@ -244,7 +244,7 @@ body:not(:-moz-handler-blocked) fieldset {
   /* Firefox includes a hidden border which messes up button dimensions */ }
   .dnb-button__icon {
     line-height: 0; }
-    .dnb-button__icon svg:not([width]):not([height]) {
+    .dnb-button__icon:not(.dnb-icon) svg:not([width]):not([height]) {
       width: var(--button-icon-size);
       height: var(--button-icon-size); }
   .dnb-button__text {

diff --git a/packages/dnb-ui-lib/src/components/input/__tests__/__snapshots__/Input.test.js.snap b/packages/dnb-ui-lib/src/components/input/__tests__/__snapshots__/Input.test.js.snap
@@ -326,7 +326,7 @@ body:not(:-moz-handler-blocked) fieldset {
   /* Firefox includes a hidden border which messes up button dimensions */ }
   .dnb-button__icon {
     line-height: 0; }
-    .dnb-button__icon svg:not([width]):not([height]) {
+    .dnb-button__icon:not(.dnb-icon) svg:not([width]):not([height]) {
       width: var(--button-icon-size);
       height: var(--button-icon-size); }
   .dnb-button__text {

diff --git a/packages/dnb-ui-lib/src/components/modal/__tests__/__snapshots__/Modal.test.js.snap b/packages/dnb-ui-lib/src/components/modal/__tests__/__snapshots__/Modal.test.js.snap
@@ -444,7 +444,7 @@ exports[`Modal scss have to match snapshot 1`] = `
   /* Firefox includes a hidden border which messes up button dimensions */ }
   .dnb-button__icon {
     line-height: 0; }
-    .dnb-button__icon svg:not([width]):not([height]) {
+    .dnb-button__icon:not(.dnb-icon) svg:not([width]):not([height]) {
       width: var(--button-icon-size);
       height: var(--button-icon-size); }
   .dnb-button__text {