Merge branch 'master' into page-size-disabled

carbon-design-system · May 14, 2020 · 8839eed · 8839eed
2 parents 293460a + 8335b50
commit 8839eed
Show file tree

Hide file tree

Showing 9 changed files with 65 additions and 4 deletions.
diff --git a/e2e/icons-react/__snapshots__/PublicAPI-test.js.snap b/e2e/icons-react/__snapshots__/PublicAPI-test.js.snap
@@ -1791,6 +1791,14 @@ Array [
   "InformationFilled20",
   "InformationFilled24",
   "InformationFilled32",
+  "InformationSquare16",
+  "InformationSquare20",
+  "InformationSquare24",
+  "InformationSquare32",
+  "InformationSquareFilled16",
+  "InformationSquareFilled20",
+  "InformationSquareFilled24",
+  "InformationSquareFilled32",
   "Insert16",
   "Insert20",
   "Insert24",

diff --git a/e2e/icons-vue/__snapshots__/PublicAPI-test.js.snap b/e2e/icons-vue/__snapshots__/PublicAPI-test.js.snap
@@ -1791,6 +1791,14 @@ Array [
   "InformationFilled20",
   "InformationFilled24",
   "InformationFilled32",
+  "InformationSquare16",
+  "InformationSquare20",
+  "InformationSquare24",
+  "InformationSquare32",
+  "InformationSquareFilled16",
+  "InformationSquareFilled20",
+  "InformationSquareFilled24",
+  "InformationSquareFilled32",
   "Insert16",
   "Insert20",
   "Insert24",

diff --git a/e2e/icons/__snapshots__/PublicAPI-test.js.snap b/e2e/icons/__snapshots__/PublicAPI-test.js.snap
@@ -1791,6 +1791,14 @@ Array [
   "InformationFilled20",
   "InformationFilled24",
   "InformationFilled32",
+  "InformationSquare16",
+  "InformationSquare20",
+  "InformationSquare24",
+  "InformationSquare32",
+  "InformationSquareFilled16",
+  "InformationSquareFilled20",
+  "InformationSquareFilled24",
+  "InformationSquareFilled32",
   "Insert16",
   "Insert20",
   "Insert24",

diff --git a/packages/components/docs/sass.md b/packages/components/docs/sass.md
@@ -3483,7 +3483,6 @@ $carbon--spacing-06: 1.5rem;
   - [accordion [mixin]](#accordion-mixin)
   - [file-uploader [mixin]](#file-uploader-mixin)
   - [lists [mixin]](#lists-mixin)
-  - [listbox [mixin]](#listbox-mixin)
   - [toast-notifications [mixin]](#toast-notifications-mixin)
   - [progress-indicator [mixin]](#progress-indicator-mixin)
   - [padding-td [mixin]](#padding-td-mixin)
@@ -19062,7 +19061,6 @@ List box styles
     line-height: rem(16px);
     padding: rem(11px) 0;
     margin: 0 $carbon--spacing-05;
-    padding-right: $carbon--spacing-06;
     border-top: 1px solid transparent;
     border-bottom: 1px solid transparent;
     border-top-color: $ui-03;
@@ -19253,7 +19251,6 @@ List box styles
   - [text-02 [variable]](#text-02-variable)
   - [selected-ui [variable]](#selected-ui-variable)
   - [selected-light-ui [variable]](#selected-light-ui-variable)
-  - [carbon--spacing-06 [variable]](#carbon--spacing-06-variable)
 
 ## loading
 
@@ -23487,6 +23484,10 @@ Tag styles
     }
   }
 
+  .#{$prefix}--tag--disabled .#{$prefix}--tag__close-icon {
+    cursor: not-allowed;
+  }
+
   .#{$prefix}--tag__close-icon:focus {
     outline: none;
     box-shadow: inset 0 0 0 2px $focus;

diff --git a/packages/components/src/components/list-box/_list-box.scss b/packages/components/src/components/list-box/_list-box.scss
@@ -529,7 +529,6 @@ $list-box-menu-width: rem(300px);
     line-height: rem(16px);
     padding: rem(11px) 0;
     margin: 0 $carbon--spacing-05;
-    padding-right: $carbon--spacing-06;
     border-top: 1px solid transparent;
     border-bottom: 1px solid transparent;
     border-top-color: $ui-03;

diff --git a/packages/icons/categories.yml b/packages/icons/categories.yml
@@ -831,6 +831,8 @@ categories:
           - help--filled
           - information
           - information--filled
+          - information--square
+          - information--square--filled
           - misuse
           - misuse--alt
           - misuse--outline

diff --git a/packages/icons/icons.yml b/packages/icons/icons.yml
@@ -3998,6 +3998,16 @@
     - more
     - tip
     - help
+- name: information--square
+  friendly_name: information--square
+  aliases: []
+  sizes:
+    - 32
+- name: information--square--filled
+  friendly_name: information--square--filled
+  aliases: []
+  sizes:
+    - 32
 - name: insert
   friendly_name: Insert
   aliases:

diff --git a/packages/icons/src/svg/32/information--square--filled.svg b/packages/icons/src/svg/32/information--square--filled.svg
diff --git a/packages/icons/src/svg/32/information--square.svg b/packages/icons/src/svg/32/information--square.svg