chg: [UI] some adjustements to make both themes less awkward

remotes/origin/main
iglocska 2020-06-23 14:26:41 +02:00
parent 1ae1e496f2
commit 3c0bee7848
No known key found for this signature in database
GPG Key ID: BEA224F1FEF113AC
6 changed files with 9 additions and 9 deletions

View File

@ -66,7 +66,7 @@
'',
$url,
array(
'class' => $this->FontAwesome->getClass($action['icon']) . ' black ' . (empty($action['class']) ? '' : h($action['class'])),
'class' => $this->FontAwesome->getClass($action['icon']) . (empty($action['class']) ? '' : h($action['class'])),
'title' => empty($action['title']) ? '' : h($action['title']),
'aria-label' => empty($action['aria-label']) ? '' : h($action['aria-label']),
),

View File

@ -4,7 +4,7 @@ $alignments = '';
if ($field['scope'] === 'individuals') {
foreach ($raw_alignments as $alignment) {
$alignments .= sprintf(
'<div><span class="font-weight-bold">%s</span> @ %s <a href="#" class="fas fa-trash text-black" onClick="%s"></a></div>',
'<div><span class="font-weight-bold">%s</span> @ %s <a href="#" class="fas fa-trash .text-reset .text-decoration-none" onClick="%s"></a></div>',
h($alignment['type']),
sprintf(
'<a href="/organisations/view/%s">%s</a>',
@ -23,7 +23,7 @@ if ($field['scope'] === 'individuals') {
} else if ($field['scope'] === 'organisations') {
foreach ($raw_alignments as $alignment) {
$alignments .= sprintf(
'<div>[<span class="font-weight-bold">%s</span>] %s <a href="#" class="fas fa-trash text-black" onClick="%s"></a></div>',
'<div>[<span class="font-weight-bold">%s</span>] %s <a href="#" class="fas fa-trash .text-reset .text-decoration-none" onClick="%s"></a></div>',
h($alignment['type']),
sprintf(
'<a href="/individuals/view/%s">%s</a>',

View File

@ -23,7 +23,7 @@
empty($timestamp) ? 'red bold' : '',
h($ageString),
(!$enabled || !$isSiteAdmin) ? '' : sprintf(
' <a href="%s" aria-label="%s" title="%s"><span class="black fa fa-memory"></span></a>',
' <a href="%s" aria-label="%s" title="%s"><span class="fa fa-memory"></span></a>',
$baseurl . '/feeds/cacheFeeds/' . h($primary),
__('Cache feed'),
__('Cache feed')

View File

@ -13,7 +13,7 @@
}
if (is_bool($data)) {
$data = sprintf(
'<i class="black fa fa-%s"></i>',
'<i class="fa fa-%s"></i>',
$data ? 'check' : 'times'
);
$data = '';

View File

@ -1,5 +1,5 @@
<?php
echo sprintf(
'<i class="black %s"></i>',
'<i class="%s"></i>',
$this->FontAwesome->getClass($this->Hash->extract($row, $field['data_path'])[0])
);
);

View File

@ -11,7 +11,7 @@ if (!empty($field['path'])) {
if ($field['scope'] === 'individuals') {
foreach ($extracted['alignments'] as $alignment) {
$alignments .= sprintf(
'<div><span class="font-weight-bold">%s</span> @ %s <a href="#" class="fas fa-trash text-black" onClick="%s"></a></div>',
'<div><span class="font-weight-bold">%s</span> @ %s <a href="#" class="fas fa-trash" onClick="%s"></a></div>',
h($alignment['type']),
sprintf(
'<a href="/organisations/view/%s">%s</a>',
@ -30,7 +30,7 @@ if ($field['scope'] === 'individuals') {
} else if ($field['scope'] === 'organisations') {
foreach ($extracted['alignments'] as $alignment) {
$alignments .= sprintf(
'<div>[<span class="font-weight-bold">%s</span>] %s <a href="#" class="fas fa-trash text-black" onClick="%s"></a></div>',
'<div>[<span class="font-weight-bold">%s</span>] %s <a href="#" class="fas fa-trash" onClick="%s"></a></div>',
h($alignment['type']),
sprintf(
'<a href="/individuals/view/%s">%s</a>',