Skip to content

Commit

Permalink
rework btn-fab classes; introduce new fab size; rework btn-fab style …
Browse files Browse the repository at this point in the history
…in attribute lists; rework system-separator ui

Signed-off-by: Vinzenz Rosenkranz <[email protected]>
  • Loading branch information
v1r0x committed Dec 13, 2024
1 parent 55fb812 commit 2878385
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 11 deletions.
14 changes: 9 additions & 5 deletions resources/js/components/AttributeList.vue
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
>
<div
v-show="!!state.hoverStates[index]"
class="btn-fab-list"
class="btn-fab-list btn-fab-list-md position-absolute"
>
<button
v-show="hasEmitter('onReorderList')"
Expand Down Expand Up @@ -86,12 +86,16 @@
/>
</button>
</div>
<span
v-if="!element.is_system"
<div
class="text-end col"
>
{{ translateConcept(element.thesaurus_url) }}
</span>
<span v-if="element.is_system">
&nbsp;
</span>
<span v-else>
{{ translateConcept(element.thesaurus_url) }}
</span>
</div>
<sup
v-if="hasEmitter('onMetadata')"
class="clickable d-flex flex-row align-items-start top-0"
Expand Down
8 changes: 4 additions & 4 deletions resources/js/components/EntityTypeList.vue
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,12 @@
<div
v-if="state.hasOnHoverListener"
v-show="state.hoverStates[i]"
class="ms-auto btn-fab-list bg-white position-absolute z-1 end-0 me-2"
class="ms-auto btn-fab-list btn-fab-list-sm bg-white position-absolute z-1 end-0 me-2"
:class="activeClasses(entry)"
>
<button
v-if="state.hasEditListener"
class="btn btn-outline-info btn-fab-sm rounded-circle"
class="btn btn-outline-info btn-fab rounded-circle"
data-bs-toggle="popover"
:data-content="t('global.edit')"
data-trigger="hover"
Expand All @@ -46,7 +46,7 @@
</button>
<button
v-if="state.hasDuplicateListener"
class="btn btn-outline-primary btn-fab-sm rounded-circle"
class="btn btn-outline-primary btn-fab rounded-circle"
data-bs-toggle="popover"
:data-content="t('global.duplicate')"
data-trigger="hover"
Expand All @@ -60,7 +60,7 @@
</button>
<button
v-if="state.hasDeleteListener"
class="btn btn-outline-danger btn-fab-sm rounded-circle"
class="btn btn-outline-danger btn-fab rounded-circle"
data-bs-toggle="popover"
:data-content="t('global.delete')"
data-trigger="hover"
Expand Down
2 changes: 1 addition & 1 deletion resources/js/components/attribute/SystemSeparator.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<template>
<div class="d-flex flex-row align-items-center gap-2">
<div class="d-flex flex-row align-items-center gap-2 form-control">
<div
class="bg-secondary flex-grow-1 rounded-5"
style="height: 3px;"
Expand Down
10 changes: 9 additions & 1 deletion resources/sass/_style.scss
Original file line number Diff line number Diff line change
Expand Up @@ -97,14 +97,22 @@ dl.dl-0-mb > dd:last-child {
width: 1.8rem;
}

.btn-fab-sm {
.btn-fab-list-sm > .btn-fab, .btn-fab-sm {
padding: 0;
height: 1.25rem;
width: 1.25rem;
font-size: 0.8rem;
line-height: normal;
}

.btn-fab-list-md > .btn-fab {
padding: 0;
height: 1.5rem;
width: 1.5rem;
font-size: 0.9rem;
line-height: normal;
}

.btn-fab-list > .btn-fab, .btn-fab-list > .btn-fab-sm {
margin-right: 0.25rem;
}
Expand Down

0 comments on commit 2878385

Please sign in to comment.