Skip to content

Commit 1c399bc

Browse files
bourgeoabourgeoa
committed
Merge remote-tracking branch 'origin/main' into uvdsl
2 parents 5481231 + 62f2c23 commit 1c399bc

50 files changed

Lines changed: 5166 additions & 2758 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎README.md‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
# solid-panes
2-
32
A set of core solid-compatible applets based on solid-ui
43

54
These are a set of interlinked applications, or parts of applications,
@@ -118,8 +117,11 @@ I want the menu to have a tiny button on the bottom margin left with an arrow to
118117

119118
* Raprot mini: instead of this code (index.ts of footer), I want to make use of a new footer web component with the readme: # solid-ui-footer component
120119

121-
* Raptor mini: The footer created shoudl actually be part of the left side menu only. Should be displayed inside it and should collaps and expand as the menu.
120+
* Raptor mini: The footer created should actually be part of the left side menu only. Should be displayed inside it and should collaps and expand as the menu.
122121

123122
* Raptor mini: the footer should completely dissapear when menu folded up.
124123

125124
* Raptor mini: Please always keep the footer at the bottom of the menu
125+
126+
* GPT-5.4 Model: Add a compatibility shim in the form pane for mixed `ui:Group` plus field typing.
127+

‎dev/dev-mash-utilities.css‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,29 @@
2323
border: 0;
2424
}
2525

26+
.loading-spinner {
27+
display: inline-block;
28+
width: 1.25rem;
29+
height: 1.25rem;
30+
border: 0.15rem solid color-mix(in srgb, var(--slate-300, #CBD5E1) 85%, transparent);
31+
border-top-color: var(--color-primary, #7C4DFF);
32+
border-radius: 50%;
33+
animation: loading-spinner-rotate 0.8s linear infinite;
34+
}
35+
36+
@keyframes loading-spinner-rotate {
37+
to {
38+
transform: rotate(360deg);
39+
}
40+
}
41+
42+
@media (prefers-reduced-motion: reduce) {
43+
.loading-spinner {
44+
animation: none;
45+
border-top-color: color-mix(in srgb, var(--color-primary, #7C4DFF) 70%, var(--slate-300, #CBD5E1));
46+
}
47+
}
48+
2649
/* Visually hidden but can become visible on focus */
2750
.visually-hidden {
2851
position: absolute !important;

‎dev/dev-mash.css‎

Lines changed: 0 additions & 128 deletions
Original file line numberDiff line numberDiff line change
@@ -682,10 +682,6 @@ div.exceptionPane pre {
682682
display: none;
683683
}
684684

685-
.active {
686-
/* display: visible; */
687-
}
688-
689685
.submitRow {
690686
clear: both;
691687
height: 5em;
@@ -704,119 +700,17 @@ div.exceptionPane pre {
704700
display: inline;
705701
}
706702

707-
/******************* CV Pane *****************/
708-
709-
.CVclass {
710-
background-color: var(--color-cv-pane-bg);
711-
}
712-
713-
/******************* Data Content Pane *****************/
714-
715-
div.dataContentPane {
716-
border-top: solid 1px var(--color-data-pane-border-top);
717-
border-left: solid 1px var(--color-data-pane-border-top);
718-
border-bottom: solid 1px var(--color-data-pane-border-side);
719-
border-right: solid 1px var(--color-data-pane-border-side);
720-
padding: 0.5em; /* color: #404; */
721-
margin-top: 0.5em;
722-
margin-bottom: 0.5em;
723-
}
724-
725-
.nestedFormula {
726-
border-top: solid 1px var(--color-data-pane-border-top);
727-
border-left: solid 1px var(--color-data-pane-border-top);
728-
border-bottom: solid 1px var(--color-data-pane-border-side);
729-
border-right: solid 1px var(--color-data-pane-border-side);
730-
padding: 0.5em;
731-
border-radius: 0.5em;
732-
}
733-
734-
div.dataContentPane td {
735-
padding-left: 0.2em;
736-
padding-top: 0.1em;
737-
padding-right: 0.2em;
738-
padding-bottom: 0.05em;
739-
/* vertical-align: middle; /*@@ Lalana's request*/
740-
vertical-align: top; /*@@ Tims's request*/
741-
/* With middel, you can't tell what is with what */
742-
/* background-color: white; */
743-
}
744-
745-
div.dataContentPane tr {
746-
margin-bottom: 0.6em;
747-
padding-top: 1em;
748-
padding-bottom: 1em;
749-
}
750-
751-
.dataContentPane a {
752-
color: var(--color-text-link);
753-
text-decoration: none;
754-
font-weight: bold;
755-
}
756-
.dataContentPane a:link {
757-
color: var(--color-text-link);
758-
text-decoration: none;
759-
font-weight: bold;
760-
}
761-
.dataContentPane a:visited {
762-
color: var(--color-text-link-visited);
763-
text-decoration: none;
764-
font-weight: bold;
765-
}
766-
.dataContentPane a:hover {
767-
color: var(--color-text-link-hover);
768-
text-decoration: underline;
769-
font-weight: bold;
770-
}
771-
.dataContentPane a:active {
772-
color: var(--color-text-link-active);
773-
text-decoration: none;
774-
}
775-
776-
.dataContentPane.embeddedText {
777-
white-space: pre-wrap;
778-
}
779-
780-
/* div.dataContentPane a { text-decoration: none; color: #006} /* Only very slightly blue */
781-
div.dataContentPane td.pred {
782-
min-width: 12em;
783-
} /* Keep aligned with others better */
784703
div.dataContentPane td.pred a {
785704
color: var(--color-text-muted);
786705
} /* Greyish as form field names have less info value */
787706

788707
/* .collectionAsTables {border-right: green 1px; margin: 0.2em;} */
789708

790-
div.n3Pane {
791-
padding: 1em;
792-
border-top: solid 1px var(--color-data-pane-border-top);
793-
border-left: solid 1px var(--color-data-pane-border-top);
794-
border-bottom: solid 1px var(--color-data-pane-border-side);
795-
border-right: solid 1px var(--color-data-pane-border-side);
796-
color: var(--color-text-blue);
797-
}
798-
799709
.imageView {
800710
border: 1em var(--color-background);
801711
margin: 1em;
802712
}
803713

804-
.n3Pane pre {
805-
font-size: 120%;
806-
}
807-
808-
.RDFXMLPane pre {
809-
font-size: 120%;
810-
}
811-
812-
div.RDFXMLPane {
813-
padding: 1em;
814-
border-top: solid 2px var(--color-data-pane-border-top);
815-
border-left: solid 2px var(--color-data-pane-border-top);
816-
border-bottom: solid 2px var(--color-data-pane-border-side);
817-
border-right: solid 2px var(--color-data-pane-border-side);
818-
color: var(--color-text-brown);
819-
}
820714

821715
/* Generic things useful anywhere */
822716

@@ -1685,28 +1579,6 @@ button:disabled, [role="button"][aria-disabled="true"] {
16851579
cursor: not-allowed;
16861580
pointer-events: none;
16871581
}
1688-
1689-
/* Loading indicator accessibility */
1690-
.loading-spinner {
1691-
width: 40px;
1692-
height: 40px;
1693-
border: 3px solid var(--color-border-pale);
1694-
border-top: 3px solid var(--color-primary);
1695-
border-radius: 50%;
1696-
animation: spin 1s linear infinite;
1697-
}
1698-
1699-
@keyframes spin {
1700-
0% { transform: rotate(0deg); }
1701-
100% { transform: rotate(360deg); }
1702-
}
1703-
1704-
@media (prefers-reduced-motion: reduce) {
1705-
.loading-spinner {
1706-
animation: none;
1707-
border-top-color: var(--color-primary);
1708-
}
1709-
}
17101582
/* copied from profile-pane */
17111583
@media (prefers-reduced-motion: reduce) {
17121584
*, *::before, *::after {

‎dev/loader.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,8 @@ function createIconElement (Pane: { icon: string }) {
128128
window.onload = async () => {
129129
console.log('document ready')
130130
// registerPanes((cjsOrEsModule: any) => paneRegistry.register(cjsOrEsModule.default || cjsOrEsModule))
131-
paneRegistry.register(require('contacts-pane'))
131+
const contactsPane = await import('contacts-pane')
132+
paneRegistry.register((contactsPane as any).default || contactsPane)
132133
await solidLogicSingleton.authn.checkUser()
133134
const session = authSession
134135
const isLoggedIn = session?.info?.isLoggedIn ?? session?.isActive ?? Boolean(session?.webId)

0 commit comments

Comments
 (0)