Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).

* Flowbite::Link component to render links.
* Flowbite::Card now displays a title via the title argument/slot.
* Improved error message when an unknown style is requested.

### Changed

Expand Down
54 changes: 28 additions & 26 deletions app/components/flowbite/button.rb
Original file line number Diff line number Diff line change
Expand Up @@ -31,32 +31,34 @@ def sizes

# rubocop:disable Layout/LineLength
def styles
{
danger: Flowbite::Style.new(
default: ["focus:outline-none", "text-white", "bg-danger", "box-border", "border", "border-transparent", "hover:bg-danger-strong", "focus:ring-4", "focus:ring-danger-medium", "shadow-xs", "font-medium", "leading-5", "rounded-base"]
),
dark: Flowbite::Style.new(
default: ["focus:outline-none", "text-white", "bg-dark", "box-border", "border", "border-transparent", "hover:bg-dark-strong", "focus:ring-4", "focus:ring-neutral-tertiary", "shadow-xs", "font-medium", "leading-5", "rounded-base"]
),
default: Flowbite::Style.new(
default: ["focus:outline-none", "text-white", "bg-brand", "box-border", "border", "border-transparent", "hover:bg-brand-strong", "focus:ring-4", "focus:ring-brand-medium", "shadow-xs", "font-medium", "leading-5", "rounded-base"]
),
ghost: Flowbite::Style.new(
default: ["focus:outline-none", "text-heading", "bg-transparent", "box-border", "border", "border-transparent", "hover:bg-neutral-secondary-medium", "focus:ring-4", "focus:ring-neutral-tertiary", "font-medium", "leading-5", "rounded-base"]
),
secondary: Flowbite::Style.new(
default: ["focus:outline-none", "text-body", "bg-neutral-secondary-medium", "box-border", "border", "border-default-medium", "hover:bg-neutral-tertiary-medium", "focus:ring-4", "focus:ring-neutral-tertiary", "shadow-xs", "font-medium", "leading-5", "rounded-base"]
),
success: Flowbite::Style.new(
default: ["focus:outline-none", "text-white", "bg-success", "box-border", "border", "border-transparent", "hover:bg-success-strong", "focus:ring-4", "focus:ring-success-medium", "shadow-xs", "font-medium", "leading-5", "rounded-base"]
),
tertiary: Flowbite::Style.new(
default: ["focus:outline-none", "text-body", "bg-neutral-primary-soft", "box-border", "border", "border-default", "hover:bg-neutral-secondary-medium", "focus:ring-4", "focus:ring-neutral-tertiary-soft", "shadow-xs", "font-medium", "leading-5", "rounded-base"]
),
warning: Flowbite::Style.new(
default: ["focus:outline-none", "text-white", "bg-warning", "box-border", "border", "border-transparent", "hover:bg-warning-strong", "focus:ring-4", "focus:ring-warning-medium", "shadow-xs", "font-medium", "leading-5", "rounded-base"]
)
}.freeze
Flowbite::Styles.from_hash(
{
danger: {
default: ["focus:outline-none", "text-white", "bg-danger", "box-border", "border", "border-transparent", "hover:bg-danger-strong", "focus:ring-4", "focus:ring-danger-medium", "shadow-xs", "font-medium", "leading-5", "rounded-base"]
},
dark: {
default: ["focus:outline-none", "text-white", "bg-dark", "box-border", "border", "border-transparent", "hover:bg-dark-strong", "focus:ring-4", "focus:ring-neutral-tertiary", "shadow-xs", "font-medium", "leading-5", "rounded-base"]
},
default: {
default: ["focus:outline-none", "text-white", "bg-brand", "box-border", "border", "border-transparent", "hover:bg-brand-strong", "focus:ring-4", "focus:ring-brand-medium", "shadow-xs", "font-medium", "leading-5", "rounded-base"]
},
ghost: {
default: ["focus:outline-none", "text-heading", "bg-transparent", "box-border", "border", "border-transparent", "hover:bg-neutral-secondary-medium", "focus:ring-4", "focus:ring-neutral-tertiary", "font-medium", "leading-5", "rounded-base"]
},
secondary: {
default: ["focus:outline-none", "text-body", "bg-neutral-secondary-medium", "box-border", "border", "border-default-medium", "hover:bg-neutral-tertiary-medium", "focus:ring-4", "focus:ring-neutral-tertiary", "shadow-xs", "font-medium", "leading-5", "rounded-base"]
},
success: {
default: ["focus:outline-none", "text-white", "bg-success", "box-border", "border", "border-transparent", "hover:bg-success-strong", "focus:ring-4", "focus:ring-success-medium", "shadow-xs", "font-medium", "leading-5", "rounded-base"]
},
tertiary: {
default: ["focus:outline-none", "text-body", "bg-neutral-primary-soft", "box-border", "border", "border-default", "hover:bg-neutral-secondary-medium", "focus:ring-4", "focus:ring-neutral-tertiary-soft", "shadow-xs", "font-medium", "leading-5", "rounded-base"]
},
warning: {
default: ["focus:outline-none", "text-white", "bg-warning", "box-border", "border", "border-transparent", "hover:bg-warning-strong", "focus:ring-4", "focus:ring-warning-medium", "shadow-xs", "font-medium", "leading-5", "rounded-base"]
}
}.freeze
)
end
# rubocop:enable Layout/LineLength
end
Expand Down
32 changes: 16 additions & 16 deletions app/components/flowbite/button/outline.rb
Original file line number Diff line number Diff line change
Expand Up @@ -6,29 +6,29 @@ class Outline < Flowbite::Button
class << self
# rubocop:disable Layout/LineLength, Metrics/MethodLength
def styles
{
danger: Flowbite::Style.new(
Flowbite::Styles.from_hash({
danger: {
default: ["focus:outline-none", "text-danger", "bg-transparent", "box-border", "border", "border-danger", "hover:text-white", "hover:bg-danger-strong", "focus:ring-4", "focus:ring-danger-medium", "shadow-xs", "font-medium", "leading-5", "rounded-base", "text-center", "me-2", "mb-2"]
),
dark: Flowbite::Style.new(
},
dark: {
default: ["focus:outline-none", "text-dark", "bg-transparent", "box-border", "border", "border-dark", "hover:text-white", "hover:bg-dark-strong", "focus:ring-4", "focus:ring-neutral-tertiary", "shadow-xs", "font-medium", "leading-5", "rounded-base", "text-center", "me-2", "mb-2"]
),
default: Flowbite::Style.new(
},
default: {
default: ["focus:outline-none", "text-brand", "bg-transparent", "box-border", "border", "border-brand", "hover:text-white", "hover:bg-brand-strong", "focus:ring-4", "focus:ring-brand-medium", "shadow-xs", "font-medium", "leading-5", "rounded-base", "text-center", "me-2", "mb-2"]
),
secondary: Flowbite::Style.new(
},
secondary: {
default: ["focus:outline-none", "text-body", "bg-transparent", "box-border", "border", "border-default-medium", "hover:bg-neutral-tertiary-medium", "focus:ring-4", "focus:ring-neutral-tertiary", "shadow-xs", "font-medium", "leading-5", "rounded-base", "text-center", "me-2", "mb-2"]
),
success: Flowbite::Style.new(
},
success: {
default: ["focus:outline-none", "text-success", "bg-transparent", "box-border", "border", "border-success", "hover:text-white", "hover:bg-success-strong", "focus:ring-4", "focus:ring-success-medium", "shadow-xs", "font-medium", "leading-5", "rounded-base", "text-center", "me-2", "mb-2"]
),
tertiary: Flowbite::Style.new(
},
tertiary: {
default: ["focus:outline-none", "text-body", "bg-transparent", "box-border", "border", "border-default", "hover:bg-neutral-secondary-medium", "focus:ring-4", "focus:ring-neutral-tertiary-soft", "shadow-xs", "font-medium", "leading-5", "rounded-base", "text-center", "me-2", "mb-2"]
),
warning: Flowbite::Style.new(
},
warning: {
default: ["focus:outline-none", "text-warning", "bg-transparent", "box-border", "border", "border-warning", "hover:text-white", "hover:bg-warning-strong", "focus:ring-4", "focus:ring-warning-medium", "shadow-xs", "font-medium", "leading-5", "rounded-base", "text-center", "me-2", "mb-2"]
)
}
}
}.freeze)
end
# rubocop:enable Layout/LineLength, Metrics/MethodLength
end
Expand Down
36 changes: 18 additions & 18 deletions app/components/flowbite/button/pill.rb
Original file line number Diff line number Diff line change
Expand Up @@ -6,32 +6,32 @@ class Pill < Flowbite::Button
class << self
# rubocop:disable Layout/LineLength, Metrics/MethodLength
def styles
{
danger: Flowbite::Style.new(
Flowbite::Styles.from_hash({
danger: {
default: ["focus:outline-none", "text-white", "bg-danger", "box-border", "border", "border-transparent", "hover:bg-danger-strong", "focus:ring-4", "focus:ring-danger-medium", "shadow-xs", "font-medium", "leading-5", "rounded-full", "text-center"]
),
dark: Flowbite::Style.new(
},
dark: {
default: ["focus:outline-none", "text-white", "bg-dark", "box-border", "border", "border-transparent", "hover:bg-dark-strong", "focus:ring-4", "focus:ring-neutral-tertiary", "shadow-xs", "font-medium", "leading-5", "rounded-full", "text-center"]
),
default: Flowbite::Style.new(
},
default: {
default: ["focus:outline-none", "text-white", "bg-brand", "box-border", "border", "border-transparent", "hover:bg-brand-strong", "focus:ring-4", "focus:ring-brand-medium", "shadow-xs", "font-medium", "leading-5", "rounded-full", "text-center"]
),
ghost: Flowbite::Style.new(
},
ghost: {
default: ["focus:outline-none", "text-heading", "bg-transparent", "box-border", "border", "border-transparent", "hover:bg-neutral-secondary-medium", "focus:ring-4", "focus:ring-neutral-tertiary", "font-medium", "leading-5", "rounded-full", "text-center"]
),
secondary: Flowbite::Style.new(
},
secondary: {
default: ["focus:outline-none", "text-body", "bg-neutral-secondary-medium", "box-border", "border", "border-default-medium", "hover:bg-neutral-tertiary-medium", "focus:ring-4", "focus:ring-neutral-tertiary", "shadow-xs", "font-medium", "leading-5", "rounded-full", "text-center"]
),
success: Flowbite::Style.new(
},
success: {
default: ["focus:outline-none", "text-white", "bg-success", "box-border", "border", "border-transparent", "hover:bg-success-strong", "focus:ring-4", "focus:ring-success-medium", "shadow-xs", "font-medium", "leading-5", "rounded-full", "text-center"]
),
tertiary: Flowbite::Style.new(
},
tertiary: {
default: ["focus:outline-none", "text-body", "bg-neutral-primary-soft", "box-border", "border", "border-default", "hover:bg-neutral-secondary-medium", "focus:ring-4", "focus:ring-neutral-tertiary-soft", "shadow-xs", "font-medium", "leading-5", "rounded-full", "text-center"]
),
warning: Flowbite::Style.new(
},
warning: {
default: ["focus:outline-none", "text-white", "bg-warning", "box-border", "border", "border-transparent", "hover:bg-warning-strong", "focus:ring-4", "focus:ring-warning-medium", "shadow-xs", "font-medium", "leading-5", "rounded-full", "text-center"]
)
}
}
}.freeze)
end
# rubocop:enable Layout/LineLength, Metrics/MethodLength
end
Expand Down
12 changes: 7 additions & 5 deletions app/components/flowbite/card.rb
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,13 @@ def classes(state: :default, style: :default)

# rubocop:disable Layout/LineLength
def styles
{
default: Flowbite::Style.new(
default: ["p-6", "bg-neutral-primary-soft", "border", "border-default", "rounded-base", "shadow-xs"]
)
}.freeze
Flowbite::Styles.from_hash(
{
default: {
default: ["p-6", "bg-neutral-primary-soft", "border", "border-default", "rounded-base", "shadow-xs"]
}
}.freeze
)
end
# rubocop:enable Layout/LineLength
end
Expand Down
12 changes: 7 additions & 5 deletions app/components/flowbite/card/title.rb
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,13 @@ def classes(state: :default, style: :default)

# rubocop:disable Layout/LineLength
def styles
{
default: Flowbite::Style.new(
default: ["mb-2", "text-2xl", "font-semibold", "tracking-tight", "text-heading"]
)
}.freeze
Flowbite::Styles.from_hash(
{
default: {
default: ["mb-2", "text-2xl", "font-semibold", "tracking-tight", "text-heading"]
}
}.freeze
)
end
# rubocop:enable Layout/LineLength
end
Expand Down
16 changes: 9 additions & 7 deletions app/components/flowbite/input/checkbox.rb
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,15 @@ def sizes

# rubocop:disable Layout/LineLength
def styles
{
default: Flowbite::Style.new(
default: ["text-brand", "bg-neutral-secondary-medium", "border-default-medium", "rounded-sm", "focus:ring-brand", "focus:ring-2"],
disabled: ["text-brand", "bg-neutral-secondary-medium", "border-default-medium", "rounded-sm", "focus:ring-brand", "focus:ring-2", "cursor-not-allowed"],
error: ["text-danger", "bg-danger-soft", "border-danger-subtle", "rounded-sm", "focus:ring-danger", "focus:ring-2"]
)
}.freeze
Flowbite::Styles.from_hash(
{
default: {
default: ["text-brand", "bg-neutral-secondary-medium", "border-default-medium", "rounded-sm", "focus:ring-brand", "focus:ring-2"],
disabled: ["text-brand", "bg-neutral-secondary-medium", "border-default-medium", "rounded-sm", "focus:ring-brand", "focus:ring-2", "cursor-not-allowed"],
error: ["text-danger", "bg-danger-soft", "border-danger-subtle", "rounded-sm", "focus:ring-danger", "focus:ring-2"]
}
}.freeze
)
end
end

Expand Down
16 changes: 9 additions & 7 deletions app/components/flowbite/input/field.rb
Original file line number Diff line number Diff line change
Expand Up @@ -46,13 +46,15 @@ def sizes

# rubocop:disable Layout/LineLength
def styles
{
default: Flowbite::Style.new(
default: ["bg-neutral-secondary-medium", "border", "border-default-medium", "text-heading", "rounded-base", "focus:ring-brand", "focus:border-brand", "block", "w-full", "shadow-xs", "placeholder:text-body"],
disabled: ["bg-neutral-secondary-medium", "border", "border-default-medium", "text-fg-disabled", "rounded-base", "focus:ring-brand", "focus:border-brand", "block", "w-full", "shadow-xs", "cursor-not-allowed", "placeholder:text-fg-disabled"],
error: ["bg-danger-soft", "border", "border-danger-subtle", "text-fg-danger-strong", "rounded-base", "focus:ring-danger", "focus:border-danger", "block", "w-full", "shadow-xs", "placeholder:text-fg-danger-strong"]
)
}.freeze
Flowbite::Styles.from_hash(
{
default: {
default: ["bg-neutral-secondary-medium", "border", "border-default-medium", "text-heading", "rounded-base", "focus:ring-brand", "focus:border-brand", "block", "w-full", "shadow-xs", "placeholder:text-body"],
disabled: ["bg-neutral-secondary-medium", "border", "border-default-medium", "text-fg-disabled", "rounded-base", "focus:ring-brand", "focus:border-brand", "block", "w-full", "shadow-xs", "cursor-not-allowed", "placeholder:text-fg-disabled"],
error: ["bg-danger-soft", "border", "border-danger-subtle", "text-fg-danger-strong", "rounded-base", "focus:ring-danger", "focus:border-danger", "block", "w-full", "shadow-xs", "placeholder:text-fg-danger-strong"]
}
}.freeze
)
end
# rubocop:enable Layout/LineLength
end
Expand Down
16 changes: 9 additions & 7 deletions app/components/flowbite/input/file.rb
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,15 @@ def input_field_type

# rubocop:disable Layout/LineLength
def self.styles
{
default: Flowbite::Style.new(
default: ["block", "w-full", "text-heading", "border", "border-default-medium", "rounded-base", "cursor-pointer", "bg-neutral-secondary-medium", "focus:outline-none"],
disabled: ["block", "w-full", "text-fg-disabled", "border", "border-default-medium", "rounded-base", "cursor-not-allowed", "bg-neutral-secondary-medium"],
error: ["block", "w-full", "text-fg-danger-strong", "border", "border-danger-subtle", "rounded-base", "cursor-pointer", "bg-danger-soft", "focus:outline-none"]
)
}.freeze
Flowbite::Styles.from_hash(
{
default: {
default: ["block", "w-full", "text-heading", "border", "border-default-medium", "rounded-base", "cursor-pointer", "bg-neutral-secondary-medium", "focus:outline-none"],
disabled: ["block", "w-full", "text-fg-disabled", "border", "border-default-medium", "rounded-base", "cursor-not-allowed", "bg-neutral-secondary-medium"],
error: ["block", "w-full", "text-fg-danger-strong", "border", "border-danger-subtle", "rounded-base", "cursor-pointer", "bg-danger-soft", "focus:outline-none"]
}
}.freeze
)
end
# rubocop:enable Layout/LineLength
end
Expand Down
12 changes: 7 additions & 5 deletions app/components/flowbite/input/hint.rb
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,13 @@ def classes(state: :default, style: :default)
end

def styles
{
default: Flowbite::Style.new(
default: ["mt-2.5", "text-sm", "text-body"]
)
}.freeze
Flowbite::Styles.from_hash(
{
default: {
default: ["mt-2.5", "text-sm", "text-body"]
}
}.freeze
)
end
end

Expand Down
16 changes: 9 additions & 7 deletions app/components/flowbite/input/label.rb
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,15 @@ def classes(state: :default, style: :default)
end

def styles
{
default: Flowbite::Style.new(
default: ["block", "mb-2.5", "text-sm", "font-medium", "text-heading"],
disabled: ["block", "mb-2.5", "text-sm", "font-medium", "text-fg-disabled"],
error: ["block", "mb-2.5", "text-sm", "font-medium", "text-fg-danger-strong"]
)
}.freeze
Flowbite::Styles.from_hash(
{
default: {
default: ["block", "mb-2.5", "text-sm", "font-medium", "text-heading"],
disabled: ["block", "mb-2.5", "text-sm", "font-medium", "text-fg-disabled"],
error: ["block", "mb-2.5", "text-sm", "font-medium", "text-fg-danger-strong"]
}
}.freeze
)
end
end

Expand Down
16 changes: 9 additions & 7 deletions app/components/flowbite/input/radio_button.rb
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,15 @@ def sizes

# rubocop:disable Layout/LineLength
def styles
{
default: Flowbite::Style.new(
default: ["text-brand", "bg-neutral-secondary-medium", "border-default-medium", "focus:ring-brand", "focus:ring-2"],
disabled: ["text-brand", "bg-neutral-secondary-medium", "border-default-medium", "focus:ring-brand", "focus:ring-2", "cursor-not-allowed"],
error: ["text-danger", "bg-danger-soft", "border-danger-subtle", "focus:ring-danger", "focus:ring-2"]
)
}.freeze
Flowbite::Styles.from_hash(
{
default: {
default: ["text-brand", "bg-neutral-secondary-medium", "border-default-medium", "focus:ring-brand", "focus:ring-2"],
disabled: ["text-brand", "bg-neutral-secondary-medium", "border-default-medium", "focus:ring-brand", "focus:ring-2", "cursor-not-allowed"],
error: ["text-danger", "bg-danger-soft", "border-danger-subtle", "focus:ring-danger", "focus:ring-2"]
}
}.freeze
)
end
end

Expand Down
Loading