thepaperpilot/Advent-Incremental
1
0
Fork 0
mirror of https://github.com/thepaperpilot/Advent-Incremental.git synced 2024-11-22 00:21:34 +00:00
Code Issues Releases Activity Actions

Merge pull request #12 from adsaf123/main

Browse source 
Merge grid rows and retain soft edges
This commit is contained in:
Anthony Lawn 2022-12-10 12:42:33 -06:00 committed by thepaperpilot
parent 0826f39542
commit a327ec715d
3 changed files with 39 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
package-lock.json generated
View file

@ -6749,7 +6749,6 @@
"node_modules/vue-panzoom": { "node_modules/vue-panzoom": {
"version": "1.1.6", "version": "1.1.6",
"resolved": "git+ssh://git@github.com/thepaperpilot/vue-panzoom.git#fa3cc91f6842cdfbd1bfb433c75cac01f177fe2d", "resolved": "git+ssh://git@github.com/thepaperpilot/vue-panzoom.git#fa3cc91f6842cdfbd1bfb433c75cac01f177fe2d",
"integrity": "sha512-d4URo4PVl2jCFG1WNY+5lDQ8nloOVLf2gFLqE+TLNmF43+F/STgld0A58uf9aq2xbaupVJdZAp/prGtve9ESRQ==",
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"panzoom": "^9.4.1" "panzoom": "^9.4.1"
@ -11902,7 +11901,6 @@
}, },
"vue-panzoom": { "vue-panzoom": {
"version": "git+ssh://git@github.com/thepaperpilot/vue-panzoom.git#fa3cc91f6842cdfbd1bfb433c75cac01f177fe2d", "version": "git+ssh://git@github.com/thepaperpilot/vue-panzoom.git#fa3cc91f6842cdfbd1bfb433c75cac01f177fe2d",
"integrity": "sha512-d4URo4PVl2jCFG1WNY+5lDQ8nloOVLf2gFLqE+TLNmF43+F/STgld0A58uf9aq2xbaupVJdZAp/prGtve9ESRQ==",
"from": "vue-panzoom@https://github.com/thepaperpilot/vue-panzoom.git", "from": "vue-panzoom@https://github.com/thepaperpilot/vue-panzoom.git",
"requires": { "requires": {
"panzoom": "^9.4.1" "panzoom": "^9.4.1"

37
src/components/common/table.css
View file

@ -56,6 +56,43 @@
border-radius: var(--border-radius); border-radius: var(--border-radius);
} }
.row-grid.mergeAdjacent > .feature:not(.dontMerge),
.row-grid.mergeAdjacent > .tooltip-container > .feature:not(.dontMerge) {
margin-left: 0;
margin-right: 0;
margin-bottom: 0;
margin-top: 0;
border-radius: 0;
}
.row-grid.mergeAdjacent > .feature:not(.dontMerge):last-child,
.row-grid.mergeAdjacent > .tooltip-container:last-child > .feature:not(.dontMerge) {
border-radius: 0 0 0 0;
}
.row-grid.mergeAdjacent > .feature:not(.dontMerge):first-child,
.row-grid.mergeAdjacent > .tooltip-container:first-child > .feature:not(.dontMerge) {
border-radius: 0 0 0 0;
}
.table-grid > .row-grid.mergeAdjacent:last-child > .feature:not(.dontMerge):first-child {
border-radius: 0 0 0 var(--border-radius);
}
.table-grid > .row-grid.mergeAdjacent:first-child > .feature:not(.dontMerge):last-child {
border-radius: 0 var(--border-radius) 0 0;
}
.table-grid > .row-grid.mergeAdjacent:first-child > .feature:not(.dontMerge):first-child {
border-radius: var(--border-radius) 0 0 0;
}
.table-grid > .row-grid.mergeAdjacent:last-child > .feature:not(.dontMerge):last-child {
border-radius: 0 0 var(--border-radius) 0;
}
/* /*
TODO how to implement mergeAdjacent for grids? TODO how to implement mergeAdjacent for grids?
.row.mergeAdjacent + .row.mergeAdjacent > .feature:not(.dontMerge) { .row.mergeAdjacent + .row.mergeAdjacent > .feature:not(.dontMerge) {

4
src/features/grids/Grid.vue
View file

@ -4,9 +4,9 @@
:style="{ :style="{
visibility: unref(visibility) === Visibility.Hidden ? 'hidden' : undefined visibility: unref(visibility) === Visibility.Hidden ? 'hidden' : undefined
}" }"
class="table" class="table-grid"
> >
<div v-for="row in unref(rows)" class="row" :class="{ mergeAdjacent }" :key="row"> <div v-for="row in unref(rows)" class="row-grid" :class="{ mergeAdjacent }" :key="row">
<GridCell <GridCell
v-for="col in unref(cols)" v-for="col in unref(cols)"
:key="col" :key="col"