Skip to content

Commit 1d791f6

Browse files
committed
Include vars from spectrum-css as well
Fix hold affordance class on buttons
1 parent 8312a34 commit 1d791f6

File tree

136 files changed

+101
-30640
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

136 files changed

+101
-30640
lines changed

.eslintrc.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@ module.exports = {
246246
ERROR,
247247
{
248248
ignore: [
249-
'@adobe/spectrum-css-temp',
249+
'@adobe/spectrum-css',
250250
'@react/react-spectrum',
251251
'@spectrum-icons/ui',
252252
'@spectrum-icons/workflow'

.storybook-v3/constants.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
import themeLight from '@adobe/spectrum-css-temp/vars/spectrum-light-unique.css';
2-
import themeLightest from '@adobe/spectrum-css-temp/vars/spectrum-lightest-unique.css';
3-
import themeDark from '@adobe/spectrum-css-temp/vars/spectrum-dark-unique.css';
4-
import themeDarkest from '@adobe/spectrum-css-temp/vars/spectrum-darkest-unique.css';
5-
import scaleMedium from '@adobe/spectrum-css-temp/vars/spectrum-medium-unique.css';
6-
import scaleLarge from '@adobe/spectrum-css-temp/vars/spectrum-large-unique.css';
1+
import themeLight from '@spectrum-css/vars/dist/spectrum-light-unique.css';
2+
import themeLightest from '@spectrum-css/vars/dist/spectrum-lightest-unique.css';
3+
import themeDark from '@spectrum-css/vars/dist/spectrum-dark-unique.css';
4+
import themeDarkest from '@spectrum-css/vars/dist/spectrum-darkest-unique.css';
5+
import scaleMedium from '@spectrum-css/vars/dist/spectrum-medium-unique.css';
6+
import scaleLarge from '@spectrum-css/vars/dist/spectrum-large-unique.css';
77

88
const THEME = {
99
light: themeLight,

.storybook-v3/lib/vars.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ function getUniqueVars(vars) {
5656
function getVariableMappings(themes) {
5757
let themeVars = {};
5858
for (let theme of themes) {
59-
let values = getVars(`packages/@adobe/spectrum-css-temp/vars/spectrum-${theme}.css`);
59+
let values = getVars(require.resolve(`@spectrum-css/vars/dist/spectrum-${theme}.css`));
6060
let mappings = getUniqueVars(values);
6161
themeVars[theme] = {values, mappings};
6262
}
@@ -112,7 +112,7 @@ function getVariableMappings(themes) {
112112

113113
let themes = getVariableMappings(['dark', 'darkest', 'light', 'lightest', 'middark', 'midlight']);
114114
let scales = getVariableMappings(['large', 'medium']);
115-
let globals = getVars('packages/@adobe/spectrum-css-temp/vars/spectrum-global.css');
115+
let globals = getVars(require.resolve('@spectrum-css/vars/dist/spectrum-global.css'));
116116

117117
exports.themes = themes.vars;
118118
exports.scales = scales.vars;

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
},
2323
"workspaces": [
2424
"packages/*/*",
25-
"packages/*/*/components/*"
25+
"packages/*/*/*"
2626
],
2727
"devDependencies": {
2828
"@actions/core": "^1.1.0",

0 commit comments

Comments
 (0)