Merge branch 'main' into feature/backend-search

package.json

@@ -20,7 +20,7 @@
   "dependencies": {
     "@codexteam/shortcuts": "^1.2.0",
     "@hawk.so/javascript": "^3.0.1",
-    "@hawk.so/nodejs": "^3.1.2",
+    "@hawk.so/nodejs": "^3.1.4",
     "config": "^3.3.6",
     "cookie-parser": "^1.4.5",
     "csurf": "^1.11.0",

src/backend/app.ts

@@ -8,7 +8,7 @@ import routes from './routes/index.js';
 import HttpException from './exceptions/httpException.js';
 import * as dotenv from 'dotenv';
 import config from 'config';
-import { default as HawkCatcher } from '@hawk.so/nodejs';
+import HawkCatcher from '@hawk.so/nodejs';
 import os from 'os';
 import appConfig from 'config';
 import { downloadFavicon, FaviconData } from './utils/downloadFavicon.js';

src/backend/views/pages/blocks/image.twig

@@ -4,10 +4,6 @@
   {% set classes = classes|merge(['block-image__content--bordered']) %}
 {% endif %}
 
-{% if stretched %}
-  {% set classes = classes|merge(['block-image__content--stretched']) %}
-{% endif %}
-
 {% if withBackground %}
   {% set classes = classes|merge(['block-image__content--with-background']) %}
 {% endif %}

src/frontend/styles/components/page.pcss

@@ -278,16 +278,6 @@
      max-width: 100%;
    }
 
-   &--stretched {
-     max-width: none !important;
-     width: calc(100% + 120px) !important;
-     margin-left: -60px;
-
-     img, video {
-       width: 100%;
-     }
-   }
-
    &--bordered {
      img, video {
        border: 3px solid var(--color-line-gray);

src/frontend/styles/components/writing.pcss

@@ -1,6 +1,6 @@
 .writing-header {
-  padding: 15px 0;
-  margin-top: calc(-1 * var(--layout-padding-vertical));
+  padding: 0 0 15px 0;
+  margin-top: 0;
   background: #fff;
   box-shadow: 0 3px 10px #fff;
   z-index: 2;
@@ -104,9 +104,10 @@
   @apply --text-content-title;
 }
 
-
 .ce-block {
   @apply --content-block;
 }
 
-
+.cdx-settings-button[data-tune="stretched"] {
+  display: none;
+}

src/frontend/styles/layout.pcss

@@ -1,6 +1,6 @@
 :root {
   /**
-   * Allows to dynamically set main column minimun margin left. 
+   * Allows to dynamically set main column minimun margin left.
    * Is used for adding extra space for editor controls in page edit mode (otherwise controls overlap sidebar)
    */
   --main-col-min-margin-left: 0px;
@@ -41,7 +41,7 @@
     box-sizing: border-box;
     display: flex;
     justify-content: space-between;
-    padding: 20px var(--layout-padding-horizontal);
+    padding: var(--layout-padding-vertical) var(--layout-padding-horizontal);
 
     @media (--desktop) {
       max-width: min(

yarn.lock

@@ -922,9 +922,9 @@
     "@hawk.so/types" "^0.1.13"
     error-stack-parser "^2.0.6"
 
-"@hawk.so/nodejs@^3.1.2":
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/@hawk.so/nodejs/-/nodejs-3.1.2.tgz#b06229f0c8a0d8676412329511f9f2b01e492211"
+"@hawk.so/nodejs@^3.1.4":
+  version "3.1.4"
+  resolved "https://registry.yarnpkg.com/@hawk.so/nodejs/-/nodejs-3.1.4.tgz#62eb4ff1272559f0841a53d7931f6939b4c056fe"
   dependencies:
     "@hawk.so/types" "^0.1.15"
     axios "^0.21.1"