Adjust error message, swap classes in conditional around
This commit is contained in:
@@ -30,7 +30,7 @@ final class Badge
|
|||||||
}
|
}
|
||||||
|
|
||||||
if ($object && $colour) {
|
if ($object && $colour) {
|
||||||
throw new \RuntimeException(sprintf("You have specified both the colour \"%s\" and an instance of \"%s\", please choose one or the other.", $colour, $object::class));
|
throw new \RuntimeException(sprintf("You have specified both the colour \"%s\" and an instance of \"%s\". Please use one or the other.", $colour, $object::class));
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($object) {
|
if ($object) {
|
||||||
@@ -52,9 +52,9 @@ final class Badge
|
|||||||
$merger = TailwindMerge::instance();
|
$merger = TailwindMerge::instance();
|
||||||
|
|
||||||
if (true === $outline) {
|
if (true === $outline) {
|
||||||
$classes = sprintf('text-white %s %s %s %s', $palette->borderColourClass, $palette->backgroundColourClass, $this->baseClasses, $class);
|
|
||||||
} else {
|
|
||||||
$classes = sprintf('bg-white %s %s %s %s', $palette->borderColourClass, $palette->textColourClass, $this->baseClasses, $class);
|
$classes = sprintf('bg-white %s %s %s %s', $palette->borderColourClass, $palette->textColourClass, $this->baseClasses, $class);
|
||||||
|
} else {
|
||||||
|
$classes = sprintf('text-white %s %s %s %s', $palette->borderColourClass, $palette->backgroundColourClass, $this->baseClasses, $class);
|
||||||
}
|
}
|
||||||
|
|
||||||
$this->finalClasses = $merger->merge($classes);
|
$this->finalClasses = $merger->merge($classes);
|
||||||
|
|||||||
Reference in New Issue
Block a user