mirror of
https://github.com/kevinpapst/kimai2.git
synced 2025-03-27 02:08:43 +00:00
fix line-break after color dot for long names
This commit is contained in:
parent
6ffb2dac05
commit
2cd980cc22
5 changed files with 13 additions and 3 deletions
assets/sass
public/build
templates/macros
|
@ -30,6 +30,12 @@ span.label-activity,
|
|||
span.label-project,
|
||||
span.label-customer {
|
||||
display: inline-block;
|
||||
.name {
|
||||
white-space: nowrap;
|
||||
.name-inner {
|
||||
white-space: normal;
|
||||
}
|
||||
}
|
||||
.dot {
|
||||
font-size: 9px;
|
||||
margin-right: 3px;
|
||||
|
|
File diff suppressed because one or more lines are too long
|
@ -6,7 +6,7 @@
|
|||
"build/app.39dfa7e1.js"
|
||||
],
|
||||
"css": [
|
||||
"build/app.a781c3a6.css"
|
||||
"build/app.c80d7236.css"
|
||||
]
|
||||
},
|
||||
"invoice": {
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
{
|
||||
"build/app.css": "build/app.a781c3a6.css",
|
||||
"build/app.css": "build/app.c80d7236.css",
|
||||
"build/app.js": "build/app.39dfa7e1.js",
|
||||
"build/invoice.css": "build/invoice.ff32661a.css",
|
||||
"build/invoice.js": "build/invoice.19f36eca.js",
|
||||
|
|
|
@ -154,16 +154,20 @@
|
|||
|
||||
{# for @internal use only #}
|
||||
{% macro label_color_dot(type, isVisible, name, url, color) %}
|
||||
{% apply spaceless %}
|
||||
<span class="label-{{ type }}{{ isVisible ? '' : ' label-invisible' }}">
|
||||
<span class="name">
|
||||
<i class="dot {{ 'dot'|icon }} fa-fw"{% if color is not empty %} style="color:{{ color }}"{% endif %}></i>
|
||||
<span class="name-inner">
|
||||
{%- if url is not empty -%}
|
||||
<a href="{{ url }}">{{ name }}</a>
|
||||
{%- else -%}
|
||||
{{ name }}
|
||||
{%- endif -%}
|
||||
</span>
|
||||
</span>
|
||||
</span>
|
||||
{% endapply %}
|
||||
{% endmacro %}
|
||||
|
||||
{% macro color_dot(color, tooltip) %}
|
||||
|
|
Loading…
Add table
Reference in a new issue