Skip to content

Widget operations/styles #4913

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

Merged
merged 7 commits into from
Apr 14, 2025
Merged

Widget operations/styles #4913

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d42a938
wip
stuartromanek Apr 10, 2025
cbe9f15
Merge branch 'pro-7247-widget-operations' of github.com:apostrophecms…
stuartromanek Apr 10, 2025
3d56d34
more
stuartromanek Apr 10, 2025
a4949ba
menus complete
stuartromanek Apr 11, 2025
961cc78
use variables
stuartromanek Apr 11, 2025
86b4703
lint
stuartromanek Apr 11, 2025
8e4ab63
lint
stuartromanek Apr 11, 2025
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
2 changes: 1 addition & 1 deletion modules/@apostrophecms/admin-bar/ui/apos/components/TheAposContextTitle.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ export default {
&__document {
margin-top: 3.5px;

:deep(.apos-context-menu__pane) {
:deep(.apos-context-menu__items) {
min-width: 150px;
}
}
Expand Down
18 changes: 10 additions & 8 deletions modules/@apostrophecms/area/ui/apos/components/AposWidgetControls.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
menu-placement="left"
:has-tip="false"
:button="{
tooltip: { content: 'apostrophe:moreOptions', placement: 'left' },
label: 'apostrophe:moreOptions',
icon: 'dots-horizontal-icon',
iconOnly: true,
Expand Down Expand Up @@ -185,11 +184,16 @@ export default {
icon: 'content-duplicate-icon',
action: 'clone',
modifiers: [
'separator',
...(this.disabled || this.maxReached) ? [ 'disabled' ] : []
]
});

if (this.widgetSecondaryOperations.length) {
controls.push({
separator: true
});
}

// Custom widget operations displayed in the secondary controls
controls.push(...this.widgetSecondaryOperations);

Expand Down Expand Up @@ -230,17 +234,15 @@ $z-index-button-background: 1;
$z-index-button-foreground: 2;

.apos-area-modify-controls {
:deep(.apos-context-menu__items) .apos-context-menu__item {
&:has(.apos-context-menu__button--separator):not(:last-child) {
border-bottom: 1px solid var(--a-base-9);
}
}

:deep(.apos-button__content) {
z-index: $z-index-button-foreground;
position: relative;
}

:deep(.apos-context-menu__items) {
min-width: 250px;
}

:deep(.apos-button__icon) {
transition: all 300ms var(--a-transition-timing-bounce);
}
Expand Down
14 changes: 7 additions & 7 deletions modules/@apostrophecms/ui/ui/apos/components/AposContextMenu.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -461,8 +461,8 @@ function handleKeyboard(event) {
}

.apos-context-menu__popup--tb-padded .apos-context-menu__pane{
padding-top: 20px;
padding-bottom: 20px;
padding-top: $spacing-double;
padding-bottom: $spacing-double;
}

.apos-context-menu__popup {
Expand All @@ -482,9 +482,10 @@ function handleKeyboard(event) {
@include type-base;

& {
padding: 20px;
border: 1px solid var(--a-base-8);
border-radius: var(--a-border-radius);
padding: $spacing-half 0;
border: 1px solid var(--a-base-9);
border-radius: var(--a-border-radius-large);
font-size: var(--a-type-menu);
box-shadow: var(--a-box-shadow);
background-color: var(--a-background-primary);
}
Expand All @@ -501,9 +502,8 @@ function handleKeyboard(event) {
display: inline-block;
list-style-type: none;
width: max-content;
margin: none;
margin-block: 0;
padding: 10px 0;
margin: $spacing-half 0;
}
}
</style>
16 changes: 8 additions & 8 deletions modules/@apostrophecms/ui/ui/apos/components/AposContextMenuDialog.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,8 +131,9 @@ function emitSetArrow(arrowEl) {

& {
padding: 20px;
border: 1px solid var(--a-base-8);
border-radius: var(--a-border-radius);
border: 1px solid var(--a-base-9);
font-size: var(--a-type-menu);
border-radius: var(--a-border-radius-large);
box-shadow: var(--a-box-shadow);
background-color: var(--a-background-primary);
}
Expand All @@ -145,28 +146,27 @@ function emitSetArrow(arrowEl) {
display: inline-block;
list-style-type: none;
width: max-content;
margin: none;
margin-block: 0;
padding: 10px 0;
margin: $spacing-three-quarters 0;
}
}

.apos-context-menu__dialog :deep(.apos-schema .apos-field) {
margin-bottom: 20px;
margin-bottom: $spacing-double;

.apos-field__help {
margin-top: 5px;
margin-top: $spacing-half;
}
}

.apos-context-menu__tip[x-placement^='bottom'] {
top: -10px;
top: -$spacing-base;
bottom: auto;
}

.apos-context-menu__tip[x-placement^='top'] {
top: auto;
bottom: -10px;
bottom: -$spacing-base;
transform: rotate(180deg);
}
</style>
63 changes: 49 additions & 14 deletions modules/@apostrophecms/ui/ui/apos/components/AposContextMenuItem.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
<template>
<li class="apos-context-menu__item">
<li
class="apos-context-menu__item"
:class="menuItem.separator ? 'apos-context-menu__item--separator' : null"
>
<hr v-if="menuItem.separator" class="apos-context-menu__separator" />
<button
v-else
class="apos-context-menu__button"
:class="modifiers"
:tabindex="tabindex"
Expand Down Expand Up @@ -87,7 +92,20 @@ export default {
<style lang="scss" scoped>
.apos-context-menu__item {
display: flex;
align-items: center;
}

.apos-context-menu__item:not(.apos-context-menu__item--separator) {
min-height: 36px;
}

.apos-context-menu__separator {
box-sizing: border-box;
width: 100%;
margin: $spacing-half 0;
padding: 0;
border-color: var(--a-base-10);
border-style: solid;
}

.apos-context-menu__button {
Expand All @@ -98,27 +116,25 @@ export default {
flex-grow: 1;
align-items: center;
width: 100%;
margin: 0 10px;
padding: 10px;
margin: 0 $spacing-three-quarters;
padding: $spacing-base;
border: none;
color: var(--a-base-1);
font-size: var(--a-type-menu);
font-weight: 300;
text-align: left;
border-radius: 3px;
border-radius: $spacing-half;
background-color: var(--a-background-primary);
}

&:hover {
cursor: pointer;
color: var(--a-text-primary);
}

&:focus {
outline: none;
color: var(--a-text-primary);
background-color: var(--a-primary-transparent-05);
}

&:focus,
&:active {
color: var(--a-base-1);
outline: 1px solid var(--a-primary-transparent-25);
background-color: var(--a-primary-transparent-05);
}

&--danger {
Expand All @@ -128,8 +144,15 @@ export default {
color: var(--a-danger-button-hover);
}

&:hover,
&:focus,
&:active {
background-color: var(--a-danger-button-background);
}

&:focus,
&:active {
outline: 1px solid var(--a-danger);
color: var(--a-danger-button-active);
}
}
Expand All @@ -141,17 +164,29 @@ export default {
&:focus,
&:active {
color: var(--a-primary);
background-color: var(--a-primary-transparent-15);
}

&:focus,
&:active {
outline: 1px solid var(--a-primary-transparent-25);
}
}

&--disabled {
color: var(--a-base-5);
color: var(--a-base-3);

&:focus,
&:active {
outline: 1px solid var(--a-base-8);
}

&:hover,
&:focus,
&:active {
cursor: not-allowed;
color: var(--a-base-5);
background-color: var(--a-base-9);
}
}

Expand All @@ -161,6 +196,6 @@ export default {
}

.apos-context-menu__active {
background-color: var(--a-base-10)
background-color: var(--a-base-10);
}
</style>
17 changes: 11 additions & 6 deletions modules/@apostrophecms/ui/ui/apos/components/AposFilterMenu.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,24 +138,29 @@ export default {
min-width: 140px;

:deep(.apos-input--select) {
padding-top: 10px;
padding-bottom: 10px;
padding-top: $spacing-base;
padding-bottom: $spacing-base;
background-color: var(--a-base-10);
font-style: italic;
}

:deep(.apos-choice-label) {
padding-right: $spacing-half;
padding-left: $spacing-half;
}
}

.apos-filters-menu :deep(.apos-field__label) {
display: block;
width: 100%;
margin-bottom: 10px;
padding-bottom: 10px;
margin-bottom: $spacing-base + $spacing-half;
padding-bottom: $spacing-half;
border-bottom: 1px solid var(--a-base-9);
color: var(--a-base-3);
color: var(--a-base-2);
}

.apos-filters-menu__set {
margin-bottom: 30px;
margin: 0 0 $spacing-double + $spacing-half;

&:last-child {
margin-bottom: 0;
Expand Down
2 changes: 2 additions & 0 deletions modules/@apostrophecms/ui/ui/apos/scss/global/_theme.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
--a-danger-button-hover: #c00717;
--a-danger-button-active: #a10000;
--a-danger-button-disabled: #ff9d98;
--a-danger-button-background: #eb443b0a;
--a-sensitive: #643810;
--a-sensitive-medium: #e2c7b9;
--a-sensitive-light: #fff3e7;
Expand Down Expand Up @@ -77,6 +78,7 @@
--a-type-base: 12px;
--a-type-label: 13px;
--a-type-large: 14px;
--a-type-menu: 14px;
--a-type-heading: 22px;
--a-type-display: 32px;

Expand Down
1 change: 1 addition & 0 deletions modules/@apostrophecms/ui/ui/apos/scss/mixins/_theme_mixins.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ $input-color-disabled: var(--a-base-4);
--a-primary-transparent-50: #{color.adjust($color, $alpha: -0.5)};
--a-primary-transparent-15: #{color.adjust($color, $alpha: -0.85)};
--a-primary-transparent-10: #{color.adjust($color, $alpha: -0.9)};
--a-primary-transparent-05: #{color.adjust($color, $alpha: -0.95)};
--a-primary-dark-10: #{color.mix(#000, $color, 10%)};
--a-primary-dark-15: #{color.mix(#000, $color, 15%)};
--a-primary-light-40: #{color.mix(#fff, $color, 40%)};
Expand Down
Loading