Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
49 commits
Select commit Hold shift + click to select a range
14d7171
publish form wip
jasonvarga Mar 3, 2023
e870094
Merge branch 'blueprints' into blueprint-sections-tabs
jasonvarga Mar 3, 2023
798012c
remove sometimes-half-width logic
jasonvarga Mar 3, 2023
e4c2902
avoid comically oversized buttons
jasonvarga Mar 3, 2023
1199264
fix mirror
jasonvarga Mar 3, 2023
86f3127
rename back to sections
jasonvarga Mar 4, 2023
5cb27c7
rename files
jasonvarga Mar 4, 2023
a701639
more
jasonvarga Mar 4, 2023
9b4ab6f
initial blueprint builder switch to tabs
jasonvarga Mar 7, 2023
c6f7c0a
One tab is visible at a time. You can drag sections into other tabs.
jasonvarga Mar 7, 2023
7b62ae0
Dropping a field onto a tab puts it at the top of the first section
jasonvarga Mar 7, 2023
525cd86
Update so blueprints can be saved
jasonvarga Mar 7, 2023
9991808
Swap section handles for instructions
jasonvarga Mar 7, 2023
b67c1ed
bind tab display and handle as inputs
jasonvarga Mar 7, 2023
4e78960
make tabs a tiny bit better
jasonvarga Mar 7, 2023
267dd2d
upgrade draggable so we can use the distance option ...
jasonvarga Mar 7, 2023
e7d68b6
fix tab error states
jasonvarga Mar 7, 2023
8a51938
update tests ...
jasonvarga Mar 8, 2023
799cafb
fix ensuring and removing field logic
jasonvarga Mar 8, 2023
8fc7048
strip out empty display and instructions
jasonvarga Mar 8, 2023
46f0c64
more fixes
jasonvarga Mar 8, 2023
a0443c5
more fixies
jasonvarga Mar 8, 2023
c7a775a
allow old blueprints to continue to work
jasonvarga Mar 8, 2023
8862cc2
old faithful
jasonvarga Mar 8, 2023
6be4945
make field settings work
jasonvarga Mar 8, 2023
4541384
wire up new stuff to replicator and bard
jasonvarga Mar 9, 2023
7185d00
initial switch to new set selector styling
jasonvarga Mar 9, 2023
4ae7920
hook up groups to set picker
jasonvarga Mar 9, 2023
7c84089
When a single group is configured, dont show the group list
jasonvarga Mar 9, 2023
91d10cf
search
jasonvarga Mar 9, 2023
822f1ee
no results
jasonvarga Mar 9, 2023
d5c8658
focus search on open
jasonvarga Mar 9, 2023
df748d7
refactor to a single loop for all groups and set together
jasonvarga Mar 9, 2023
16f01dd
keyboard navigation
jasonvarga Mar 9, 2023
bade0e1
mouse works with keyboard
jasonvarga Mar 9, 2023
d4c25da
ability to delete tabs
jasonvarga Mar 9, 2023
18ffead
bring back tab requirement
jasonvarga Mar 9, 2023
6d1b9c9
add tab instructions for replicator only
jasonvarga Mar 13, 2023
1bf4439
add section handle for replicator only
jasonvarga Mar 13, 2023
88cfd60
improve section/tab handling
jasonvarga Mar 13, 2023
9cc42a6
support old config for replicator/bard sets
jasonvarga Mar 13, 2023
e050c74
Apply fixes from StyleCI
StyleCIBot Mar 13, 2023
80a1082
Merge branch 'blueprints' into blueprint-sections-tabs
jasonvarga Mar 13, 2023
6828635
fix set picker
jasonvarga Mar 13, 2023
fec4762
[4.x] More UI Improvements (#7589)
jackmcdade Mar 13, 2023
db24531
Bring back section handle syncing
jasonvarga Mar 14, 2023
bdc842a
move tab and tab content into their own components
jasonvarga Mar 14, 2023
ad147b3
Sync tab display and handle
jasonvarga Mar 14, 2023
f7592e6
Merge branch 'master' into blueprint-sections-tabs
jasonvarga Mar 14, 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
12 changes: 12 additions & 0 deletions config/cp.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -27,6 +27,18 @@

'start_page' => 'dashboard',

/*
|--------------------------------------------------------------------------
| Listing Filters
|--------------------------------------------------------------------------
|
| Whether to always show the filters on listing pages or hide them behind
| a toggle button to keep things more simple.
|
*/

'always_show_filters' => false,

/*
|--------------------------------------------------------------------------
| Dashboard Widgets
Expand Down
18 changes: 14 additions & 4 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion package.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,7 @@
},
"dependencies": {
"@popperjs/core": "^2.5.3",
"@shopify/draggable": "^1.0.0-beta.8",
"@shopify/draggable": "^1.0.0-beta.12",
"@simonwep/pickr": "^1.7.4",
"@tiptap/core": "^2.0.0-beta.217",
"@tiptap/extension-blockquote": "^2.0.0-beta.217",
Expand DownExpand Up@@ -90,6 +90,7 @@
"@babel/preset-env": "^7.20.2",
"@rollup/plugin-inject": "^5.0.3",
"@tailwindcss/container-queries": "^0.1.0",
"@tailwindcss/line-clamp": "^0.4.2",
"@tailwindcss/typography": "^0.5.9",
"@vitejs/plugin-vue2": "^2.2.0",
"autoprefixer": "^10.4.0",
Expand Down
42 changes: 17 additions & 25 deletions resources/css/components/blueprints.css
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,14 +2,14 @@
BLUEPRINTS
========================================================================== */

.blueprint-tab {
@apply p-2 min-h-40 outline-none;
.blueprint-section {
@apply p-2 min-h-40 outline-none w-full;

&.draggable-source--is-dragging {
opacity: 0.5;
}

&.draggable-mirror .blueprint-tab-card {
&.draggable-mirror .blueprint-section-card {
@apply shadow-lg;
}
}
Expand All@@ -21,10 +21,10 @@
background-size: 7px 17px;
}

.blueprint-tab-field {
.blueprint-section-field {
@apply relative mb-2 px-1 z-10 outline-none text-sm;

.blueprint-tab-field-inner {
.blueprint-section-field-inner {
@apply relative border rounded bg-gray-200 shadow-sm flex outline-none z-10;
}

Expand All@@ -37,13 +37,7 @@
}
}

/* Use specific selector because we don't want it to happen */
/* when used inside a grid field configuratormajig. */
.blueprint-tab .blueprint-tab-field-actions > div {
@apply w-1/2;
}

.blueprint-tab-import {
.blueprint-section-import {
&:before {
content: '';
@apply border rounded absolute bg-gray-200 shadow-sm;
Expand All@@ -53,33 +47,33 @@

/* These are applied here rather than the utility classes so they don't override */
/* the inline widths defined by the draggable library. */
.blueprint-tab-field-w-1\/4 { @apply w-1/4 };
.blueprint-tab-field-w-1\/3 { @apply w-1/3 };
.blueprint-tab-field-w-1\/2 { @apply w-1/2 };
.blueprint-tab-field-w-2\/3 { @apply w-2/3 };
.blueprint-tab-field-w-3\/4 { @apply w-3/4 };
.blueprint-tab-field-w-full { @apply w-full };

.blueprint-add-tab-container {
.blueprint-section-field-w-1\/4 { @apply w-1/4 };
.blueprint-section-field-w-1\/3 { @apply w-1/3 };
.blueprint-section-field-w-1\/2 { @apply w-1/2 };
.blueprint-section-field-w-2\/3 { @apply w-2/3 };
.blueprint-section-field-w-3\/4 { @apply w-3/4 };
.blueprint-section-field-w-full { @apply w-full };

.blueprint-add-section-container {
@apply p-2 flex min-h-40;

.draggable-container--is-dragging & {
display: none;
}
}

.blueprint-add-tab-button {
.blueprint-add-section-button {
@apply relative w-full border border-gray-500 border-dashed rounded flex justify-center items-center text-gray-700;

&:hover {
@apply border-gray text-gray-950;
}

.blueprint-tab-draggable-zone {
.blueprint-section-draggable-zone {
@apply absolute inset-0 p-4;
}

.blueprint-tab-field {
.blueprint-section-field {
@apply bg-white;
}
}
Expand All@@ -88,5 +82,3 @@
display: grid;
grid-template-columns: repeat(auto-fill, minmax(220px, 1fr));
}


11 changes: 2 additions & 9 deletions resources/css/components/column-picker.css
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,17 +3,10 @@
}

.column-picker-item {
@apply bg-white text-sm outline-none flex items-center rounded select-none;
padding: 4px 8px;
margin: -1px 0;
@apply text-sm outline-none flex items-center select-none h-full;

&.sortable {
cursor: grab;

label {
cursor: grab;
}

@apply rounded bg-white border;
&:hover {
@apply bg-gray-200;
}
Expand Down
40 changes: 20 additions & 20 deletions resources/css/components/fieldtypes/bard.css
Original file line numberDiff line numberDiff line change
Expand Up@@ -18,7 +18,7 @@
}

.bard-editor .bard-invalid {
@apply p-2 @lg:px-4 bg-red-lighter text-red text-xs whitespace-nowrap;
@apply p-2 @lg:px-4 bg-red-100 text-red-500 text-xs whitespace-nowrap;
}

/* Modes */
Expand All@@ -40,17 +40,12 @@
}

.bard-fixed-toolbar {
@apply bg-white shadow-none rounded-t border-b text-sm flex items-start justify-between;
position: sticky;
padding: 4px 8px;
z-index: 5;
top: 0;
@apply bg-white shadow-none rounded-t border-b text-sm flex items-start justify-between px-1 py-2 z-5 top-0;
/* position: sticky; */


.bard-toolbar-button {
@apply text-gray-800 rounded px-1 flex text-center justify-center items-center text-base text-center;
height: 32px;
width: 32px;
margin: 0;
@apply text-gray-800 rounded px-1 flex text-center justify-center items-center text-base h-8 w-8 m-0;
svg {
@apply w-auto h-4;
}
Expand DownExpand Up@@ -84,11 +79,7 @@
@apply bg-black rounded-full shadow-lg px-4;

button {
@apply text-gray-700 rounded px-1 flex items-center justify-center text-base text-center bg-transparent;
height: 32px;
width: 32px;
margin: 0 2px;
outline: none;
@apply text-gray-700 rounded px-1 flex items-center justify-center text-base text-center bg-transparent h-8 w-8 my-0 mx-0.5 outline-none;
svg {
@apply w-auto h-4;
}
Expand DownExpand Up@@ -187,7 +178,7 @@
}

.bard-set.has-error > .replicator-set-header label {
@apply text-red;
@apply text-red-500;
}

/* The set selection options for each text block
Expand All@@ -202,6 +193,10 @@
}
}

.set-picker .popover .popover-content {
min-width: 320px !important;
}


/* Fullscreen mode
========================================================================== */
Expand All@@ -216,7 +211,7 @@
}

.bard-fixed-toolbar {
@apply shadow h-12 justify-center;
@apply shadow h-12;
padding: 7px 8px;
top: 0;
z-index: 999;
Expand All@@ -238,6 +233,10 @@
* > .ProseMirror {
min-height: auto;
}

&:focus {
@apply ring-0;
}
}

.bard-set-selector {
Expand DownExpand Up@@ -500,19 +499,20 @@
========================================================================== */

.bard-link-toolbar {
@apply bg-white rounded absolute leading-none shadow mt-2;
/* @apply bg-white rounded absolute leading-none shadow mt-2;
z-index: 100;
width: 300px;
top: 100%;
right: 0; */

&:before {
/* &:before {
content: '';
border: 6px solid transparent;
border-bottom-color: white;
position: absolute;
bottom: 100%;
left: 10px;
}
} */

.input {
@apply p-0 text-xs h-8 bg-transparent shadow-none border-none;
Expand Down
Loading