Updated default link styles

firecmsco · Dec 6, 2024 · 54e2eba · 54e2eba
1 parent 8dc078d
commit 54e2eba
Show file tree

Hide file tree

Showing 20 changed files with 126 additions and 95 deletions.
diff --git a/README.md b/README.md
@@ -154,5 +154,6 @@ https://firecms.co/docs/changelog
 
 ## License
 
-The Core of FireCMS is licensed under the MIT license. We also refer to it as FireCMS Community.
-Some packages, used in FireCMS Pro and Cloud, are licensed under the Business Source License 1.1 (BSL). Check the full [License here](https://github.com/firecmsco/firecms?tab=License-1-ov-file#readme).
+The core of FireCMS is licensed under the MIT license.
+Some packages, used in FireCMS Pro and Cloud, are licensed under the Business Source License 1.1 (BSL). 
+Check the full [License here](https://github.com/firecmsco/firecms?tab=License-1-ov-file#readme).
diff --git a/examples/example/src/index.css b/examples/example/src/index.css
@@ -15,5 +15,5 @@ body {
 }
 
 a {
-    @apply text-primary dark:text-primary hover:underline
+    @apply text-primary dark:text-primary
 }
diff --git a/examples/example_cloud/src/index.css b/examples/example_cloud/src/index.css
@@ -25,7 +25,7 @@ body {
 }
 
 a {
-    @apply text-primary dark:text-primary hover:underline
+    @apply text-primary dark:text-primary
 }
 
 :root {

diff --git a/examples/example_next/src/app/(website)/components/Footer.tsx b/examples/example_next/src/app/(website)/components/Footer.tsx
@@ -7,64 +7,65 @@ export function Footer() {
                     <h2 className="mb-6 text-sm font-semibold text-surface-900 uppercase dark:text-white">Company</h2>
                     <ul className="text-surface-500 dark:text-surface-400 font-medium">
                         <li className="mb-4">
-                            <a href="#" className=" hover:underline">About</a>
+                            <a href="#" className="text-inherit hover:underline">About</a>
                         </li>
                         <li className="mb-4">
-                            <a href="#" className="hover:underline">Careers</a>
+                            <a href="#" className="text-inherit hover:underline">Careers</a>
                         </li>
                         <li className="mb-4">
-                            <a href="#" className="hover:underline">Brand Center</a>
+                            <a href="#" className="text-inherit hover:underline">Brand Center</a>
                         </li>
                         <li className="mb-4">
-                            <a href="#" className="hover:underline">Blog</a>
+                            <a href="#" className="text-inherit hover:underline">Blog</a>
                         </li>
                     </ul>
                 </div>
                 <div>
-                    <h2 className="mb-6 text-sm font-semibold text-surface-900 uppercase dark:text-white">Help center</h2>
+                    <h2 className="mb-6 text-sm font-semibold text-surface-900 uppercase dark:text-white">Help
+                        center</h2>
                     <ul className="text-surface-500 dark:text-surface-400 font-medium">
                         <li className="mb-4">
-                            <a href="#" className="hover:underline">Discord Server</a>
+                            <a href="#" className="text-inherit hover:underline">Discord Server</a>
                         </li>
                         <li className="mb-4">
-                            <a href="#" className="hover:underline">Twitter</a>
+                            <a href="#" className="text-inherit hover:underline">Twitter</a>
                         </li>
                         <li className="mb-4">
-                            <a href="#" className="hover:underline">Facebook</a>
+                            <a href="#" className="text-inherit hover:underline">Facebook</a>
                         </li>
                         <li className="mb-4">
-                            <a href="#" className="hover:underline">Contact Us</a>
+                            <a href="#" className="text-inherit hover:underline">Contact Us</a>
                         </li>
                     </ul>
                 </div>
                 <div>
                     <h2 className="mb-6 text-sm font-semibold text-surface-900 uppercase dark:text-white">Legal</h2>
                     <ul className="text-surface-500 dark:text-surface-400 font-medium">
                         <li className="mb-4">
-                            <a href="#" className="hover:underline">Privacy Policy</a>
+                            <a href="#" className="text-inherit hover:underline">Privacy Policy</a>
                         </li>
                         <li className="mb-4">
-                            <a href="#" className="hover:underline">Licensing</a>
+                            <a href="#" className="text-inherit hover:underline">Licensing</a>
                         </li>
                         <li className="mb-4">
-                            <a href="#" className="hover:underline">Terms &amp; Conditions</a>
+                            <a href="#" className="text-inherit hover:underline">Terms &amp; Conditions</a>
                         </li>
                     </ul>
                 </div>
                 <div>
                     <h2 className="mb-6 text-sm font-semibold text-surface-900 uppercase dark:text-white">Download</h2>
                     <ul className="text-surface-500 dark:text-surface-400 font-medium">
                         <li className="mb-4">
-                            <a href="#" className="hover:underline">iOS</a>
+                            <a href="#" className="text-inherit hover:underline">iOS</a>
                         </li>
                         <li className="mb-4">
-                            <a href="#" className="hover:underline">Android</a>
+                            <a href="#" className="text-inherit hover:underline">Android</a>
                         </li>
                         <li className="mb-4">
-                            <a href="#" className="hover:underline">Windows</a>
+                            <a href="#" className="text-inherit hover:underline">Windows</a>
                         </li>
                         <li className="mb-4">
-                            <a href="#" className="hover:underline">MacOS</a>
+                            <a href="#" className="text-inherit hover:underline">MacOS</a>
                         </li>
                     </ul>
                 </div>

diff --git a/examples/example_next/src/app/cms/App.tsx b/examples/example_next/src/app/cms/App.tsx
@@ -179,6 +179,8 @@ export function App() {
         getConfigForPath: ({ path }) => {
             if (path === "products")
                 return true;
+            if (path === "books")
+                return true;
             return false;
         }
     });

diff --git a/examples/example_next/src/app/cms/collections/locales.tsx b/examples/example_next/src/app/cms/collections/locales.tsx
@@ -8,8 +8,8 @@ const locales = buildEnumValues({
 });
 
 export const localeCollection = buildCollection<Locale>({
-    id: "locale",
-    path: "locale",
+    id: "locales",
+    path: "locales",
     customId: locales,
     name: "Locales",
     singularName: "Locales",

diff --git a/examples/example_next/src/app/cms/components/CustomLoginView.tsx b/examples/example_next/src/app/cms/components/CustomLoginView.tsx
@@ -34,9 +34,10 @@ export function CustomLoginView(props: FirebaseLoginViewProps) {
                 <Typography className={"mb-4"} variant={"body2"}>
                     This is a demo application that showcases the capabilities of FireCMS.
                     Check the sample frontend application built with Next.js
-                    in <a href={"/"} target={"_blank"} rel={"noreferrer"}>this link <OpenInNewIcon
+                    in <a className={"inline"} href={"/products"} target={"_blank"} rel={"noreferrer"}>this link <OpenInNewIcon
+                    className={"inline align-text-top"}
                     size={"smallest"}
-                    className={"inline"}/></a>.
+                    /></a>.
                 </Typography>
 
                 {/*<Link*/}

diff --git a/examples/example_next/src/app/common/index.css b/examples/example_next/src/app/common/index.css
@@ -13,7 +13,7 @@ body {
 }
 
 a {
-    @apply text-primary dark:text-primary hover:underline
+    @apply text-primary dark:text-primary
 }
 
 @layer utilities {

diff --git a/examples/example_next/src/app/common/logo.svg b/examples/example_next/src/app/common/logo.svg
diff --git a/examples/example_pro/src/index.css b/examples/example_pro/src/index.css
@@ -14,7 +14,7 @@ body {
 }
 
 a {
-    @apply text-primary dark:text-primary hover:underline
+    @apply text-primary dark:text-primary
 }
 /*.typography-body1 {*/
 /*    @apply text-lg;*/

diff --git a/packages/cli/templates/template/src/index.css b/packages/cli/templates/template/src/index.css
@@ -15,5 +15,5 @@ body {
 }
 a {
 
-    @apply text-primary dark:text-primary hover:underline
+    @apply text-primary dark:text-primary
 }
diff --git a/packages/cli/templates/template_next_pro/src/app/(website)/components/Footer.tsx b/packages/cli/templates/template_next_pro/src/app/(website)/components/Footer.tsx
@@ -7,64 +7,65 @@ export function Footer() {
                     <h2 className="mb-6 text-sm font-semibold text-surface-900 uppercase dark:text-white">Company</h2>
                     <ul className="text-surface-500 dark:text-surface-400 font-medium">
                         <li className="mb-4">
-                            <a href="#" className=" hover:underline">About</a>
+                            <a href="#" className="text-inherit hover:underline">About</a>
                         </li>
                         <li className="mb-4">
-                            <a href="#" className="hover:underline">Careers</a>
+                            <a href="#" className="text-inherit hover:underline">Careers</a>
                         </li>
                         <li className="mb-4">
-                            <a href="#" className="hover:underline">Brand Center</a>
+                            <a href="#" className="text-inherit hover:underline">Brand Center</a>
                         </li>
                         <li className="mb-4">
-                            <a href="#" className="hover:underline">Blog</a>
+                            <a href="#" className="text-inherit hover:underline">Blog</a>
                         </li>
                     </ul>
                 </div>
                 <div>
-                    <h2 className="mb-6 text-sm font-semibold text-surface-900 uppercase dark:text-white">Help center</h2>
+                    <h2 className="mb-6 text-sm font-semibold text-surface-900 uppercase dark:text-white">Help
+                        center</h2>
                     <ul className="text-surface-500 dark:text-surface-400 font-medium">
                         <li className="mb-4">
-                            <a href="#" className="hover:underline">Discord Server</a>
+                            <a href="#" className="text-inherit hover:underline">Discord Server</a>
                         </li>
                         <li className="mb-4">
-                            <a href="#" className="hover:underline">Twitter</a>
+                            <a href="#" className="text-inherit hover:underline">Twitter</a>
                         </li>
                         <li className="mb-4">
-                            <a href="#" className="hover:underline">Facebook</a>
+                            <a href="#" className="text-inherit hover:underline">Facebook</a>
                         </li>
                         <li className="mb-4">
-                            <a href="#" className="hover:underline">Contact Us</a>
+                            <a href="#" className="text-inherit hover:underline">Contact Us</a>
                         </li>
                     </ul>
                 </div>
                 <div>
                     <h2 className="mb-6 text-sm font-semibold text-surface-900 uppercase dark:text-white">Legal</h2>
                     <ul className="text-surface-500 dark:text-surface-400 font-medium">
                         <li className="mb-4">
-                            <a href="#" className="hover:underline">Privacy Policy</a>
+                            <a href="#" className="text-inherit hover:underline">Privacy Policy</a>
                         </li>
                         <li className="mb-4">
-                            <a href="#" className="hover:underline">Licensing</a>
+                            <a href="#" className="text-inherit hover:underline">Licensing</a>
                         </li>
                         <li className="mb-4">
-                            <a href="#" className="hover:underline">Terms &amp; Conditions</a>
+                            <a href="#" className="text-inherit hover:underline">Terms &amp; Conditions</a>
                         </li>
                     </ul>
                 </div>
                 <div>
                     <h2 className="mb-6 text-sm font-semibold text-surface-900 uppercase dark:text-white">Download</h2>
                     <ul className="text-surface-500 dark:text-surface-400 font-medium">
                         <li className="mb-4">
-                            <a href="#" className="hover:underline">iOS</a>
+                            <a href="#" className="text-inherit hover:underline">iOS</a>
                         </li>
                         <li className="mb-4">
-                            <a href="#" className="hover:underline">Android</a>
+                            <a href="#" className="text-inherit hover:underline">Android</a>
                         </li>
                         <li className="mb-4">
-                            <a href="#" className="hover:underline">Windows</a>
+                            <a href="#" className="text-inherit hover:underline">Windows</a>
                         </li>
                         <li className="mb-4">
-                            <a href="#" className="hover:underline">MacOS</a>
+                            <a href="#" className="text-inherit hover:underline">MacOS</a>
                         </li>
                     </ul>
                 </div>

diff --git a/packages/cli/templates/template_next_pro/src/app/common/index.css b/packages/cli/templates/template_next_pro/src/app/common/index.css
@@ -82,5 +82,5 @@ body {
 }
 
 a {
-    @apply text-primary dark:text-primary hover:underline
+    @apply text-primary dark:text-primary
 }
diff --git a/packages/cli/templates/template_next_pro/src/app/common/logo.svg b/packages/cli/templates/template_next_pro/src/app/common/logo.svg
diff --git a/packages/cli/templates/template_pro/src/index.css b/packages/cli/templates/template_pro/src/index.css
@@ -15,5 +15,5 @@ body {
 }
 
 a {
-    @apply text-primary dark:text-primary hover:underline
+    @apply text-primary dark:text-primary
 }
diff --git a/packages/ui/src/components/Autocomplete.tsx b/packages/ui/src/components/Autocomplete.tsx
@@ -60,7 +60,7 @@ export function Autocomplete({
         <div ref={autocompleteRef}
              className={cls(
                  open ? paperMixin : "",
-                 "bg-surface-accent-50 dark:bg-surface-accent-900 py-2"
+                 "bg-surface-50 dark:bg-surface-900 py-2"
              )}>
             {children}
         </div>

diff --git a/packages/ui/src/icons/Icon.tsx b/packages/ui/src/icons/Icon.tsx
@@ -54,11 +54,11 @@ export const Icon = React.forwardRef<HTMLSpanElement, IconProps & { iconKey: str
             ref={ref} // Attach the ref to the span
             style={{
                 fontSize: `${sizeInPx}px`,
-                display: "block",
                 ...style
             }}
             className={
                 cls("material-icons",
+                    "block",
                     color ? colorClassesMapping[color] : "",
                     "select-none",
                     className)}

diff --git a/website/.yarn/install-state.gz b/website/.yarn/install-state.gz
-Original file line number
+Diff line change
@@ Expand Up / @@ -15,5 +15,5 @@ body { @@
     }
     a {
-        @apply text-primary dark:text-primary hover:underline
+        @apply text-primary dark:text-primary
     }