Merge branch 'main' into next

Author: KaneFreeman

lerna.json

@@ -1,4 +1,4 @@
 {
   "$schema": "node_modules/lerna/schemas/lerna-schema.json",
-  "version": "4.0.1"
+  "version": "4.1.0"
 }

packages/app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@staticcms/app",
-  "version": "4.0.1",
+  "version": "4.1.0",
   "license": "MIT",
   "description": "Static CMS application.",
   "repository": "https://github.com/StaticJsCMS/static-cms",
@@ -39,7 +39,7 @@
   "dependencies": {
     "@babel/eslint-parser": "7.23.3",
     "@babel/runtime": "7.23.7",
-    "@staticcms/core": "^4.0.1",
+    "@staticcms/core": "^4.1.0",
     "buffer": "6.0.3",
     "react": "18.2.0",
     "react-dom": "18.2.0",

packages/core/dev-test/config.yml

@@ -1,5 +1,6 @@
 backend:
   name: test-repo
+logo_link: '/#/page/custom-page'
 site_url: 'https://example.com'
 media_folder: /assets/uploads
 media_library:

packages/core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@staticcms/core",
-  "version": "4.0.1",
+  "version": "4.1.0",
   "license": "MIT",
   "description": "Static CMS core application.",
   "repository": "https://github.com/StaticJsCMS/static-cms",

packages/core/src/components/common/field/Hint.css

@@ -4,7 +4,7 @@
 
   &:not(.CMS_Hint_inline) {
     @apply px-3
-      pt-1;
+      py-1;
   }
 }
 

packages/core/src/components/navbar/Navbar.tsx

@@ -76,10 +76,23 @@ const Navbar: FC<NavbarProps> = ({
           <div className={classes.breadcrumbs}>
             <div className={classes['logo-wrapper']}>
               {config?.logo_url ? (
-                <div
-                  className={classNames(classes.logo, classes['custom-logo'])}
-                  style={{ backgroundImage: `url('${config.logo_url}')` }}
-                />
+                config.logo_link ? (
+                  <a href={config.logo_link}>
+                    <div
+                      className={classNames(classes.logo, classes['custom-logo'])}
+                      style={{ backgroundImage: `url('${config.logo_url}')` }}
+                    />
+                  </a>
+                ) : (
+                  <div
+                    className={classNames(classes.logo, classes['custom-logo'])}
+                    style={{ backgroundImage: `url('${config.logo_url}')` }}
+                  />
+                )
+              ) : config?.logo_link ? (
+                <a href={config.logo_link}>
+                  <StaticCmsIcon className={classes.logo} />
+                </a>
               ) : (
                 <StaticCmsIcon className={classes.logo} />
               )}

packages/core/src/constants/configSchema.tsx

@@ -488,6 +488,7 @@ function getConfigSchema() {
       display_url: { type: 'string', examples: ['https://example.com'] },
       base_url: { type: 'string' },
       logo_url: { type: 'string', examples: ['https://example.com/images/logo.svg'] },
+      logo_link: { type: 'string', examples: ['https://example.com'] },
       media_folder: { type: 'string', examples: ['assets/uploads'] },
       public_folder: { type: 'string', examples: ['/uploads'] },
       media_folder_relative: { type: 'boolean' },

packages/core/src/interface.ts

@@ -1047,6 +1047,7 @@ export interface Config<EF extends BaseField = UnknownField> {
   display_url?: string;
   base_url?: string;
   logo_url?: string;
+  logo_link?: string;
   media_folder?: string;
   public_folder?: string;
   media_folder_relative?: boolean;

packages/core/src/locales/cs/index.ts

@@ -54,7 +54,7 @@
   }
 
   &.CMS_WidgetObject_open {
-    & .CMS_WidgetObject_expand-icon {
+    & > .CMS_WidgetObject_expand .CMS_WidgetObject_expand-icon {
       @apply rotate-90
         transform;
     }
@@ -65,6 +65,7 @@
   @apply flex
     w-full
     justify-between
+    items-center
     pl-2
     pr-3
     py-2

packages/core/src/widgets/object/ObjectControl.css

@@ -3,11 +3,14 @@
 
 .CMS_WidgetRelation_values {
   @apply flex
-    flex-wrap
     gap-2
-    p-2
     pr-0
     min-w-0;
+
+  .CMS_Field_wrapper & {
+    @apply flex-wrap
+      p-2;
+  }
 }
 
 .CMS_WidgetRelation_loading {

packages/core/src/widgets/relation/RelationControl.css

@@ -203,16 +203,19 @@ display_url: 'https://your-site.com',
 ## Custom Logo
 
 When the `logo_url` setting is specified, the Static CMS UI will change the logo displayed at the top of the login page, allowing you to brand Static CMS with your own logo. `logo_url` is assumed to be a URL to an image file.
+When the `logo_link` setting is specified, the Static CMS UI will wrap the logo in a link, allowing you to make the logo clickable. `logo_link` can be a URL to an external page or an address of one of Static CMS pages giving you a quick link to your favourite page.
 
 **Example:**
 
 <CodeTabs>
 ```yaml
 logo_url: https://your-site.com/images/logo.svg
+logo_link: https://your-site.com
 ```
 
 ```js
 logo_url: 'https://your-site.com/images/logo.svg',
+logo_link: 'https://your-site.com',
 ```
 
 </CodeTabs>

packages/docs/content/docs/configuration-options.mdx

@@ -1,9 +1,15 @@
 {
   "releases": [
+    {
+      "date": "2024-01-24T10:00:00.000Z",
+      "version": "v4.1.0",
+      "type": "minor",
+      "description": "Add logo_link setting"
+    },
     {
       "date": "2024-01-04T10:00:00.000Z",
       "version": "v4.0.1",
-      "type": "minor"
+      "type": "patch"
     },
     {
       "date": "2024-01-03T11:00:00.000Z",