jjsm01/kimai2
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

better readability for drag and drop boxes (#2659)

Browse Source
This commit is contained in:
Kevin Papst
2021-07-13 12:12:10 +02:00
committed by GitHub
parent 27cea996c0
commit 03d5d3c70c
6 changed files with 16 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
assets/sass/calendar.scss
View File

@@ -17,19 +17,21 @@
width: 100%; width: 100%;
} }
.title { .subtitle {
padding: 5px 0 5px 10px; padding: 0 7px 4px 7px;
display: block; display: block;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
white-space: nowrap; white-space: nowrap;
font-size: 0.7em;
} }
.info-icon { .title {
width: 30px; padding: 3px 7px 0;
display: block;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap; white-space: nowrap;
padding: 5px 7px;
border-left: 1px solid;
} }
} }

2
public/build/app.079fbef2.css → public/build/app.7aa10842.css
View File

File diff suppressed because one or more lines are too long

2
public/build/entrypoints.json
View File

@@ -6,7 +6,7 @@
"build/app.07c264a7.js" "build/app.07c264a7.js"
], ],
"css": [ "css": [
"build/app.079fbef2.css" "build/app.7aa10842.css"
] ]
}, },
"invoice": { "invoice": {

2
public/build/manifest.json
View File

@@ -1,5 +1,5 @@
{ {
"build/app.css": "build/app.079fbef2.css", "build/app.css": "build/app.7aa10842.css",
"build/app.js": "build/app.07c264a7.js", "build/app.js": "build/app.07c264a7.js",
"build/invoice.css": "build/invoice.ff32661a.css", "build/invoice.css": "build/invoice.ff32661a.css",
"build/invoice.js": "build/invoice.19f36eca.js", "build/invoice.js": "build/invoice.19f36eca.js",

2
templates/calendar/user.html.twig
View File

@@ -20,7 +20,7 @@
{% block box_body %} {% block box_body %}
<div class="external-events" data-method="{{ source.method }}" data-route="{{ path(source.route, source.routeParams) }}" data-route-replacer="{{ source.routeReplacer|json_encode|e('html_attr') }}"> <div class="external-events" data-method="{{ source.method }}" data-route="{{ path(source.route, source.routeParams) }}" data-route-replacer="{{ source.routeReplacer|json_encode|e('html_attr') }}">
{% for entry in source.entries|slice(0, config.dragDropAmount) %} {% for entry in source.entries|slice(0, config.dragDropAmount) %}
<div draggable="true" style="background-color: {{ entry.color }}; color: {{ entry.color|font_contrast }}" class="external-event ui-draggable ui-draggable-handle" data-entry="{{ entry.data|json_encode|e('html_attr') }}"> <div draggable="true" style="background-color: {{ entry.color }}; color: {{ entry.color|font_contrast }}" class="external-event ui-draggable ui-draggable-handle" data-entry="{{ entry.data|json_encode|e('html_attr') }}"{% if entry.project is not null %} data-toggle="tooltip" title="{{ entry.project.customer.name }}"{% endif %}>
{% if source.blockInclude is not null and entry.blockName is not null and block(entry.blockName, source.blockInclude) is defined %} {% if source.blockInclude is not null and entry.blockName is not null and block(entry.blockName, source.blockInclude) is defined %}
{{ block(entry.blockName, source.blockInclude) }} {{ block(entry.blockName, source.blockInclude) }}
{% else %} {% else %}

14
templates/calendar/widgets.html.twig
View File

@@ -1,13 +1,7 @@
{% macro dd_event(title, customer, project, activity) %} {% macro dd_event(title, customer, project, deprecated) %}
{% import "macros/widgets.html.twig" as widgets %} {% import "macros/widgets.html.twig" as widgets %}
{% if customer is not null %}
<span class="pull-right info-icon" data-toggle="tooltip" data-placement="top" title="{{ customer }}">{{ widgets.icon('customer') }}</span>
{% endif %}
{% if project is not null %}
<span class="pull-right info-icon" data-toggle="tooltip" data-placement="top" title="{{ project }}">{{ widgets.icon('project') }}</span>
{% endif %}
{% if activity is not null %}
<span class="pull-right info-icon" data-toggle="tooltip" data-placement="top" title="{{ activity }}">{{ widgets.icon('activity') }}</span>
{% endif %}
<span class="title">{{ title }}</span> <span class="title">{{ title }}</span>
{% if project is not null %}
<span class="subtitle">{{ project }}{% if customer is not null %}, {{ customer }}{% endif %}</span>
{% endif %}
{% endmacro %} {% endmacro %}