Skip to content

Commit

Permalink
Merge pull request #54 from CreativeSurveyApp/refactor/blue-50
Browse files Browse the repository at this point in the history
change blue-50 and color-surface-normal-tertiary
  • Loading branch information
gaku101 authored Dec 20, 2023
2 parents 411a313 + caeea6f commit 758e378
Show file tree
Hide file tree
Showing 6 changed files with 21 additions and 21 deletions.
6 changes: 3 additions & 3 deletions output.json
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@
"type": "color"
},
"outline-hover": {
"value": "#F4F9FA",
"value": "#F6F8FA",
"type": "color"
},
"hover-light": {
Expand Down Expand Up @@ -387,7 +387,7 @@
"type": "color"
},
"tertiary": {
"value": "#F1FBFD",
"value": "#F6F8FA",
"type": "color"
}
},
Expand Down Expand Up @@ -522,7 +522,7 @@
},
"blue": {
"50": {
"value": "#F4F9FA",
"value": "#F6F8FA",
"type": "color"
},
"100": {
Expand Down
8 changes: 4 additions & 4 deletions src/tokens/tokens.css
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/**
* Do not edit directly
* Generated on Tue, 19 Dec 2023 06:50:35 GMT
* Generated on Wed, 20 Dec 2023 06:51:03 GMT
*/

:root {
Expand All @@ -27,7 +27,7 @@
--color-button-primary-hover: #8abecb;
--color-button-primary-disable: #d4e7ed;
--color-button-primary-outline-default: #64b5c9;
--color-button-primary-outline-hover: #f4f9fa;
--color-button-primary-outline-hover: #f6f8fa;
--color-button-primary-hover-light: #f1fbfd;
--color-button-primary-outline-disable: #d4e7ed;
--color-button-neutral-default: #e0e0e0;
Expand Down Expand Up @@ -92,7 +92,7 @@
--color-surface-neutral-quaternary: #494949;
--color-surface-normal-primary: #64b5c9;
--color-surface-normal-secondary: #d4e7ed;
--color-surface-normal-tertiary: #f1fbfd;
--color-surface-normal-tertiary: #f6f8fa;
--color-surface-theme-primary-primary: #38aec9;
--color-surface-accent-primary: #eaa21a;
--color-surface-accent-secondary: #5c747f;
Expand Down Expand Up @@ -121,7 +121,7 @@
--color-gray-750: #494949;
--color-gray-800: #3e3e3e;
--color-gray-900: #333333;
--color-blue-50: #f4f9fa;
--color-blue-50: #f6f8fa;
--color-blue-100: #f1fbfd;
--color-blue-200: #d4e7ed;
--color-blue-400: #8abecb;
Expand Down
2 changes: 1 addition & 1 deletion src/tokens/tokens.d.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/**
* Do not edit directly
* Generated on Tue, 19 Dec 2023 06:50:35 GMT
* Generated on Wed, 20 Dec 2023 06:51:03 GMT
*/

export default tokens;
Expand Down
14 changes: 7 additions & 7 deletions src/tokens/tokens.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/**
* Do not edit directly
* Generated on Tue, 19 Dec 2023 06:50:35 GMT
* Generated on Wed, 20 Dec 2023 06:51:03 GMT
*/

module.exports = {
Expand Down Expand Up @@ -507,12 +507,12 @@ module.exports = {
]
},
"outline-hover": {
"value": "#f4f9fa",
"value": "#f6f8fa",
"type": "color",
"filePath": "output.json",
"isSource": true,
"original": {
"value": "#F4F9FA",
"value": "#F6F8FA",
"type": "color"
},
"name": "ColorButtonPrimaryOutlineHover",
Expand Down Expand Up @@ -1986,12 +1986,12 @@ module.exports = {
]
},
"tertiary": {
"value": "#f1fbfd",
"value": "#f6f8fa",
"type": "color",
"filePath": "output.json",
"isSource": true,
"original": {
"value": "#F1FBFD",
"value": "#F6F8FA",
"type": "color"
},
"name": "ColorSurfaceNormalTertiary",
Expand Down Expand Up @@ -2630,12 +2630,12 @@ module.exports = {
},
"blue": {
"50": {
"value": "#f4f9fa",
"value": "#f6f8fa",
"type": "color",
"filePath": "output.json",
"isSource": true,
"original": {
"value": "#F4F9FA",
"value": "#F6F8FA",
"type": "color"
},
"name": "ColorBlue50",
Expand Down
8 changes: 4 additions & 4 deletions src/tokens/tokens.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

// Do not edit directly
// Generated on Tue, 19 Dec 2023 06:50:35 GMT
// Generated on Wed, 20 Dec 2023 06:51:03 GMT

$token-set-order-0: primitive;
$token-set-order-1: semantic;
Expand All @@ -25,7 +25,7 @@ $color-button-primary-default: #64b5c9;
$color-button-primary-hover: #8abecb;
$color-button-primary-disable: #d4e7ed;
$color-button-primary-outline-default: #64b5c9;
$color-button-primary-outline-hover: #f4f9fa;
$color-button-primary-outline-hover: #f6f8fa;
$color-button-primary-hover-light: #f1fbfd;
$color-button-primary-outline-disable: #d4e7ed;
$color-button-neutral-default: #e0e0e0;
Expand Down Expand Up @@ -90,7 +90,7 @@ $color-surface-neutral-tertiary: #999999;
$color-surface-neutral-quaternary: #494949;
$color-surface-normal-primary: #64b5c9;
$color-surface-normal-secondary: #d4e7ed;
$color-surface-normal-tertiary: #f1fbfd;
$color-surface-normal-tertiary: #f6f8fa;
$color-surface-theme-primary-primary: #38aec9;
$color-surface-accent-primary: #eaa21a;
$color-surface-accent-secondary: #5c747f;
Expand Down Expand Up @@ -119,7 +119,7 @@ $color-gray-700: #4b4b4b;
$color-gray-750: #494949;
$color-gray-800: #3e3e3e;
$color-gray-900: #333333;
$color-blue-50: #f4f9fa;
$color-blue-50: #f6f8fa;
$color-blue-100: #f1fbfd;
$color-blue-200: #d4e7ed;
$color-blue-400: #8abecb;
Expand Down
4 changes: 2 additions & 2 deletions tokens.json
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
},
"blue": {
"50": {
"value": "#F4F9FA",
"value": "#F6F8FA",
"type": "color"
},
"100": {
Expand Down Expand Up @@ -842,7 +842,7 @@
"type": "color"
},
"tertiary": {
"value": "{color.blue.100}",
"value": "{color.blue.50}",
"type": "color"
}
},
Expand Down

0 comments on commit 758e378

Please sign in to comment.