Merge branch 'master' into kb_fix_pagination_ie_11

carbon-design-system · Oct 16, 2019 · 01a823b · 01a823b
2 parents 24b9401 + bc39bae
commit 01a823b
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 43 deletions.
diff --git a/.github/workflows/sync-generated-files.yml b/.github/workflows/sync-generated-files.yml
@@ -12,6 +12,10 @@ jobs:
         uses: actions/setup-node@v1
         with:
           node-version: '10.x'
+      # This action is equivalent to running `git fetch` and
+      # `git checkout SHA`. We want to checkout `master`
+      - name: Checkout master
+        run: git checkout master
       - name: Install dependencies
         run: yarn install --offline
       - name: Build project
@@ -20,7 +24,7 @@ jobs:
         run: yarn sync
       - name: Push generated artifacts to GitHub
         env:
-          NPM_TOKEN: ${{ secrets.GH_BOT_TOKEN }}
+          GH_BOT_TOKEN: ${{ secrets.GH_BOT_TOKEN }}
         run: |
           if [ -n "$(git status --porcelain)" ]; then
             echo "Our git status is not clean. Checking in the following files:";
@@ -30,9 +34,5 @@ jobs:
             git config --global user.name "carbon-bot"
             git add -A
             git commit -m "chore(project): sync generated files [skip ci]"
-            # Pipe to /dev/null to prevent any token leaks in CI output
-            git push -q \
-              https://${GH_BOT_TOKEN}:@github.com/carbon-design-system/carbon.git \
-              master \
-              > /dev/null 2>&1
+            git push "https://$GH_BOT_TOKEN:@github.com/carbon-design-system/carbon.git" master
           fi
diff --git a/packages/components/docs/sass.md b/packages/components/docs/sass.md
@@ -7365,7 +7365,6 @@ $interactive-02: if(
   - [carbon--theme [mixin]](#carbon--theme-mixin)
   - [button [mixin]](#button-mixin)
   - [snippet [mixin]](#snippet-mixin)
-  - [tags [mixin]](#tags-mixin)
   - [tile [mixin]](#tile-mixin)
 
 ### ✅interactive-03 [variable]
@@ -7916,7 +7915,6 @@ $icon-03: if(
   - [button [mixin]](#button-mixin)
   - [data-table-v2-action [mixin]](#data-table-v2-action-mixin)
   - [file-uploader [mixin]](#file-uploader-mixin)
-  - [listbox [mixin]](#listbox-mixin)
   - [toggle [mixin]](#toggle-mixin)
 
 ### ✅link-01 [variable]
@@ -8110,6 +8108,7 @@ $inverse-02: if(
   - [listbox [mixin]](#listbox-mixin)
   - [inline-notifications [mixin]](#inline-notifications-mixin)
   - [toast-notifications [mixin]](#toast-notifications-mixin)
+  - [tags [mixin]](#tags-mixin)
   - [tooltip--icon [mixin]](#tooltip--icon-mixin)
   - [tooltip--definition--legacy [mixin]](#tooltip--definition--legacy-mixin)
   - [tooltip [mixin]](#tooltip-mixin)
@@ -8560,7 +8559,6 @@ $hover-secondary: if(
   - [carbon--theme [mixin]](#carbon--theme-mixin)
   - [button [mixin]](#button-mixin)
   - [listbox [mixin]](#listbox-mixin)
-  - [tags [mixin]](#tags-mixin)
 
 ### ✅active-secondary [variable]
 
@@ -8792,6 +8790,7 @@ $inverse-hover-ui: if(
 - **Used by**:
   - [carbon--theme [mixin]](#carbon--theme-mixin)
   - [inline-notifications [mixin]](#inline-notifications-mixin)
+  - [tags [mixin]](#tags-mixin)
 
 ### ✅hover-danger [variable]
 
@@ -18198,7 +18197,10 @@ List box styles
     border-width: 0;
   }
 
-  .#{$prefix}--list-box.#{$prefix}--list-box--inline.#{$prefix}--list-box--disabled:hover,
+  .#{$prefix}--list-box.#{$prefix}--list-box--inline.#{$prefix}--list-box--disabled:hover {
+    background-color: transparent;
+  }
+
   .#{$prefix}--list-box.#{$prefix}--list-box--inline.#{$prefix}--list-box--expanded:hover {
     background-color: $field-02;
   }
@@ -18254,39 +18256,39 @@ List box styles
   }
 
   // populated input field
-  .#{$prefix}--list-box__field .#{$prefix}--text-input[value] {
+  .#{$prefix}--list-box__field .#{$prefix}--text-input {
     padding-right: carbon--mini-units(9);
   }
 
   // invalid && populated input field
   .#{$prefix}--list-box[data-invalid]
     .#{$prefix}--list-box__field
-    .#{$prefix}--text-input[value] {
+    .#{$prefix}--text-input {
     padding-right: rem(98px); // to account for clear input button outline
   }
 
   .#{$prefix}--list-box[data-invalid]
     .#{$prefix}--list-box__field
-    .#{$prefix}--text-input[value]
+    .#{$prefix}--text-input
     + .#{$prefix}--list-box__invalid-icon {
     right: rem(66px); // to account for clear input button outline
   }
 
   // empty input field
-  .#{$prefix}--list-box__field .#{$prefix}--text-input[value=''] {
+  .#{$prefix}--list-box__field .#{$prefix}--text-input--empty {
     padding-right: $carbon--spacing-09;
   }
 
   // invalid && empty input field
   .#{$prefix}--list-box[data-invalid]
     .#{$prefix}--list-box__field
-    .#{$prefix}--text-input[value=''] {
+    .#{$prefix}--text-input--empty {
     padding-right: carbon--mini-units(9);
   }
 
   .#{$prefix}--list-box[data-invalid]
     .#{$prefix}--list-box__field
-    .#{$prefix}--text-input[value='']
+    .#{$prefix}--text-input--empty
     + .#{$prefix}--list-box__invalid-icon {
     right: rem(40px); // to account for clear input button outline
   }
@@ -18379,7 +18381,6 @@ List box styles
   .#{$prefix}--list-box__selection--multi > svg:hover {
     border-radius: 50%;
     background-color: $hover-secondary;
-    fill: $icon-03;
   }
 
   .#{$prefix}--list-box__selection--multi:focus,
@@ -18582,7 +18583,6 @@ List box styles
   - [inverse-02 [variable]](#inverse-02-variable)
   - [inverse-01 [variable]](#inverse-01-variable)
   - [hover-secondary [variable]](#hover-secondary-variable)
-  - [icon-03 [variable]](#icon-03-variable)
   - [ui-01 [variable]](#ui-01-variable)
   - [text-02 [variable]](#text-02-variable)
   - [selected-ui [variable]](#selected-ui-variable)
@@ -21046,8 +21046,9 @@ Search styles
     height: rem(40px);
     width: rem(40px);
     fill: $icon-01;
-    border: 1px solid transparent;
-    border-left: 0;
+    border-style: solid;
+    border-color: transparent;
+    border-width: 1px 0;
 
     &:hover {
       background-color: $hover-field;
@@ -21211,6 +21212,7 @@ Select styles
 
     &:focus {
       @include focus-outline('outline');
+      color: $text-01;
     }
 
     &:disabled,
@@ -22173,7 +22175,7 @@ Tag styles
 
   // tags used for filtering
   .#{$prefix}--tag--filter {
-    @include tag-theme($interactive-02, $inverse-01);
+    @include tag-theme($inverse-02, $inverse-01);
     cursor: pointer;
     padding-right: rem(2px); // Align with hover circle of X button
   }
@@ -22188,7 +22190,7 @@ Tag styles
 
   .#{$prefix}--tag--filter > svg:hover {
     border-radius: 50%;
-    background-color: $hover-secondary;
+    background-color: $inverse-hover-ui;
   }
 
   .#{$prefix}--tag--filter:focus,
@@ -22220,9 +22222,9 @@ Tag styles
   - [carbon--spacing-02 [variable]](#carbon--spacing-02-variable)
   - [ui-03 [variable]](#ui-03-variable)
   - [text-01 [variable]](#text-01-variable)
-  - [interactive-02 [variable]](#interactive-02-variable)
+  - [inverse-02 [variable]](#inverse-02-variable)
   - [inverse-01 [variable]](#inverse-01-variable)
-  - [hover-secondary [variable]](#hover-secondary-variable)
+  - [inverse-hover-ui [variable]](#inverse-hover-ui-variable)
   - [inverse-focus-ui [variable]](#inverse-focus-ui-variable)
 
 ## text-area

diff --git a/packages/components/src/components/select/_select.scss b/packages/components/src/components/select/_select.scss
@@ -80,6 +80,7 @@
 
     &:focus {
       @include focus-outline('outline');
+      color: $text-01;
     }
 
     &:disabled,

diff --git a/packages/pictograms-react/README.md b/packages/pictograms-react/README.md
@@ -26,7 +26,7 @@ pixels. These sizes refer to the width and height of the icon. You can import an
 icon component into your project by referring to its name and size:
 
 ```jsx
-import { Add24 } from '@carbon/pictograms-react';
+import { Airplane } from '@carbon/pictograms-react';
 ```
 
 We also provide CommonJS and UMD files in the `lib` and `umd` directories,
@@ -35,12 +35,12 @@ respectively.
 To import using CommonJS, you can do the following:
 
 ```js
-const { Add24 } = require('@carbon/pictograms-react');
+const { Airplane } = require('@carbon/pictograms-react');
 ```
 
-_Note: if you would like to find the import path for an icon, you can reference
-our
-[Icon Library](https://www.carbondesignsystem.com/guidelines/iconography/library)_
+_Note: if you would like to find the import path for a pictogram, you can
+reference our
+[Pictogram Library](https://www.carbondesignsystem.com/guidelines/pictograms/library)_
 
 ### Icon fill
 

diff --git a/packages/react/src/components/OverflowMenu/OverflowMenu-story.js b/packages/react/src/components/OverflowMenu/OverflowMenu-story.js
@@ -64,17 +64,6 @@ const OverflowMenuExample = ({ overflowMenuProps, overflowMenuItemProps }) => (
         isDelete
       />
     </OverflowMenu>
-    <OverflowMenu {...overflowMenuProps}>
-      <OverflowMenuItem
-        {...overflowMenuItemProps}
-        itemText="Option 1"
-        primaryFocus
-      />
-      <OverflowMenuItem
-        {...overflowMenuItemProps}
-        itemText="Option 2 is an example of a really long string and how we recommend handling this"
-      />
-    </OverflowMenu>
   </>
 );
 
@@ -125,10 +114,9 @@ storiesOf('OverflowMenu', module)
       <OverflowMenuExample
         overflowMenuProps={{
           ...props.menu(),
+          ariaLabel: null,
           style: { width: 'auto' },
-          renderIcon: () => (
-            <div style={{ padding: '0 1rem' }}>Custom trigger</div>
-          ),
+          renderIcon: () => <div style={{ padding: '0 1rem' }}>Menu</div>,
         }}
         overflowMenuItemProps={props.menuItem()}
       />