diff --git a/README.md b/README.md index 25e8f78e..a576e34f 100644 --- a/README.md +++ b/README.md @@ -164,7 +164,6 @@ Using JavaScript: - ``` ## Preprocessors diff --git a/docs/package.json b/docs/package.json index 6d5fbdf4..d082dd0f 100644 --- a/docs/package.json +++ b/docs/package.json @@ -11,7 +11,7 @@ "devDependencies": { "@sveltech/routify": "^1.9.9", "autoprefixer": "^10.2.3", - "carbon-components": "10.28.0", + "carbon-components": "10.29.0-rc.0", "carbon-components-svelte": "../", "clipboard-copy": "^3.1.0", "mdsvex": "^0.8.8", diff --git a/docs/yarn.lock b/docs/yarn.lock index 58ecb718..a1a67ce4 100644 --- a/docs/yarn.lock +++ b/docs/yarn.lock @@ -837,15 +837,15 @@ caniuse-lite@^1.0.30001173, caniuse-lite@^1.0.30001178: integrity sha512-n8JVqXuZMVSPKiPiypjFtDTXc4jWIdjxull0f92WLo7e1MSi3uJ3NvveakSh/aCl1QKFAvIz3vIj0v+0K+FrXw== carbon-components-svelte@../: - version "0.27.0" + version "0.28.0" dependencies: carbon-icons-svelte "^10.21.0" flatpickr "4.6.9" -carbon-components@10.28.0: - version "10.28.0" - resolved "https://registry.yarnpkg.com/carbon-components/-/carbon-components-10.28.0.tgz#c4d2b23df2559cf3b0226867c45e2e84e0af7c4e" - integrity sha512-bFsyngr625zc/t2gl4BPFYl0/ed4q38rrPihQxBXHhLAdeZNyy8xyOQlbh1PEQbTu47H/s/bxVo6QiFm/VmLZA== +carbon-components@10.29.0-rc.0: + version "10.29.0-rc.0" + resolved "https://registry.yarnpkg.com/carbon-components/-/carbon-components-10.29.0-rc.0.tgz#dbff9d2a5fa6abbcff74c4f3601c499233c92278" + integrity sha512-4x+KyXn2v/NYTE9CDOguZTAQF9O+OGWJ818DzIxm5Bk6RQBBTP8AZmbQhV7QSuJ29rSiNHifG0VyLovzeRjl/g== dependencies: "@carbon/telemetry" "0.0.0-alpha.6" flatpickr "4.6.1" diff --git a/package.json b/package.json index b15ae405..ed61b227 100644 --- a/package.json +++ b/package.json @@ -29,14 +29,14 @@ "@rollup/plugin-node-resolve": "^11.1.1", "@tsconfig/svelte": "^1.0.10", "autoprefixer": "^10.2.4", - "carbon-components": "10.28.0", + "carbon-components": "10.29.0-rc.0", "gh-pages": "^3.1.0", "husky": "^4.3.8", "lint-staged": "^10.5.3", "npm-run-all": "^4.1.5", "postcss": "^8.2.4", "prettier": "^2.2.1", - "prettier-plugin-svelte": "^2.1.1", + "prettier-plugin-svelte": "^2.1.5", "rollup": "^2.38.4", "rollup-plugin-svelte": "^7.1.0", "rollup-plugin-terser": "^7.0.2", diff --git a/src/Button/Button.svelte b/src/Button/Button.svelte index a436f4bf..6be0fffa 100644 --- a/src/Button/Button.svelte +++ b/src/Button/Button.svelte @@ -122,49 +122,47 @@ on:mouseenter on:mouseleave /> +{:else if as} + +{:else if href && !disabled} + + + {#if hasIconOnly} + {iconDescription} + {/if} + + {:else} - {#if as} - - {:else if href && !disabled} - - - {#if hasIconOnly} - {iconDescription} - {/if} - - - {:else} - - {/if} + {/if} diff --git a/src/CodeSnippet/CodeSnippet.svelte b/src/CodeSnippet/CodeSnippet.svelte index 7eee44fc..70dd4385 100644 --- a/src/CodeSnippet/CodeSnippet.svelte +++ b/src/CodeSnippet/CodeSnippet.svelte @@ -103,54 +103,9 @@ on:mouseenter on:mouseleave /> -{:else} - {#if type === "inline"} - {#if hideCopyButton} - - - {code} - - - {:else} - - - {code} - - - {/if} - {:else} -
+ + {code} + + + {:else} + -
- -
+      
+        {code}
+      
+    
+  {/if}
+{:else}
+  
+
+ +
             {code}
           
-
-
- {#if !hideCopyButton} - - {/if} - {#if showMoreLess} - - {/if} +
- {/if} + {#if !hideCopyButton} + + {/if} + {#if showMoreLess} + + {/if} +
{/if} diff --git a/src/Tag/Tag.svelte b/src/Tag/Tag.svelte index bfce62d1..add6c1fb 100644 --- a/src/Tag/Tag.svelte +++ b/src/Tag/Tag.svelte @@ -48,78 +48,76 @@ on:mouseenter on:mouseleave /> -{:else} - {#if filter} -
- - {type} - - -
- {:else} -
+ + {type} + +
- {/if} + + +
+{:else} +
+ {#if icon} +
+ +
+ {/if} + + + +
{/if} diff --git a/src/Toggle/Toggle.svelte b/src/Toggle/Toggle.svelte index 81b966b2..e3e8dbe7 100644 --- a/src/Toggle/Toggle.svelte +++ b/src/Toggle/Toggle.svelte @@ -80,9 +80,9 @@ - + diff --git a/yarn.lock b/yarn.lock index c745867e..a4756dc2 100644 --- a/yarn.lock +++ b/yarn.lock @@ -453,10 +453,10 @@ caniuse-lite@^1.0.30001181: resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001183.tgz#7a57ba9d6584119bb5f2bc76d3cc47ba9356b3e2" integrity sha512-7JkwTEE1hlRKETbCFd8HDZeLiQIUcl8rC6JgNjvHCNaxOeNmQ9V4LvQXRUsKIV2CC73qKxljwVhToaA3kLRqTw== -carbon-components@10.28.0: - version "10.28.0" - resolved "https://registry.yarnpkg.com/carbon-components/-/carbon-components-10.28.0.tgz#c4d2b23df2559cf3b0226867c45e2e84e0af7c4e" - integrity sha512-bFsyngr625zc/t2gl4BPFYl0/ed4q38rrPihQxBXHhLAdeZNyy8xyOQlbh1PEQbTu47H/s/bxVo6QiFm/VmLZA== +carbon-components@10.29.0-rc.0: + version "10.29.0-rc.0" + resolved "https://registry.yarnpkg.com/carbon-components/-/carbon-components-10.29.0-rc.0.tgz#dbff9d2a5fa6abbcff74c4f3601c499233c92278" + integrity sha512-4x+KyXn2v/NYTE9CDOguZTAQF9O+OGWJ818DzIxm5Bk6RQBBTP8AZmbQhV7QSuJ29rSiNHifG0VyLovzeRjl/g== dependencies: "@carbon/telemetry" "0.0.0-alpha.6" flatpickr "4.6.1" @@ -1899,10 +1899,10 @@ prepend-http@^1.0.0: resolved "https://registry.npmjs.org/prepend-http/-/prepend-http-1.0.4.tgz#d4f4562b0ce3696e41ac52d0e002e57a635dc6dc" integrity sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw= -prettier-plugin-svelte@^2.1.1: - version "2.1.1" - resolved "https://registry.npmjs.org/prettier-plugin-svelte/-/prettier-plugin-svelte-2.1.1.tgz#e6613cac4292b5bbda5250680565c131b0da5ced" - integrity sha512-U0gRsdJtveyusHd86OUPD+lEVd13bHPPF/CZD/csKjz0Y+Cv4WbUy9x8tA5vaHFtf0tsu8Yb1MrfuhN3GH2gig== +prettier-plugin-svelte@^2.1.5: + version "2.1.5" + resolved "https://registry.yarnpkg.com/prettier-plugin-svelte/-/prettier-plugin-svelte-2.1.5.tgz#cb1df2bffafa0562f05e02c6e9373806ef51ebb1" + integrity sha512-7ySuC/n0Rk8v6GrzoruojfLYde6ncjeFCAA65Dm+fXrK2Mgc3FlvzXMPpm//P3LgfEoc3zMEG/xog1YeoNhdSQ== prettier@^2.2.1: version "2.2.1"