Skip to content

Commit

Permalink
Merge branch 'master' into data-table-sort
Browse files Browse the repository at this point in the history
  • Loading branch information
jnm2377 committed Dec 3, 2020
2 parents 64f61fb + cbcba12 commit d29063d
Show file tree
Hide file tree
Showing 42 changed files with 299 additions and 127 deletions.
2 changes: 1 addition & 1 deletion config/browserslist-config-carbon/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "browserslist-config-carbon",
"description": "Browserslist config for the Carbon Design System",
"version": "10.6.0-rc.0",
"version": "10.6.0",
"license": "Apache-2.0",
"main": "index.js",
"repository": {
Expand Down
2 changes: 1 addition & 1 deletion config/eslint-config-carbon/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "eslint-config-carbon",
"description": "ESLint configuration for Carbon",
"version": "2.2.0-rc.0",
"version": "2.2.0",
"license": "Apache-2.0",
"main": "index.js",
"repository": {
Expand Down
2 changes: 1 addition & 1 deletion config/prettier-config-carbon/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "prettier-config-carbon",
"description": "Prettier config for the Carbon Design System",
"version": "0.5.0-rc.0",
"version": "0.5.0",
"license": "Apache-2.0",
"main": "index.js",
"repository": {
Expand Down
2 changes: 1 addition & 1 deletion config/stylelint-config-carbon/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "stylelint-config-carbon",
"description": "Stylelint configuration for Carbon",
"version": "1.3.0-rc.0",
"version": "1.3.0",
"license": "Apache-2.0",
"main": "index.js",
"repository": {
Expand Down
4 changes: 2 additions & 2 deletions packages/bundler/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@carbon/bundler",
"description": "Bundler used for libraries in the Carbon Design System",
"version": "10.10.0-rc.0",
"version": "10.10.0",
"license": "Apache-2.0",
"bin": {
"bundler": "./bin/bundler.js"
Expand All @@ -27,7 +27,7 @@
"dependencies": {
"@babel/core": "^7.10.0",
"@babel/preset-env": "^7.10.0",
"@carbon/cli-reporter": "^10.4.0-rc.0",
"@carbon/cli-reporter": "^10.4.0",
"@commitlint/parse": "^8.3.4",
"autoprefixer": "^9.7.4",
"babel-plugin-macros": "^2.4.2",
Expand Down
2 changes: 1 addition & 1 deletion packages/cli-reporter/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@carbon/cli-reporter",
"description": "Reporter for CLI-based tools in the Carbon Design System",
"version": "10.4.0-rc.0",
"version": "10.4.0",
"license": "Apache-2.0",
"main": "index.js",
"repository": {
Expand Down
6 changes: 3 additions & 3 deletions packages/cli/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@carbon/cli",
"description": "Task automation for working with the Carbon Design System",
"version": "10.16.0-rc.0",
"version": "10.16.0",
"license": "Apache-2.0",
"bin": {
"carbon-cli": "./bin/carbon-cli.js"
Expand All @@ -23,7 +23,7 @@
"access": "public"
},
"dependencies": {
"@carbon/cli-reporter": "^10.4.0-rc.0",
"@carbon/cli-reporter": "^10.4.0",
"@octokit/plugin-retry": "^2.2.0",
"@octokit/plugin-throttling": "^2.6.0",
"@octokit/rest": "^16.28.1",
Expand All @@ -34,7 +34,7 @@
"fs-extra": "^8.0.1",
"inquirer": "^6.4.1",
"prettier": "^2.1.0",
"prettier-config-carbon": "^0.5.0-rc.0",
"prettier-config-carbon": "^0.5.0",
"progress-estimator": "^0.2.2",
"remark": "^10.0.1",
"yargs": "^15.1.0"
Expand Down
10 changes: 5 additions & 5 deletions packages/colors/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@carbon/colors",
"description": "Colors for digital and software products using the Carbon Design System",
"version": "10.17.0-rc.0",
"version": "10.17.0",
"license": "Apache-2.0",
"main": "lib/index.js",
"module": "es/index.js",
Expand Down Expand Up @@ -35,10 +35,10 @@
"clean": "rimraf css es lib umd scss"
},
"devDependencies": {
"@carbon/bundler": "^10.10.0-rc.0",
"@carbon/cli-reporter": "^10.4.0-rc.0",
"@carbon/scss-generator": "^10.11.0-rc.0",
"@carbon/test-utils": "^10.13.0-rc.0",
"@carbon/bundler": "^10.10.0",
"@carbon/cli-reporter": "^10.4.0",
"@carbon/scss-generator": "^10.11.0",
"@carbon/test-utils": "^10.13.0",
"change-case": "^4.1.1",
"core-js": "^3.6.5",
"fs-extra": "^8.1.0",
Expand Down
49 changes: 46 additions & 3 deletions packages/components/docs/sass.md
Original file line number Diff line number Diff line change
Expand Up @@ -3806,6 +3806,7 @@ $spacing-05: $carbon--spacing-05;
- [search [mixin]](#search-mixin)
- [select [mixin]](#select-mixin)
- [tabs [mixin]](#tabs-mixin)
- [tooltip [mixin]](#tooltip-mixin)
- [treeview [mixin]](#treeview-mixin)
- [carbon-switcher [mixin]](#carbon-switcher-mixin)

Expand Down Expand Up @@ -14709,8 +14710,8 @@ Checkbox styles
position: relative;
display: flex;
min-height: rem(24px);
padding-top: rem(3px);
padding-left: rem(20px);
line-height: 1.5rem;
cursor: pointer;
user-select: none;
}
Expand Down Expand Up @@ -26985,7 +26986,6 @@ Tooltip styles
}

.#{$prefix}--tooltip {
@include box-shadow;
@include reset;

position: absolute;
Expand All @@ -26997,7 +26997,6 @@ Tooltip styles
padding: $carbon--spacing-05;
color: $inverse-01;
word-wrap: break-word;
background: $inverse-02;
border-radius: rem(2px);

// Windows, Firefox HCM Fix
Expand Down Expand Up @@ -27046,6 +27045,11 @@ Tooltip styles
}
}

.#{$prefix}--tooltip__content {
background-color: $inverse-02;
box-shadow: 0 0 0 $spacing-05 $inverse-02, 0 2px 6px $spacing-05 rgba(0, 0, 0, 0.2);
}

// Tooltips need to be click focusable but not sequentially focusable so the user can click within
// the tooltip and not have it close. Because the element is not actionable it does not need
// to have a visible focus indicator (OK'd by IBMa)
Expand All @@ -27067,6 +27071,44 @@ Tooltip styles
content: '';
}

&.#{$prefix}--tooltip--top.#{$prefix}--tooltip--align-start,
&.#{$prefix}--tooltip--bottom.#{$prefix}--tooltip--align-start {
.#{$prefix}--tooltip__content {
transform: translate(calc(50% - 6px), 0);
}
}

&.#{$prefix}--tooltip--top.#{$prefix}--tooltip--align-end,
&.#{$prefix}--tooltip--bottom.#{$prefix}--tooltip--align-end {
.#{$prefix}--tooltip__content {
transform: translate(calc(6px - 50%), 0);
}
}

&.#{$prefix}--tooltip--left.#{$prefix}--tooltip--align-start {
.#{$prefix}--tooltip__content {
transform: translate(0, calc(9px + 50% - #{$spacing-03}));
}
}

&.#{$prefix}--tooltip--right.#{$prefix}--tooltip--align-start {
.#{$prefix}--tooltip__content {
transform: translate(0, calc(-3px + 50% - #{$spacing-03}));
}
}

&.#{$prefix}--tooltip--left.#{$prefix}--tooltip--align-end {
.#{$prefix}--tooltip__content {
transform: translate(0, calc(9px - 50% + #{$spacing-03}));
}
}

&.#{$prefix}--tooltip--right.#{$prefix}--tooltip--align-end {
.#{$prefix}--tooltip__content {
transform: translate(0, calc(-3px - 50% + #{$spacing-03}));
}
}

.#{$prefix}--tooltip__footer {
display: flex;
align-items: center;
Expand Down Expand Up @@ -27288,6 +27330,7 @@ Tooltip styles
- [carbon--spacing-07 [variable]](#carbon--spacing-07-variable)
- [inverse-focus-ui [variable]](#inverse-focus-ui-variable)
- [inverse-link [variable]](#inverse-link-variable)
- [spacing-05 [variable]](#spacing-05-variable)
- [spacing-03 [variable]](#spacing-03-variable)
- [interactive-04 [variable]](#interactive-04-variable)

Expand Down
12 changes: 6 additions & 6 deletions packages/components/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "carbon-components",
"description": "The Carbon Design System is IBM’s open-source design system for products and experiences.",
"version": "10.25.0-rc.2",
"version": "10.25.0",
"license": "Apache-2.0",
"main": "umd/index.js",
"module": "es/index.js",
Expand Down Expand Up @@ -83,10 +83,10 @@
"@babel/preset-env": "^7.10.0",
"@babel/preset-react": "^7.10.0",
"@babel/runtime": "^7.10.0",
"@carbon/elements": "^10.24.0-rc.0",
"@carbon/icons-handlebars": "^10.22.0-rc.0",
"@carbon/icons-react": "^10.22.0-rc.0",
"@carbon/test-utils": "^10.13.0-rc.0",
"@carbon/elements": "^10.24.0",
"@carbon/icons-handlebars": "^10.22.0",
"@carbon/icons-react": "^10.22.0",
"@carbon/test-utils": "^10.13.0",
"@frctl/fractal": "^1.1.0",
"adaro": "1.0.4",
"autoprefixer": "^9.7.4",
Expand All @@ -97,7 +97,7 @@
"babel-plugin-rewire": "^1.1.0",
"bluebird": "~3.1.1",
"browser-sync": "^2.26.3",
"browserslist-config-carbon": "^10.6.0-rc.0",
"browserslist-config-carbon": "^10.6.0",
"carbon-components": "^9.0.0",
"carbon-components-react": "^6.0.0",
"chokidar": "^2.0.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/components/src/components/checkbox/_checkbox.scss
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,8 @@
position: relative;
display: flex;
min-height: rem(24px);
padding-top: rem(3px);
padding-left: rem(20px);
line-height: 1.5rem;
cursor: pointer;
user-select: none;
}
Expand Down
46 changes: 44 additions & 2 deletions packages/components/src/components/tooltip/_tooltip.scss
Original file line number Diff line number Diff line change
Expand Up @@ -368,7 +368,6 @@
}

.#{$prefix}--tooltip {
@include box-shadow;
@include reset;

position: absolute;
Expand All @@ -380,7 +379,6 @@
padding: $carbon--spacing-05;
color: $inverse-01;
word-wrap: break-word;
background: $inverse-02;
border-radius: rem(2px);

// Windows, Firefox HCM Fix
Expand Down Expand Up @@ -429,6 +427,12 @@
}
}

.#{$prefix}--tooltip__content {
background-color: $inverse-02;
box-shadow: 0 0 0 $spacing-05 $inverse-02,
0 2px 6px $spacing-05 rgba(0, 0, 0, 0.2);
}

// Tooltips need to be click focusable but not sequentially focusable so the user can click within
// the tooltip and not have it close. Because the element is not actionable it does not need
// to have a visible focus indicator (OK'd by IBMa)
Expand All @@ -450,6 +454,44 @@
content: '';
}

&.#{$prefix}--tooltip--top.#{$prefix}--tooltip--align-start,
&.#{$prefix}--tooltip--bottom.#{$prefix}--tooltip--align-start {
.#{$prefix}--tooltip__content {
transform: translate(calc(50% - 6px), 0);
}
}

&.#{$prefix}--tooltip--top.#{$prefix}--tooltip--align-end,
&.#{$prefix}--tooltip--bottom.#{$prefix}--tooltip--align-end {
.#{$prefix}--tooltip__content {
transform: translate(calc(6px - 50%), 0);
}
}

&.#{$prefix}--tooltip--left.#{$prefix}--tooltip--align-start {
.#{$prefix}--tooltip__content {
transform: translate(0, calc(9px + 50% - #{$spacing-03}));
}
}

&.#{$prefix}--tooltip--right.#{$prefix}--tooltip--align-start {
.#{$prefix}--tooltip__content {
transform: translate(0, calc(-3px + 50% - #{$spacing-03}));
}
}

&.#{$prefix}--tooltip--left.#{$prefix}--tooltip--align-end {
.#{$prefix}--tooltip__content {
transform: translate(0, calc(9px - 50% + #{$spacing-03}));
}
}

&.#{$prefix}--tooltip--right.#{$prefix}--tooltip--align-end {
.#{$prefix}--tooltip__content {
transform: translate(0, calc(-3px - 50% + #{$spacing-03}));
}
}

.#{$prefix}--tooltip__footer {
display: flex;
align-items: center;
Expand Down
20 changes: 10 additions & 10 deletions packages/elements/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@carbon/elements",
"description": "A collection of design elements in code for the IBM Design Language",
"version": "10.24.0-rc.0",
"version": "10.24.0",
"license": "Apache-2.0",
"main": "lib/index.js",
"module": "es/index.js",
Expand Down Expand Up @@ -35,17 +35,17 @@
"clean": "rimraf es lib umd && node tasks/clean.js"
},
"dependencies": {
"@carbon/colors": "^10.17.0-rc.0",
"@carbon/grid": "^10.17.0-rc.0",
"@carbon/icons": "^10.22.0-rc.0",
"@carbon/import-once": "^10.4.0-rc.0",
"@carbon/layout": "^10.15.0-rc.0",
"@carbon/motion": "^10.10.0-rc.0",
"@carbon/themes": "^10.24.0-rc.0",
"@carbon/type": "^10.18.0-rc.0"
"@carbon/colors": "^10.17.0",
"@carbon/grid": "^10.17.0",
"@carbon/icons": "^10.22.0",
"@carbon/import-once": "^10.4.0",
"@carbon/layout": "^10.15.0",
"@carbon/motion": "^10.10.0",
"@carbon/themes": "^10.24.0",
"@carbon/type": "^10.18.0"
},
"devDependencies": {
"@carbon/bundler": "^10.10.0-rc.0",
"@carbon/bundler": "^10.10.0",
"fs-extra": "^8.1.0",
"klaw-sync": "^6.0.0",
"replace-in-file": "^3.4.2",
Expand Down
4 changes: 2 additions & 2 deletions packages/feature-flags/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "@carbon/feature-flags",
"private": true,
"description": "Build with feature flags in Carbon",
"version": "0.3.0-rc.0",
"version": "0.3.0",
"license": "Apache-2.0",
"main": "lib/index.js",
"module": "es/index.js",
Expand All @@ -27,7 +27,7 @@
"devDependencies": {
"@babel/generator": "^7.10.2",
"@babel/types": "^7.10.2",
"@carbon/scss-generator": "^10.11.0-rc.0",
"@carbon/scss-generator": "^10.11.0",
"fs-extra": "^9.0.1",
"js-yaml": "^3.14.0",
"rimraf": "^3.0.2",
Expand Down
Loading

0 comments on commit d29063d

Please sign in to comment.