diff --git a/app/components/button.hbs b/app/components/button.hbs index 67e6770..f3d820f 100644 --- a/app/components/button.hbs +++ b/app/components/button.hbs @@ -1,30 +1,36 @@ - +{{#let + 'inline-flex items-center cursor-pointer border border-transparent hover:opacity-80 active:opacity-60 focus:outline-none' + (hash + primary='text-white bg-primary' + default='text-white bg-gray' + outline='text-gray border-gray' + ) + (hash + small='px-2.5 py-1.5 text-sm' default='px-3 py-2 leading-4 text-sm' + ) as |commonClasses styleClasses sizeClasses| +}} + +{{/let}} diff --git a/app/components/button.js b/app/components/button.js index 961b0d3..fcd7abf 100644 --- a/app/components/button.js +++ b/app/components/button.js @@ -5,6 +5,14 @@ import { tracked } from '@glimmer/tracking'; export default class ButtonComponent extends Component { @tracked _state = 'default'; + get style() { + return this.args.style ?? 'default'; + } + + get size() { + return this.args.size ?? 'default'; + } + get isActive() { return ( this.args.group && diff --git a/app/templates/admin/indexes/item/settings.hbs b/app/templates/admin/indexes/item/settings.hbs index 533441e..cfb2018 100644 --- a/app/templates/admin/indexes/item/settings.hbs +++ b/app/templates/admin/indexes/item/settings.hbs @@ -23,13 +23,20 @@
{{!-- diff --git a/config/tailwind.config.js b/config/tailwind.config.js index dbdc066..f5901d6 100644 --- a/config/tailwind.config.js +++ b/config/tailwind.config.js @@ -7,11 +7,11 @@ const light = '#FAFAFA'; // const light = '#E5E7EB'; // const secondary = '#374151'; -const gray = '#e1dfe2'; +// const gray = '#e1dfe2'; const text = '#252526'; const dark = '#1E1E1E'; // const primary = '#2563EB'; -const primary = '#ff5caa'; +// const primary = '#ff5caa'; module.exports = { content: ['./app/**/*.html', './app/**/*.hbs'], @@ -23,7 +23,11 @@ module.exports = { // gray, dark, text, - primary, + primary: { + light: colors.pink['100'], + DEFAULT: colors.pink['500'], + dark: colors.pink['800'], + }, gray: { light: colors.gray['100'],