Merge branch 'master' into fixTagElipses

carbon-design-system · Dec 5, 2019 · 8e98b8e · 8e98b8e
2 parents 1603d9e + c41ff2a
commit 8e98b8e
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 12 deletions.
diff --git a/.github/workflows/sync-generated-files.yml b/.github/workflows/sync-generated-files.yml
@@ -7,7 +7,7 @@ jobs:
   release:
     runs-on: macOS-latest
     steps:
-      - uses: actions/checkout@master
+      - uses: actions/checkout@v1
       - name: Use Node.js 10.x
         uses: actions/setup-node@v1
         with:

diff --git a/packages/components/docs/sass.md b/packages/components/docs/sass.md
@@ -17187,7 +17187,7 @@ Link styles
       @include focus-outline;
     }
 
-    &:not([href]) {
+    &:not([href]):not(button) {
       color: $disabled-02;
       cursor: not-allowed;
       pointer-events: none;

diff --git a/packages/components/src/components/link/_link.scss b/packages/components/src/components/link/_link.scss
@@ -45,7 +45,7 @@
       @include focus-outline;
     }
 
-    &:not([href]) {
+    &:not([href]):not(button) {
       color: $disabled-02;
       cursor: not-allowed;
       pointer-events: none;

diff --git a/packages/pictograms/categories.yml b/packages/pictograms/categories.yml
@@ -46,7 +46,7 @@ categories:
       - beijing--municipal
       - beijing--tower
       - berlin--brandenburg--gate
-      - berlin--brandenburg #DEPRECATED: use berlin--brandenberg--gate instead
+      - berlin--brandenburg #DEPRECATED: use berlin--brandenburg--gate instead
       - berlin--cathedral
       - berlin--tower
       - copenhagen--planetarium

diff --git a/packages/pictograms/metadata.yml b/packages/pictograms/metadata.yml
@@ -269,12 +269,12 @@ icons:
       - berlin
     variants:
       - name: berlin--brandenburg--gate
-        friendly_name: Berlin brandenberg gate
+        friendly_name: Berlin brandenburg gate
         usage: This is a description for usage
         categories:
           - name: Cities
-      - name: berlin--brandenburg # DEPRECATED: use berlin--brandenberg--gate instead
-        friendly_name: Berlin brandenberg
+      - name: berlin--brandenburg # DEPRECATED: use berlin--brandenburg--gate instead
+        friendly_name: Berlin brandenburg
         usage: This is a description for usage
         categories:
           - name: Cities

diff --git a/packages/pictograms/svg/berlin--brandenburg--gate.svg b/packages/pictograms/svg/berlin--brandenburg--gate.svg
diff --git a/packages/pictograms/svg/berlin--brandenburg.svg b/packages/pictograms/svg/berlin--brandenburg.svg