diff --git a/src/App.vue b/src/App.vue index 9df4ed430..df46a2094 100644 --- a/src/App.vue +++ b/src/App.vue @@ -783,11 +783,12 @@ h2 { &.bot::after { content: 'bot'; + color: $white; position: absolute; bottom: -4px; font-size: 10px; line-height: 10px; - padding: 1px 2px; + padding: 1px 4px; background-color: $grey-strong; border: 1px solid $white; border-radius: 3px; @@ -2211,6 +2212,18 @@ th.validation-cell { } } +.warning { + color: $orange; +} + +.warning-text { + background-color: rgba($orange, 0.2); + border-left: 4px solid $orange; + border-bottom-right-radius: 0.5em; + border-top-right-radius: 0.5em; + padding: 0.5em; +} + @media screen and (max-width: 1000px) { .button .icon.is-small { margin-right: 0; diff --git a/src/assets/icons/fi-rotate-ccw.svg b/src/assets/icons/fi-rotate-ccw.svg index ade5dc426..7fa11eb19 100644 --- a/src/assets/icons/fi-rotate-ccw.svg +++ b/src/assets/icons/fi-rotate-ccw.svg @@ -1 +1 @@ - \ No newline at end of file + diff --git a/src/components/lists/DayOffList.vue b/src/components/lists/DayOffList.vue index 4a6c6c441..f23115c9c 100644 --- a/src/components/lists/DayOffList.vue +++ b/src/components/lists/DayOffList.vue @@ -9,7 +9,7 @@ @click="openSetDayOffModal" /> -
+
@@ -54,6 +54,13 @@
+
+

{{ $t('days_off.no_days_off') }}

+
+
- -
- -
- {{ task.full_entity_name }} +
+
+
+ {{ productionMap.get(task.project_id)?.name }} +
+
+ {{ task.full_entity_name }} +
+
+
+
+
-
-
-
+
@@ -136,9 +139,8 @@ import { domMixin } from '@/components/mixins/dom' import { formatListMixin } from '@/components/mixins/format' import AddPreviewModal from '@/components/modals/AddPreviewModal' -import EntityThumbnail from '@/components/widgets/EntityThumbnail' +import EntityPreview from '@/components/widgets/EntityPreview' import PeopleAvatar from '@/components/widgets/PeopleAvatar' -import ProductionName from '@/components/widgets/ProductionName' import TableInfo from '@/components/widgets/TableInfo' import TaskTypeName from '@/components/widgets/TaskTypeName' @@ -149,9 +151,8 @@ export default { components: { AddPreviewModal, - EntityThumbnail, + EntityPreview, PeopleAvatar, - ProductionName, TableInfo, TaskTypeName }, @@ -503,10 +504,10 @@ export default { } .board-card { - cursor: pointer; + cursor: grab; + position: relative; .ui-droppable { - padding: 1em; border-radius: 1em; border: 1px solid var(--border-alt); background-color: var(--background-alt); @@ -555,7 +556,6 @@ export default { .avatars { display: flex; flex-direction: row; - gap: 10px; } .production-name { @@ -590,4 +590,25 @@ export default { background: $red; } } + +.infos { + padding: 0.5em; +} + +.production-name { + font-weight: 400; + margin-bottom: 0em; + text-transform: uppercase; +} + +.entity-name { + font-size: 1.1em; + font-weight: 600; +} + +.avatars { + position: absolute; + right: 5px; + top: 75px; +} diff --git a/src/components/lists/PeopleList.vue b/src/components/lists/PeopleList.vue index e2c668923..b51c21999 100644 --- a/src/components/lists/PeopleList.vue +++ b/src/components/lists/PeopleList.vue @@ -59,7 +59,7 @@ v-if="isBots" > {{ person.expiration_date }} - + {{ $t(`people.role.${person.role}`) }} diff --git a/src/components/modals/AddAttachmentModal.vue b/src/components/modals/AddAttachmentModal.vue index 4b1794885..c5d81e193 100644 --- a/src/components/modals/AddAttachmentModal.vue +++ b/src/components/modals/AddAttachmentModal.vue @@ -9,6 +9,15 @@