This commit is contained in:
2021-03-16 13:57:52 +01:00
parent 2a30748195
commit e1842eb0d7
5 changed files with 27 additions and 9 deletions
+2 -2
View File
@@ -144,7 +144,7 @@
color: var(--color-text);
margin: 0;
font-size: var(--font-size-l);
font-weight: 900;
font-weight: 700;
//display: flex;
//align-items: center;
@@ -160,7 +160,7 @@
font-size: 11px;
font-weight: 700;
text-transform: uppercase;
background: var(--color-bg-shade-3);
background: var(--color-bg-shade-5);
//box-shadow: var(--shadow-short);
color: var(--color-text);
height: 22px;
@@ -104,8 +104,8 @@
(this.value.from && !this.value.to ? '@ui.date.x' :
(!this.value.from && this.value.to ? '@ui.date.y' : '@ui.date.xtoy')),
tokens: {
x: Strings.date(this.value.from, this.format || (this.time ? DATETIME_FORMAT : DATE_FORMAT)),
y: Strings.date(this.value.to, this.format || (this.time ? DATETIME_FORMAT : DATE_FORMAT))
x: this.value ? Strings.date(this.value.from, this.format || (this.time ? DATETIME_FORMAT : DATE_FORMAT)) : null,
y: this.value ? Strings.date(this.value.to, this.format || (this.time ? DATETIME_FORMAT : DATE_FORMAT)) : null
}
};
}
+11 -2
View File
@@ -5,7 +5,7 @@
</button>
<component :disabled="value.disabled" :is="tag" type="button" :to="value.url" class="ui-tree-item-link" @click="onClick(value, $event)">
<ui-icon class="ui-tree-item-icon" :symbol="value.icon" :size="18" />
<ui-icon v-if="value.modifier" :title="value.modifier.name" class="ui-tree-item-modifier" :symbol="modifier" :class="modifierClass" :size="14" />
<ui-icon v-if="value.modifier" :title="value.modifier.name" class="ui-tree-item-modifier" :symbol="modifier" :class="modifierClass" :size="12" />
<span class="ui-tree-item-text">{{value.name | localize}}<span class="ui-tree-item-description" v-if="value.description"><br />{{value.description | localize}}</span></span>
</component>
@@ -271,12 +271,21 @@
position: absolute;
left: 10px;
bottom: 12px;
color: var(--color-text-dim);
background: var(--color-tree);
border-radius: 50%;
padding: 3px;
width: 18px;
height: 18px;
.ui-tree-item.is-active &, .ui-tree-item:hover &
{
color: var(--color-text);
}
.ui-tree-item.is-active &
{
background: var(--color-tree-selected);
background: var(--color-tree-selected);
}
}
+2 -2
View File
@@ -30,7 +30,7 @@ $accent-colors: (
"lime": "#a0db61",
"yellow": "#fdd330",
"orange": "#ff662b",
"red": "#d82853"
"red": "rgb(216, 40, 83)"
);
:root
@@ -47,7 +47,7 @@ $accent-colors: (
.color-#{$name}
{
color: var(#{$var});
color: var(#{$var}) !important;
}
.bg-color-#{$name}
+10 -1
View File
@@ -1,6 +1,6 @@
<template>
<svg class="ui-icon" :width="size" :height="size" :stroke-width="stroke" :data-symbol="symbol">
<use v-if="!isFlag" :xlink:href="'#' + symbol.trim()" />
<use v-show="!isFlag" v-bind="{ 'xlink:href': href }" />
</svg>
</template>
@@ -15,6 +15,10 @@
default: null,
required: true
},
file: {
type: String,
default: null
},
size: {
type: Number,
default: 17
@@ -25,10 +29,15 @@
}
},
computed: {
isFlag()
{
return this.symbol && this.symbol.indexOf('flag') === 0;
},
href()
{
return (this.file || '') + '#' + this.symbol;
}
}
}