chg: [genericTemplate:filters] Fixed some UI issues
parent
e65e283c04
commit
0c38ee1532
|
@ -145,16 +145,16 @@ class BootstrapGeneric
|
|||
{
|
||||
public static $variants = ['primary', 'secondary', 'success', 'danger', 'warning', 'info', 'light', 'dark', 'white', 'transparent'];
|
||||
public static $textClassByVariants = [
|
||||
'primary' => 'text-white',
|
||||
'secondary' => 'text-white',
|
||||
'success' => 'text-white',
|
||||
'danger' => 'text-white',
|
||||
'warning' => 'text-black',
|
||||
'info' => 'text-white',
|
||||
'light' => 'text-black',
|
||||
'dark' => 'text-white',
|
||||
'white' => 'text-black',
|
||||
'transparent' => 'text-black'
|
||||
'primary' => 'text-light',
|
||||
'secondary' => 'text-light',
|
||||
'success' => 'text-light',
|
||||
'danger' => 'text-light',
|
||||
'warning' => 'text-dark',
|
||||
'info' => 'text-light',
|
||||
'light' => 'text-dark',
|
||||
'dark' => 'text-light',
|
||||
'white' => 'text-dark',
|
||||
'transparent' => 'text-dark'
|
||||
];
|
||||
protected $allowedOptionValues = [];
|
||||
protected $options = [];
|
||||
|
@ -946,8 +946,10 @@ class BoostrapBadge extends BootstrapGeneric {
|
|||
{
|
||||
$html = $this->genNode('span', [
|
||||
'class' => array_merge($this->options['class'], [
|
||||
'ms-1',
|
||||
'badge',
|
||||
"bg-{$this->options['variant']}",
|
||||
$this->getTextClassForVariant($this->options['variant']),
|
||||
$this->options['pill'] ? 'rounded-pill' : '',
|
||||
]),
|
||||
'title' => $this->options['title']
|
||||
|
|
|
@ -27,6 +27,7 @@ if ($taggingEnabled) {
|
|||
$helpText = $this->Bootstrap->genNode('sup', [
|
||||
'class' => ['ms-1 fa fa-info'],
|
||||
'title' => __('Supports negation matches (with the `!` character) and LIKE matches (with the `%` character). Example: `!exportable`, `%able`'),
|
||||
'data-bs-toggle' => 'tooltip',
|
||||
]);
|
||||
$filteringTags = $this->Bootstrap->genNode('h5', [], __('Tags') . $helpText);
|
||||
$filteringTags .= $this->Tag->tags([], [
|
||||
|
|
|
@ -168,3 +168,7 @@ input[type="checkbox"]:disabled.change-cursor {
|
|||
border-top-left-radius: 0 !important;
|
||||
border-bottom-left-radius: 0 !important;
|
||||
}
|
||||
|
||||
.select2-container {
|
||||
z-index: 1060;
|
||||
}
|
Loading…
Reference in New Issue