Docker/codex.docs
Docker/codex.docs
1
0
Fork 0
mirror of https://github.com/codex-team/codex.docs.git synced 2025-07-19 13:19:42 +02:00
Code Issues Releases Activity

Merge branch 'main' into feature/backend-search

Browse source
This commit is contained in:
Taly 2022-09-12 19:14:28 +03:00
commit ce4522d1cb
7 changed files with 12 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

2
package.json
View file

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

2
src/backend/app.ts
View file

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

4
src/backend/views/pages/blocks/image.twig
View file

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

10
src/frontend/styles/components/page.pcss
View file

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

9
src/frontend/styles/components/writing.pcss
View file

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

2
src/frontend/styles/layout.pcss
View file

@ -41,7 +41,7 @@
box-sizing: border-box; box-sizing: border-box;
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
padding: 20px var(--layout-padding-horizontal); padding: var(--layout-padding-vertical) var(--layout-padding-horizontal);
@media (--desktop) { @media (--desktop) {
max-width: min( max-width: min(

6
yarn.lock
View file

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