Merge branch 'v.0.42' of https://github.com/GetPublii/Publii into v.0.42

levivoelz · Mar 21, 2023 · a7faa2e · a7faa2e
2 parents 8900961 + 35a7a7b
commit a7faa2e
Show file tree

Hide file tree

Showing 7 changed files with 29 additions and 18 deletions.
diff --git a/app/default-files/default-themes/simple/config.json b/app/default-files/default-themes/simple/config.json
@@ -2042,6 +2042,7 @@
         {
             "name": "displayPostList",
             "label": "Display post list",
+            "note": "Disabling the post list can cause duplicate content issues. To avoid this, please disable authors pagination in the SEO section of your site settings.",
             "value": 1,
             "type": "select",
             "options": [
@@ -2108,6 +2109,7 @@
         {
             "name": "displayPostList",
             "label": "Display post list",
+            "note": "Disabling the post list can cause duplicate content issues. To avoid this, please disable tag pagination in the SEO section of your site settings.",
             "value": 1,
             "type": "select",
             "options": [

diff --git a/app/default-files/default-themes/simple/partials/head.hbs b/app/default-files/default-themes/simple/partials/head.hbs
@@ -85,7 +85,14 @@
                </style>	
             {{/is}}	
           {{/checkIf}}
-        {{/checkIf}} 		
+        {{/checkIf}} 	
+        <noscript>
+            <style>
+                img[loading] {
+                    opacity: 1;
+                }
+            </style>
+        </noscript>	
         {{{@headCustomCode}}}
     </head>
     <body>

diff --git a/app/src/components/AuthorForm.vue b/app/src/components/AuthorForm.vue
@@ -781,7 +781,6 @@ export default {
 }
 
 .note {
-    margin-top: 2rem;
     position: relative;
     z-index: 1;
 }

diff --git a/app/src/components/MenuPositionPopup.vue b/app/src/components/MenuPositionPopup.vue
@@ -284,6 +284,10 @@ export default {
     position: relative;
     text-align: center;
     top: 1px;
+
+    .button.button-disabled {
+       border-top: 1px solid var(--input-border-color);
+    }
 }
 
 .menu-position-items {

diff --git a/app/src/components/TagForm.vue b/app/src/components/TagForm.vue
@@ -716,7 +716,6 @@ export default {
 }
 
 .note {
-    margin-top: 2rem;
     position: relative;
     z-index: 1;
 }

diff --git a/app/src/components/post-editor/Sidebar.vue b/app/src/components/post-editor/Sidebar.vue
@@ -909,21 +909,6 @@ export default {
             }
         }
 
-        .note {
-            clear: both;
-            color: var(--text-light-color);
-            display: block;
-            font-style: italic;
-            font-weight: var(--font-weight-normal);
-            line-height: 1.4;
-            padding-top: .5rem;
-
-            &.is-warning {
-                color: var(--warning);
-                opacity: 1;
-            }
-        }
-
         .switcher-item-icon-helper {
             margin: 0 .5rem;
             position: relative;

diff --git a/app/src/scss/options-sidebar.scss b/app/src/scss/options-sidebar.scss
@@ -254,4 +254,19 @@
     .msg {
         font-size: 1.3rem;
     }
+
+    .note {
+        clear: both;
+        color: var(--text-light-color);
+        display: block;
+        font-style: italic;
+        font-weight: var(--font-weight-normal);
+        line-height: 1.4;
+        padding-top: .5rem;
+
+        &.is-warning {
+            color: var(--warning);
+            opacity: 1;
+        }
+    }
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -781,7 +781,6 @@ export default { @@
     }
     .note {
-        margin-top: 2rem;
         position: relative;
         z-index: 1;
     }
@@ Expand Down @@