Skip to content

Commit

Permalink
Generator adjustments, new theme balance
Browse files Browse the repository at this point in the history
  • Loading branch information
@endigo9740
endigo9740 committed Oct 1, 2024
1 parent 56dc567 commit ad685aa
Show file tree
Hide file tree
Showing 18 changed files with 227 additions and 213 deletions.
104 changes: 52 additions & 52 deletions ...ages/skeleton/src/plugin/themes/wumpus.ts → ...ges/skeleton/src/plugin/themes/concord.ts
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import type { Theme } from './index.js';

const wumpus = {
name: 'wumpus',
const concord = {
name: 'concord',
properties: {
'--type-scale-factor': '1.067',
'--type-scale-factor': '1.25',
'--type-scale-1': 'calc(0.75rem * var(--type-scale-factor))',
'--type-scale-2': 'calc(0.875rem * var(--type-scale-factor))',
'--type-scale-3': 'calc(1rem * var(--type-scale-factor))',
Expand All @@ -20,8 +20,8 @@ const wumpus = {
'--base-font-color': 'var(--color-surface-950)',
'--base-font-color-dark': 'var(--color-surface-50)',
'--base-font-family': 'system-ui, sans-serif',
'--base-font-size': '18px',
'--base-line-height': '28px',
'--base-font-size': 'inherit',
'--base-line-height': 'inherit',
'--base-font-weight': 'normal',
'--base-font-style': 'normal',
'--base-letter-spacing': '0em',
Expand All @@ -44,8 +44,8 @@ const wumpus = {
'--anchor-text-decoration-active': 'none',
'--anchor-text-decoration-focus': 'none',
'--space-scale-factor': '1',
'--radii-default': '4px',
'--radii-container': '24px',
'--radii-default': '6px',
'--radii-container': '12px',
'--border-width-default': '0px',
'--divide-width-default': '1px',
'--outline-width-default': '1px',
Expand All @@ -58,11 +58,11 @@ const wumpus = {
'--color-primary-300': '144 154 247',
'--color-primary-400': '116 128 245',
'--color-primary-500': '88 101 242',
'--color-primary-600': '75 86 231',
'--color-primary-700': '62 72 220',
'--color-primary-800': '48 57 209',
'--color-primary-900': '35 43 198',
'--color-primary-950': '22 28 187',
'--color-primary-600': '78 90 231',
'--color-primary-700': '68 78 219',
'--color-primary-800': '59 67 208',
'--color-primary-900': '49 55 196',
'--color-primary-950': '39 44 185',
'--color-primary-contrast-dark': 'var(--color-primary-950)',
'--color-primary-contrast-light': 'var(--color-primary-50)',
'--color-primary-contrast-50': 'var(--color-primary-contrast-dark)',
Expand All @@ -87,7 +87,7 @@ const wumpus = {
'--color-secondary-800': '153 51 104',
'--color-secondary-900': '125 45 86',
'--color-secondary-950': '88 40 65',
'--color-secondary-contrast-dark': 'var(--color-secondary-950)',
'--color-secondary-contrast-dark': '0 0 0',
'--color-secondary-contrast-light': '255 255 255',
'--color-secondary-contrast-50': 'var(--color-secondary-contrast-dark)',
'--color-secondary-contrast-100': 'var(--color-secondary-contrast-dark)',
Expand All @@ -100,42 +100,42 @@ const wumpus = {
'--color-secondary-contrast-800': 'var(--color-secondary-contrast-light)',
'--color-secondary-contrast-900': 'var(--color-secondary-contrast-light)',
'--color-secondary-contrast-950': 'var(--color-secondary-contrast-light)',
'--color-tertiary-50': '215 255 255',
'--color-tertiary-100': '186 237 253',
'--color-tertiary-200': '157 218 250',
'--color-tertiary-300': '129 200 248',
'--color-tertiary-400': '100 181 245',
'--color-tertiary-50': '205 230 249',
'--color-tertiary-100': '178 217 248',
'--color-tertiary-200': '151 203 247',
'--color-tertiary-300': '125 190 245',
'--color-tertiary-400': '98 176 244',
'--color-tertiary-500': '71 163 243',
'--color-tertiary-600': '61 144 220',
'--color-tertiary-700': '51 125 196',
'--color-tertiary-800': '41 107 173',
'--color-tertiary-900': '31 88 149',
'--color-tertiary-950': '21 69 126',
'--color-tertiary-contrast-dark': 'var(--color-tertiary-950)',
'--color-tertiary-600': '62 147 224',
'--color-tertiary-700': '53 130 205',
'--color-tertiary-800': '45 114 185',
'--color-tertiary-900': '36 97 166',
'--color-tertiary-950': '27 81 147',
'--color-tertiary-contrast-dark': '0 0 0',
'--color-tertiary-contrast-light': 'var(--color-tertiary-50)',
'--color-tertiary-contrast-50': 'var(--color-tertiary-contrast-dark)',
'--color-tertiary-contrast-100': 'var(--color-tertiary-contrast-dark)',
'--color-tertiary-contrast-200': 'var(--color-tertiary-contrast-dark)',
'--color-tertiary-contrast-300': 'var(--color-tertiary-contrast-dark)',
'--color-tertiary-contrast-400': 'var(--color-tertiary-contrast-dark)',
'--color-tertiary-contrast-500': 'var(--color-tertiary-contrast-dark)',
'--color-tertiary-contrast-600': 'var(--color-tertiary-contrast-light)',
'--color-tertiary-contrast-700': 'var(--color-tertiary-contrast-light)',
'--color-tertiary-contrast-800': 'var(--color-tertiary-contrast-light)',
'--color-tertiary-contrast-600': 'var(--color-tertiary-contrast-dark)',
'--color-tertiary-contrast-700': 'var(--color-tertiary-contrast-dark)',
'--color-tertiary-contrast-800': 'var(--color-tertiary-contrast-dark)',
'--color-tertiary-contrast-900': 'var(--color-tertiary-contrast-light)',
'--color-tertiary-contrast-950': 'var(--color-tertiary-contrast-light)',
'--color-success-50': '228 255 255',
'--color-success-100': '200 252 231',
'--color-success-200': '172 250 207',
'--color-success-300': '143 247 183',
'--color-success-400': '115 245 159',
'--color-success-50': '229 255 243',
'--color-success-100': '201 252 221',
'--color-success-200': '172 250 200',
'--color-success-300': '144 247 178',
'--color-success-400': '115 245 157',
'--color-success-500': '87 242 135',
'--color-success-600': '70 217 112',
'--color-success-700': '52 192 89',
'--color-success-800': '35 166 65',
'--color-success-900': '17 141 42',
'--color-success-950': '0 116 19',
'--color-success-contrast-dark': 'var(--color-success-950)',
'--color-success-contrast-dark': '0 0 0',
'--color-success-contrast-light': 'var(--color-success-50)',
'--color-success-contrast-50': 'var(--color-success-contrast-dark)',
'--color-success-contrast-100': 'var(--color-success-contrast-dark)',
Expand All @@ -145,21 +145,21 @@ const wumpus = {
'--color-success-contrast-500': 'var(--color-success-contrast-dark)',
'--color-success-contrast-600': 'var(--color-success-contrast-dark)',
'--color-success-contrast-700': 'var(--color-success-contrast-dark)',
'--color-success-contrast-800': 'var(--color-success-contrast-light)',
'--color-success-contrast-900': 'var(--color-success-contrast-light)',
'--color-success-contrast-800': 'var(--color-success-contrast-dark)',
'--color-success-contrast-900': 'var(--color-success-contrast-dark)',
'--color-success-contrast-950': 'var(--color-success-contrast-light)',
'--color-warning-50': '255 255 219',
'--color-warning-100': '255 250 194',
'--color-warning-200': '255 245 168',
'--color-warning-300': '254 241 143',
'--color-warning-400': '254 236 117',
'--color-warning-50': '255 247 204',
'--color-warning-100': '255 244 182',
'--color-warning-200': '255 241 159',
'--color-warning-300': '254 237 137',
'--color-warning-400': '254 234 114',
'--color-warning-500': '254 231 92',
'--color-warning-600': '232 209 74',
'--color-warning-700': '210 187 57',
'--color-warning-800': '188 165 39',
'--color-warning-900': '166 143 22',
'--color-warning-950': '144 121 4',
'--color-warning-contrast-dark': 'var(--color-warning-950)',
'--color-warning-contrast-dark': '0 0 0',
'--color-warning-contrast-light': 'var(--color-warning-50)',
'--color-warning-contrast-50': 'var(--color-warning-contrast-dark)',
'--color-warning-contrast-100': 'var(--color-warning-contrast-dark)',
Expand All @@ -169,29 +169,29 @@ const wumpus = {
'--color-warning-contrast-500': 'var(--color-warning-contrast-dark)',
'--color-warning-contrast-600': 'var(--color-warning-contrast-dark)',
'--color-warning-contrast-700': 'var(--color-warning-contrast-dark)',
'--color-warning-contrast-800': 'var(--color-warning-contrast-light)',
'--color-warning-contrast-900': 'var(--color-warning-contrast-light)',
'--color-warning-contrast-950': 'var(--color-warning-contrast-light)',
'--color-warning-contrast-800': 'var(--color-warning-contrast-dark)',
'--color-warning-contrast-900': 'var(--color-warning-contrast-dark)',
'--color-warning-contrast-950': 'var(--color-warning-contrast-dark)',
'--color-error-50': '255 213 204',
'--color-error-100': '251 184 177',
'--color-error-200': '248 154 150',
'--color-error-300': '244 125 123',
'--color-error-400': '241 95 96',
'--color-error-500': '237 66 69',
'--color-error-600': '214 53 55',
'--color-error-700': '191 40 41',
'--color-error-800': '168 26 28',
'--color-error-900': '145 13 14',
'--color-error-950': '122 0 0',
'--color-error-contrast-dark': 'var(--color-error-950)',
'--color-error-600': '217 57 59',
'--color-error-700': '197 48 50',
'--color-error-800': '177 39 40',
'--color-error-900': '157 30 31',
'--color-error-950': '137 21 21',
'--color-error-contrast-dark': '0 0 0',
'--color-error-contrast-light': 'var(--color-error-50)',
'--color-error-contrast-50': 'var(--color-error-contrast-dark)',
'--color-error-contrast-100': 'var(--color-error-contrast-dark)',
'--color-error-contrast-200': 'var(--color-error-contrast-dark)',
'--color-error-contrast-300': 'var(--color-error-contrast-dark)',
'--color-error-contrast-400': 'var(--color-error-contrast-dark)',
'--color-error-contrast-500': 'var(--color-error-contrast-dark)',
'--color-error-contrast-600': 'var(--color-error-contrast-light)',
'--color-error-contrast-600': 'var(--color-error-contrast-dark)',
'--color-error-contrast-700': 'var(--color-error-contrast-light)',
'--color-error-contrast-800': 'var(--color-error-contrast-light)',
'--color-error-contrast-900': 'var(--color-error-contrast-light)',
Expand Down Expand Up @@ -223,4 +223,4 @@ const wumpus = {
}
} satisfies Theme;

export default wumpus;
export default concord;
12 changes: 6 additions & 6 deletions packages/skeleton/src/plugin/themes/imperial.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import type { Theme } from './index.js';
const imperial = {
name: 'imperial',
properties: {
'--type-scale-factor': '1.125',
'--type-scale-factor': '1.067',
'--type-scale-1': 'calc(0.75rem * var(--type-scale-factor))',
'--type-scale-2': 'calc(0.875rem * var(--type-scale-factor))',
'--type-scale-3': 'calc(1rem * var(--type-scale-factor))',
Expand Down Expand Up @@ -52,11 +52,11 @@ const imperial = {
'--ring-width-default': '1px',
'--body-background-color': 'var(--color-surface-50)',
'--body-background-color-dark': 'var(--color-surface-950)',
'--color-primary-50': '255 164 148',
'--color-primary-100': '248 132 126',
'--color-primary-200': '241 99 104',
'--color-primary-300': '233 67 82',
'--color-primary-400': '226 34 60',
'--color-primary-50': '255 207 199',
'--color-primary-100': '248 166 167',
'--color-primary-200': '241 125 135',
'--color-primary-300': '233 84 102',
'--color-primary-400': '226 43 70',
'--color-primary-500': '219 2 38',
'--color-primary-600': '202 3 34',
'--color-primary-700': '186 4 31',
Expand Down
4 changes: 2 additions & 2 deletions packages/skeleton/src/plugin/themes/index.ts
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import catppuccin from './catppuccin.js';
import cerberus from './cerberus.js';
import concord from './concord.js';
import imperial from './imperial.js';
import jupiter from './jupiter.js';
import mint from './mint.js';
Expand All @@ -8,10 +9,9 @@ import pine from './pine.js';
import reign from './reign.js';
import rose from './rose.js';
import terminus from './terminus.js';
import wumpus from './wumpus.js';
import vox from './vox.js';

export { catppuccin, cerberus, imperial, jupiter, mint, mona, pine, reign, rose, terminus, wumpus, vox };
export { catppuccin, cerberus, imperial, jupiter, mint, mona, pine, reign, rose, terminus, concord, vox };

export type Theme = {
name: string;
Expand Down
28 changes: 14 additions & 14 deletions packages/skeleton/src/plugin/themes/jupiter.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,21 +17,21 @@ const jupiter = {
'--type-scale-11': 'calc(4.5rem * var(--type-scale-factor))',
'--type-scale-12': 'calc(6rem * var(--type-scale-factor))',
'--type-scale-13': 'calc(8rem * var(--type-scale-factor))',
'--base-font-color': 'var(--color-surface-950)',
'--base-font-color-dark': 'var(--color-surface-50)',
'--base-font-color': '0 0 0',
'--base-font-color-dark': '255 255 255',
'--base-font-family': 'Bahnschrift, DIN Alternate, Franklin Gothic Medium, Nimbus Sans Narrow, sans-serif-condensed, sans-serif',
'--base-font-size': '20px',
'--base-line-height': 'inherit',
'--base-font-weight': 'normal',
'--base-font-style': 'normal',
'--base-letter-spacing': '0em',
'--heading-font-color': 'var(--color-surface-900)',
'--heading-font-color': '0 0 0',
'--heading-font-color-dark': 'var(--color-secondary-50)',
'--heading-font-family': 'Bahnschrift, DIN Alternate, Franklin Gothic Medium, Nimbus Sans Narrow, sans-serif-condensed, sans-serif',
'--heading-font-weight': 'normal',
'--heading-font-style': 'normal',
'--heading-letter-spacing': 'inherit',
'--anchor-font-color': 'var(--color-primary-500)',
'--anchor-font-color': 'var(--color-primary-600)',
'--anchor-font-color-dark': 'var(--color-primary-500)',
'--anchor-font-family': 'inherit',
'--anchor-font-size': 'inherit',
Expand All @@ -44,13 +44,13 @@ const jupiter = {
'--anchor-text-decoration-active': 'none',
'--anchor-text-decoration-focus': 'none',
'--space-scale-factor': '1.05',
'--radii-default': '9999px',
'--radii-container': '12px',
'--radii-default': '6px',
'--radii-container': '6px',
'--border-width-default': '2px',
'--divide-width-default': '1px',
'--outline-width-default': '1px',
'--ring-width-default': '1px',
'--body-background-color': 'var(--color-surface-100)',
'--body-background-color': 'var(--color-surface-50)',
'--body-background-color-dark': 'var(--color-surface-950)',
'--color-primary-50': '251 226 182',
'--color-primary-100': '250 197 147',
Expand Down Expand Up @@ -196,11 +196,11 @@ const jupiter = {
'--color-error-contrast-800': 'var(--color-error-contrast-light)',
'--color-error-contrast-900': 'var(--color-error-contrast-light)',
'--color-error-contrast-950': 'var(--color-error-contrast-light)',
'--color-surface-50': '144 152 148',
'--color-surface-100': '122 133 129',
'--color-surface-200': '113 122 119',
'--color-surface-300': '103 111 110',
'--color-surface-400': '93 100 100',
'--color-surface-50': '185 192 188',
'--color-surface-100': '165 171 168',
'--color-surface-200': '144 151 149',
'--color-surface-300': '124 130 129',
'--color-surface-400': '103 110 110',
'--color-surface-500': '83 89 90',
'--color-surface-600': '73 78 80',
'--color-surface-700': '63 67 70',
Expand All @@ -213,8 +213,8 @@ const jupiter = {
'--color-surface-contrast-100': 'var(--color-surface-contrast-dark)',
'--color-surface-contrast-200': 'var(--color-surface-contrast-dark)',
'--color-surface-contrast-300': 'var(--color-surface-contrast-dark)',
'--color-surface-contrast-400': 'var(--color-surface-contrast-dark)',
'--color-surface-contrast-500': 'var(--color-surface-contrast-dark)',
'--color-surface-contrast-400': 'var(--color-surface-contrast-light)',
'--color-surface-contrast-500': 'var(--color-surface-contrast-light)',
'--color-surface-contrast-600': 'var(--color-surface-contrast-light)',
'--color-surface-contrast-700': 'var(--color-surface-contrast-light)',
'--color-surface-contrast-800': 'var(--color-surface-contrast-light)',
Expand Down
38 changes: 19 additions & 19 deletions packages/skeleton/src/plugin/themes/mint.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import type { Theme } from './index.js';
const mint = {
name: 'mint',
properties: {
'--type-scale-factor': '1.125',
'--type-scale-factor': '1.067',
'--type-scale-1': 'calc(0.75rem * var(--type-scale-factor))',
'--type-scale-2': 'calc(0.875rem * var(--type-scale-factor))',
'--type-scale-3': 'calc(1rem * var(--type-scale-factor))',
Expand All @@ -20,18 +20,18 @@ const mint = {
'--base-font-color': 'var(--color-surface-950)',
'--base-font-color-dark': 'var(--color-surface-50)',
'--base-font-family': 'system-ui, sans-serif',
'--base-font-size': '16px',
'--base-line-height': '24px',
'--base-font-weight': 'normal',
'--base-font-size': 'inherit',
'--base-line-height': 'inherit',
'--base-font-weight': 'inherit',
'--base-font-style': 'normal',
'--base-letter-spacing': '0em',
'--heading-font-color': 'inherit',
'--heading-font-color': 'var(--color-surface-600)',
'--heading-font-color-dark': 'inherit',
'--heading-font-family': 'inherit',
'--heading-font-weight': 'normal',
'--heading-font-style': 'normal',
'--heading-letter-spacing': 'inherit',
'--anchor-font-color': 'var(--color-primary-500)',
'--anchor-font-color': '255 255 255',
'--anchor-font-color-dark': 'var(--color-primary-500)',
'--anchor-font-family': 'inherit',
'--anchor-font-size': 'inherit',
Expand All @@ -44,24 +44,24 @@ const mint = {
'--anchor-text-decoration-active': 'none',
'--anchor-text-decoration-focus': 'none',
'--space-scale-factor': '1',
'--radii-default': '12px',
'--radii-default': '9999px',
'--radii-container': '24px',
'--border-width-default': '0px',
'--divide-width-default': '1px',
'--outline-width-default': '1px',
'--ring-width-default': '1px',
'--body-background-color': 'var(--color-surface-200)',
'--body-background-color-dark': 'var(--color-surface-700)',
'--color-primary-50': '196 248 219',
'--color-primary-100': '175 245 207',
'--color-primary-200': '159 247 191',
'--color-primary-300': '143 250 176',
'--color-primary-400': '127 252 160',
'--color-primary-500': '111 255 144',
'--color-primary-600': '98 228 128',
'--color-primary-700': '85 201 112',
'--color-primary-800': '73 175 95',
'--color-primary-900': '60 148 79',
'--color-primary-50': '200 238 217',
'--color-primary-100': '181 237 201',
'--color-primary-200': '162 236 184',
'--color-primary-300': '143 234 168',
'--color-primary-400': '124 233 151',
'--color-primary-500': '105 232 135',
'--color-primary-600': '93 210 121',
'--color-primary-700': '82 188 106',
'--color-primary-800': '70 165 92',
'--color-primary-900': '59 143 77',
'--color-primary-950': '47 121 63',
'--color-primary-contrast-dark': 'var(--color-surface-950)',
'--color-primary-contrast-light': '255 255 255',
Expand All @@ -73,8 +73,8 @@ const mint = {
'--color-primary-contrast-500': 'var(--color-primary-contrast-dark)',
'--color-primary-contrast-600': 'var(--color-primary-contrast-dark)',
'--color-primary-contrast-700': 'var(--color-primary-contrast-dark)',
'--color-primary-contrast-800': 'var(--color-primary-contrast-light)',
'--color-primary-contrast-900': 'var(--color-primary-contrast-light)',
'--color-primary-contrast-800': 'var(--color-primary-contrast-dark)',
'--color-primary-contrast-900': 'var(--color-primary-contrast-dark)',
'--color-primary-contrast-950': 'var(--color-primary-contrast-light)',
'--color-secondary-50': '218 211 253',
'--color-secondary-100': '197 189 251',
Expand Down
Loading

0 comments on commit ad685aa

Please sign in to comment.