1 files changed, 29 insertions, 22 deletions
diff --git a/src/client/views/StyleProvider.tsx b/src/client/views/StyleProvider.tsx
index bebc9a341..b04b1ae65 100644
--- a/src/client/views/StyleProvider.tsx
+++ b/src/client/views/StyleProvider.tsx
@@ -206,33 +206,40 @@ export function DefaultStyleProvider(doc: Opt<Doc>, props: Opt<FieldViewProps &
             const rounding = StrCast(doc?.[fieldKey + 'borderRounding'], StrCast(doc?.layout_borderRounding, doc?._type_collection === CollectionViewType.Pile ? '50%' : ''));
             return (doc?.[StrCast(doc?.layout_fieldKey)] instanceof Doc || doc?.isTemplateDoc) ? StrCast(doc._layout_borderRounding,rounding) : rounding;
         }
+        case StyleProp.Border: {
+            const bcolor = StrCast(doc?.borderColor, StrCast(doc?.[fieldKey + 'borderColor'], StrCast(doc?.layout_borderColor)));
+            return bcolor + " " +
+                   StrCast(doc?.borderStyle, StrCast(doc?.[fieldKey + 'borderStyle'], StrCast(doc?.layout_borderStyle, "solid"))) + " " +
+                   (StrCast(doc?.borderWidth || doc?.[fieldKey + 'borderWidth'] || doc?.layout_borderWidth) ||
+                    (NumCast(doc?.borderWidth, NumCast(doc?.[fieldKey + 'borderWidth'], NumCast(doc?.layout_borderWidth, bcolor ?1:0)))+"px"))
+        }
         // Doc.IsComicStyle(doc) &&
         //         renderDepth &&
         //         !doc?.layout_isSvg && 
         //case StyleProp.
-        case StyleProp.BorderPath: {
-            const docWidth = Number(doc?._width);
-            const borderWidth = Number(StrCast(doc?.borderWidth));
-            //console.log(borderWidth);
-            const ratio = borderWidth / docWidth;
-            const borderRadius = Number(StrCast(layoutDoc?._layout_borderRounding).replace('px', ''));
-            const radiusRatio = borderRadius / docWidth;
-            const radius = radiusRatio * ((2 * borderWidth) + docWidth);
+        // case StyleProp.BorderPath: {
+        //     const docWidth = Number(doc?._width);
+        //     const borderWidth = Number(StrCast(doc?.borderWidth));
+        //     //console.log(borderWidth);
+        //     const ratio = borderWidth / docWidth;
+        //     const borderRadius = Number(StrCast(layoutDoc?._layout_borderRounding).replace('px', ''));
+        //     const radiusRatio = borderRadius / docWidth;
+        //     const radius = radiusRatio * ((2 * borderWidth) + docWidth);
 
-            const borderPath = doc && border(doc, NumCast(doc._width), NumCast(doc._height), radius, -ratio/2);
-                return !borderPath
-                    ? null
-                    : {
-                        clipPath: `path('${borderPath}')`,
-                        jsx: (
-                            <div key="border2" className="documentView-customBorder" style={{ pointerEvents: 'none' }}>
-                                <svg style={{ overflow: 'visible', height: '100%' }} viewBox={`0 0 ${PanelWidth?.()} ${PanelHeight?.()}`}>
-                                    <path d={borderPath} style={{ stroke: StrCast(doc?.borderColor), fill: 'transparent', strokeWidth: `${StrCast(doc?.borderWidth)}px` }} />
-                                </svg>
-                            </div>
-                        ),
-                    };
-        }
+        //     const borderPath = doc && border(doc, NumCast(doc._width), NumCast(doc._height), radius, -ratio/2);
+        //         return !borderPath
+        //             ? null
+        //             : {
+        //                 clipPath: `path('${borderPath}')`,
+        //                 jsx: (
+        //                     <div key="border2" className="documentView-customBorder" style={{ pointerEvents: 'none' }}>
+        //                         <svg style={{ overflow: 'visible', height: '100%' }} viewBox={`0 0 ${PanelWidth?.()} ${PanelHeight?.()}`}>
+        //                             <path d={borderPath} style={{ stroke: StrCast(doc?.borderColor), fill: 'transparent', strokeWidth: `${StrCast(doc?.borderWidth)}px` }} />
+        //                         </svg>
+        //                     </div>
+        //                 ),
+        //             };
+        // }
         case StyleProp.HeaderMargin:
             return ([CollectionViewType.Stacking, CollectionViewType.NoteTaking, CollectionViewType.Masonry, CollectionViewType.Tree].includes(doc?._type_collection as CollectionViewType) ||
                 (doc?.type === DocumentType.RTF && !layoutShowTitle()?.includes('noMargin')) ||