Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix error messages not visible in activity view #4268

Merged
merged 3 commits into from
Dec 22, 2023
Merged

Fix error messages not visible in activity view #4268

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e74e909
Fix error outside
manuelmeister Dec 19, 2023
c723679
Merge remote-tracking branch 'upstream/devel' into feature/fix-layout…
manuelmeister Dec 19, 2023
de8c0a0
Use class instead of input-class for all single input content nodes
manuelmeister Dec 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion frontend/src/components/activity/CardContentNode.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
</v-toolbar>
</v-card-title>
<slot name="outer">
<v-card-text class="flex-grow-1">
<v-card-text class="flex-grow-1" :class="{ 'pointer-events-none': layoutMode }">
<slot />
</v-card-text>
</slot>
Expand Down Expand Up @@ -139,5 +139,13 @@ export default {
.v-input__control {
height: 100%;
}

.v-text-field__details {
flex-grow: 0;
}

.grow-v-slot .v-input__slot {
flex-grow: 1;
}
}
</style>
2 changes: 1 addition & 1 deletion frontend/src/components/activity/content/LAThematicArea.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<template>
<card-content-node v-bind="$props">
<v-list three-line class="mx-n4">
<v-list three-line class="mx-n4" color="transparent">
<v-list-item-group>
<v-list-item
v-for="(option, key) in contentNode.data.options"
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/activity/content/Notes.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
auto-grow
:disabled="layoutMode || disabled"
:filled="layoutMode"
height="100%"
class="grow-v-slot"
/>
</card-content-node>
</template>
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/activity/content/SafetyConcept.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
rows="2"
:disabled="layoutMode || disabled"
:filled="layoutMode"
height="100%"
class="grow-v-slot"
manuelmeister marked this conversation as resolved.
Show resolved Hide resolved
/>
</card-content-node>
</template>
Expand Down
7 changes: 5 additions & 2 deletions frontend/src/components/activity/content/Storyboard.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,14 @@
<component
:is="isDefaultVariant ? 'table' : 'div'"
class="w-full"
:class="{ 'flex-grow-1': !isDefaultVariant }"
:class="{
'flex-grow-1': !isDefaultVariant,
'pointer-events-none px-3 pb-3': layoutMode,
}"
>
<thead v-if="isDefaultVariant">
<tr>
<th>
<th v-if="!layoutMode">
<span class="d-sr-only">
{{ $tc('components.activity.content.storyboard.reorder') }}
</span>
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/activity/content/Storycontext.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
auto-grow
:disabled="layoutMode || disabled"
:filled="layoutMode"
height="100%"
class="grow-v-slot"
/>
</card-content-node>
</template>
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/activity/content/storyboard/StoryboardRowDefault.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<template>
<tr class="e-storyboard-row e-storyboard-row--default">
<td class="e-storyboard-row__handle">
<td v-if="!layoutMode" class="e-storyboard-row__handle">
<v-btn
icon
small
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/activity/content/storyboard/StoryboardRowDense.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<template>
<div role="row" class="e-storyboard-row e-storyboard-row--dense">
<div role="cell" class="e-storyboard-row__handle">
<div v-if="!layoutMode" role="cell" class="e-storyboard-row__handle">
<v-btn
icon
small
Expand Down
1 change: 1 addition & 0 deletions frontend/src/components/material/MaterialTable.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
:disable-pagination="true"
mobile-breakpoint="0"
item-class="rowClass"
class="transparent"
:class="{
'ec-material-table--dense': !isDefaultVariant,
'ec-material-table--default': isDefaultVariant,
Expand Down
4 changes: 4 additions & 0 deletions frontend/src/scss/global.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,10 @@ body {
display: inline-grid;
}

.pointer-events-none {
pointer-events: none;
}

.opacity-60 {
opacity: 0.6;
}
Expand Down