From 19aa1f415e157ed97f38a3bb1dff831cb5886cc2 Mon Sep 17 00:00:00 2001 From: Roman Timashev Date: Thu, 20 Feb 2020 17:30:02 +0300 Subject: [PATCH 01/10] nextjs versiton updated to 6.2.2 stable --- package-lock.json | 215 +++++++++++++++++++++++++++++++--------------- package.json | 2 +- 2 files changed, 145 insertions(+), 72 deletions(-) diff --git a/package-lock.json b/package-lock.json index 18a87c4f..b584c90c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5,38 +5,62 @@ "requires": true, "dependencies": { "@ampproject/toolbox-core": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/@ampproject/toolbox-core/-/toolbox-core-1.1.1.tgz", - "integrity": "sha512-jcuVJUnGDRUEJgMYO6QVdf1dBy/oLZX3NjN2hYG48biFcPCvXevuv4xYFZMJsnsHSvXKg8y0qB8rANNyhTUN/A==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@ampproject/toolbox-core/-/toolbox-core-2.0.0.tgz", + "integrity": "sha512-xAJOmh6MPS2mdHNsK8mj1t8TLh6mlehirh0fOBsRhKCNCJXgg4Gfd2u5igy8VFq9sYnuWP/npFyjGX36qpXW5Q==", "requires": { - "node-fetch": "2.6.0" + "cross-fetch": "3.0.4" } }, "@ampproject/toolbox-optimizer": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/@ampproject/toolbox-optimizer/-/toolbox-optimizer-1.1.1.tgz", - "integrity": "sha512-LTtTM5FSOrWuTJ6mOwPfZmpUDI6polrNz3tX2EmDmDkjDK+43vSpq1OHtukivIFHafdixJuoeki5dF3PC/ZoWw==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@ampproject/toolbox-optimizer/-/toolbox-optimizer-2.0.0.tgz", + "integrity": "sha512-ZYRi7vB4ALC8DnTHQLchAeHMGsFml/Zr4fNWBlTiMGfvWGL0XTV9YyP4s24IDwAlunEgynmz0FTrGMJdRpNf2Q==", "requires": { - "@ampproject/toolbox-core": "^1.1.1", - "@ampproject/toolbox-runtime-version": "^1.1.1", - "@ampproject/toolbox-script-csp": "^1.1.1", + "@ampproject/toolbox-core": "^2.0.0", + "@ampproject/toolbox-runtime-version": "^2.0.0", + "@ampproject/toolbox-script-csp": "^2.0.0", + "@ampproject/toolbox-validator-rules": "^2.0.0", "css": "2.2.4", - "parse5": "5.1.0", - "parse5-htmlparser2-tree-adapter": "5.1.0" + "domhandler": "3.0.0", + "domutils": "2.0.0", + "htmlparser2": "4.0.0", + "normalize-html-whitespace": "1.0.0", + "terser": "4.6.3" + }, + "dependencies": { + "terser": { + "version": "4.6.3", + "resolved": "https://registry.npmjs.org/terser/-/terser-4.6.3.tgz", + "integrity": "sha512-Lw+ieAXmY69d09IIc/yqeBqXpEQIpDGZqT34ui1QWXIUpR2RjbqEkT8X7Lgex19hslSqcWM5iMN2kM11eMsESQ==", + "requires": { + "commander": "^2.20.0", + "source-map": "~0.6.1", + "source-map-support": "~0.5.12" + } + } } }, "@ampproject/toolbox-runtime-version": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/@ampproject/toolbox-runtime-version/-/toolbox-runtime-version-1.1.1.tgz", - "integrity": "sha512-ibmw5p+0Sz+wingbX/Dyboe8a0+XDkMfFGSM7KFE0h2z3Op9MADup8ZPLeHT54Z7cYKmB6ob60FVHtQQDhEXNw==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@ampproject/toolbox-runtime-version/-/toolbox-runtime-version-2.0.0.tgz", + "integrity": "sha512-7XDlo7l4Ozpc/XWmJeYNF0ZfXCy7Vdh07spN+xEOst8gF99yaavZRNVkdgyTxLR3BpY9RIqqhSs6OxfkOKlRZQ==", "requires": { - "@ampproject/toolbox-core": "^1.1.1" + "@ampproject/toolbox-core": "^2.0.0" } }, "@ampproject/toolbox-script-csp": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/@ampproject/toolbox-script-csp/-/toolbox-script-csp-1.1.1.tgz", - "integrity": "sha512-gACGfsVKinCy/977FSrlVgo6jxTZ0lcTCvCnRlNwvSOcxJVm+jJR3sP7/F43fpak9Gsq/EwFaatfnNMbunPc+w==" + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@ampproject/toolbox-script-csp/-/toolbox-script-csp-2.0.0.tgz", + "integrity": "sha512-9mW3yiKwjORi0ViuayphVZii9MwiPhneZGZWy+kN44xr3SpN7iQC52/WWWTBOZX9z1zaUh8DqGc//VFY5ILSAw==" + }, + "@ampproject/toolbox-validator-rules": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@ampproject/toolbox-validator-rules/-/toolbox-validator-rules-2.0.0.tgz", + "integrity": "sha512-5f2IvT1m/zNtqfNXFE9V4ZtKofIttST65QL1wf4lKjBhJsbZgAAeR/u4DgOvftRVRmgn6IpUiWY1pt9xWaI5yA==", + "requires": { + "cross-fetch": "3.0.4" + } }, "@babel/code-frame": { "version": "7.8.3", @@ -1059,9 +1083,9 @@ "integrity": "sha512-5a6wqoJV/xEdbRNKVo6I4hO3VjyDq//8q2f9I6PBAvMesJHFauXDorcNCsr9RzvsZnaWi5NYCcfyqP1QeFHFbw==" }, "@next/polyfill-nomodule": { - "version": "9.2.2-canary.20", - "resolved": "https://registry.npmjs.org/@next/polyfill-nomodule/-/polyfill-nomodule-9.2.2-canary.20.tgz", - "integrity": "sha512-MMCBHusKmLhng/+H/fQdn6ciiXDDvb4BGaTZNXBTnuw0tN/uASVZFvqwfG7YSQAcxW7dswLh9bppQpNjtXYzaQ==" + "version": "9.2.2", + "resolved": "https://registry.npmjs.org/@next/polyfill-nomodule/-/polyfill-nomodule-9.2.2.tgz", + "integrity": "sha512-J51QpynN0AxQ0saWkxgpr0JxWqSJFCBOOeQpbyn5hlgxjrcXR9dQ59tN677vbq2wJ8idLn898vZFaRmQsLq13A==" }, "@types/classnames": { "version": "2.2.9", @@ -1394,6 +1418,16 @@ "colors": "1.1.2", "commander": "2.9.0", "promise": "7.1.1" + }, + "dependencies": { + "commander": { + "version": "2.9.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz", + "integrity": "sha1-nJkJQXbhIkDLItbFFGCYQA/g99Q=", + "requires": { + "graceful-readlink": ">= 1.0.0" + } + } } }, "ansi-colors": { @@ -1669,9 +1703,9 @@ } }, "postcss-value-parser": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.0.2.tgz", - "integrity": "sha512-LmeoohTpp/K4UiyQCwuGWlONxXamGzCMtFxLq4W1nZVGIQLYvMCJx3yAF9qyyuFpflABI9yVdtJAqbihOsCsJQ==" + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.0.3.tgz", + "integrity": "sha512-N7h4pG+Nnu5BEIzyeaaIYWs0LI5XC40OrRh5L60z0QjFsqGWcHcbkBvpe1WYpcIS9yQ8sOi/vIPt1ejQCrMVrg==" }, "supports-color": { "version": "5.5.0", @@ -2340,9 +2374,9 @@ } }, "caniuse-lite": { - "version": "1.0.30001027", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001027.tgz", - "integrity": "sha512-7xvKeErvXZFtUItTHgNtLgS9RJpVnwBlWX8jSo/BO8VsF6deszemZSkJJJA1KOKrXuzZH4WALpAJdq5EyfgMLg==" + "version": "1.0.30001028", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001028.tgz", + "integrity": "sha512-Vnrq+XMSHpT7E+LWoIYhs3Sne8h9lx9YJV3acH3THNCwU/9zV93/ta4xVfzTtnqd3rvnuVpVjE3DFqf56tr3aQ==" }, "caseless": { "version": "0.12.0", @@ -2538,12 +2572,9 @@ } }, "commander": { - "version": "2.9.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz", - "integrity": "sha1-nJkJQXbhIkDLItbFFGCYQA/g99Q=", - "requires": { - "graceful-readlink": ">= 1.0.0" - } + "version": "2.20.3", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", + "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==" }, "commondir": { "version": "1.0.1", @@ -2784,6 +2815,15 @@ "sha.js": "^2.4.8" } }, + "cross-fetch": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-3.0.4.tgz", + "integrity": "sha512-MSHgpjQqgbT/94D4CyADeNoYh52zMkCX4pcJvPP5WqPsLFMKjr2TCMg381ox5qI0ii2dPwaLx/00477knXqXVw==", + "requires": { + "node-fetch": "2.6.0", + "whatwg-fetch": "3.0.0" + } + }, "cross-spawn": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-3.0.1.tgz", @@ -3227,11 +3267,43 @@ "esutils": "^2.0.2" } }, + "dom-serializer": { + "version": "0.2.2", + "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.2.2.tgz", + "integrity": "sha512-2/xPb3ORsQ42nHYiSunXkDjPLBaEj/xTwUO4B7XCZQTRk7EBtTOPaygh10YAAh2OI1Qrp6NWfpAhzswj0ydt9g==", + "requires": { + "domelementtype": "^2.0.1", + "entities": "^2.0.0" + } + }, "domain-browser": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-1.2.0.tgz", "integrity": "sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA==" }, + "domelementtype": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.0.1.tgz", + "integrity": "sha512-5HOHUDsYZWV8FGWN0Njbr/Rn7f/eWSQi1v7+HsUVwXgn8nWWlL64zKDkS0n8ZmQ3mlWOMuXOnR+7Nx/5tMO5AQ==" + }, + "domhandler": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-3.0.0.tgz", + "integrity": "sha512-eKLdI5v9m67kbXQbJSNn1zjh0SDzvzWVWtX+qEI3eMjZw8daH9k8rlj1FZY9memPwjiskQFbe7vHVVJIAqoEhw==", + "requires": { + "domelementtype": "^2.0.1" + } + }, + "domutils": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/domutils/-/domutils-2.0.0.tgz", + "integrity": "sha512-n5SelJ1axbO636c2yUtOGia/IcJtVtlhQbFiVDBZHKV5ReJO1ViX7sFEemtuyoAnBxk5meNSYgA8V4s0271efg==", + "requires": { + "dom-serializer": "^0.2.1", + "domelementtype": "^2.0.1", + "domhandler": "^3.0.0" + } + }, "dot-prop": { "version": "5.2.0", "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-5.2.0.tgz", @@ -3280,9 +3352,9 @@ "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=" }, "electron-to-chromium": { - "version": "1.3.351", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.351.tgz", - "integrity": "sha512-L8zhV8k7Znp2q3wWXYDzCyfTBeGauEX0rX/FtgmnDgmvHRqwu9NVN614wOkXx9sDZmJZpNMBaEFMXTu/vbr+Kg==" + "version": "1.3.355", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.355.tgz", + "integrity": "sha512-zKO/wS+2ChI/jz9WAo647xSW8t2RmgRLFdbUb/77cORkUTargO+SCj4ctTHjBn2VeNFrsLgDT7IuDVrd3F8mLQ==" }, "elliptic": { "version": "6.5.2", @@ -3343,6 +3415,11 @@ } } }, + "entities": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/entities/-/entities-2.0.0.tgz", + "integrity": "sha512-D9f7V0JSRwIxlRI2mjMqufDrRDnx8p+eEOz7aUM9SuvF8gsBzra0/6tbjl1m8eQHrZlYj6PxqE00hZ1SAIKPLw==" + }, "env-paths": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-2.2.0.tgz", @@ -4574,6 +4651,17 @@ "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-1.2.1.tgz", "integrity": "sha1-DfKTUfByEWNRXfueVUPl9u7VFi8=" }, + "htmlparser2": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-4.0.0.tgz", + "integrity": "sha512-cChwXn5Vam57fyXajDtPXL1wTYc8JtLbr2TN76FYu05itVVVealxLowe2B3IEznJG4p9HAYn/0tJaRlGuEglFQ==", + "requires": { + "domelementtype": "^2.0.1", + "domhandler": "^3.0.0", + "domutils": "^2.0.0", + "entities": "^2.0.0" + } + }, "http-errors": { "version": "1.7.2", "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.7.2.tgz", @@ -6326,11 +6414,11 @@ "integrity": "sha512-iyam8fBuCUpWeKPGpaNMetEocMt364qkCsfL9JuhjXX6dRnguRVOfk2GZaDpPjcOKiiXCPINZC1GczQ7iTq3Zw==" }, "next": { - "version": "9.2.2-canary.20", - "resolved": "https://registry.npmjs.org/next/-/next-9.2.2-canary.20.tgz", - "integrity": "sha512-PWyAlyjpIewTNZ1lhvmiPRcIrSvTP4FOYpBgHOvNvEnfb+aNQI5azRlxYVNGquWAh7mDvFdvoyypFK7HLaWgtQ==", + "version": "9.2.2", + "resolved": "https://registry.npmjs.org/next/-/next-9.2.2.tgz", + "integrity": "sha512-7ribVzmj5wvOvp7kTynujukftHqgpGcxOPfUA8lYEWyTJHjsl/JVHE+eay4Qe74VEuCfDRQE8679fe0SKtsNXw==", "requires": { - "@ampproject/toolbox-optimizer": "1.1.1", + "@ampproject/toolbox-optimizer": "2.0.0", "@babel/core": "7.7.2", "@babel/plugin-proposal-class-properties": "7.7.0", "@babel/plugin-proposal-nullish-coalescing-operator": "7.7.4", @@ -6346,7 +6434,7 @@ "@babel/preset-typescript": "7.7.2", "@babel/runtime": "7.7.2", "@babel/runtime-corejs2": "7.7.2", - "@next/polyfill-nomodule": "9.2.2-canary.20", + "@next/polyfill-nomodule": "9.2.2", "amphtml-validator": "1.0.23", "async-retry": "1.2.3", "async-sema": "3.0.0", @@ -6635,9 +6723,9 @@ } }, "postcss-value-parser": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.0.2.tgz", - "integrity": "sha512-LmeoohTpp/K4UiyQCwuGWlONxXamGzCMtFxLq4W1nZVGIQLYvMCJx3yAF9qyyuFpflABI9yVdtJAqbihOsCsJQ==" + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.0.3.tgz", + "integrity": "sha512-N7h4pG+Nnu5BEIzyeaaIYWs0LI5XC40OrRh5L60z0QjFsqGWcHcbkBvpe1WYpcIS9yQ8sOi/vIPt1ejQCrMVrg==" }, "react-is": { "version": "16.8.6", @@ -6931,6 +7019,11 @@ "abbrev": "1" } }, + "normalize-html-whitespace": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/normalize-html-whitespace/-/normalize-html-whitespace-1.0.0.tgz", + "integrity": "sha512-9ui7CGtOOlehQu0t/OhhlmDyc71mKVlv+4vF+me4iZLPrNtRL2xoquEdfZxasC/bdQi/Hr3iTrpyRKIG+ocabA==" + }, "normalize-package-data": { "version": "2.4.0", "resolved": "http://storage.mds.yandex.net/get-npm/69187/normalize-package-data-2.4.0.tgz", @@ -7556,19 +7649,6 @@ "error-ex": "^1.2.0" } }, - "parse5": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/parse5/-/parse5-5.1.0.tgz", - "integrity": "sha512-fxNG2sQjHvlVAYmzBZS9YlDp6PTSSDwa98vkD4QgVDDCAo84z5X1t5XyJQ62ImdLXx5NdIIfihey6xpum9/gRQ==" - }, - "parse5-htmlparser2-tree-adapter": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/parse5-htmlparser2-tree-adapter/-/parse5-htmlparser2-tree-adapter-5.1.0.tgz", - "integrity": "sha512-OrI4DNmghGcwDB3XN8FKKN7g5vBmau91uqj+VYuwuj/r6GhFBMBNymsM+Z9z+Z1p4HHgI0UuQirQRgh3W5d88g==", - "requires": { - "parse5": "^5.1.0" - } - }, "pascalcase": { "version": "0.1.1", "resolved": "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz", @@ -7756,9 +7836,9 @@ "integrity": "sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=" }, "postcss": { - "version": "7.0.26", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.26.tgz", - "integrity": "sha512-IY4oRjpXWYshuTDFxMVkJDtWIk2LhsTlu8bZnbEJA4+bYT16Lvpo8Qv6EvDumhYRgzjZl489pmsY3qVgJQ08nA==", + "version": "7.0.27", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.27.tgz", + "integrity": "sha512-WuQETPMcW9Uf1/22HWUWP9lgsIC+KEHg2kozMflKjbeUtw9ujvFX6QmIfozaErDkmLWS9WEnEdEe6Uo9/BNTdQ==", "requires": { "chalk": "^2.4.2", "source-map": "^0.6.1", @@ -10327,13 +10407,6 @@ "commander": "^2.20.0", "source-map": "~0.6.1", "source-map-support": "~0.5.12" - }, - "dependencies": { - "commander": { - "version": "2.20.3", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", - "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==" - } } }, "terser-webpack-plugin": { @@ -10639,9 +10712,9 @@ "dev": true }, "ts-pnp": { - "version": "1.1.5", - "resolved": "https://registry.npmjs.org/ts-pnp/-/ts-pnp-1.1.5.tgz", - "integrity": "sha512-ti7OGMOUOzo66wLF3liskw6YQIaSsBgc4GOAlWRnIEj8htCxJUxskanMUoJOD6MDCRAXo36goXJZch+nOS0VMA==" + "version": "1.1.6", + "resolved": "https://registry.npmjs.org/ts-pnp/-/ts-pnp-1.1.6.tgz", + "integrity": "sha512-CrG5GqAAzMT7144Cl+UIFP7mz/iIhiy+xQ6GGcnjTezhALT02uPMRw7tgDSESgB5MsfKt55+GPWw4ir1kVtMIQ==" }, "tslib": { "version": "1.10.0", diff --git a/package.json b/package.json index 913977e4..bed8cf7b 100644 --- a/package.json +++ b/package.json @@ -23,7 +23,7 @@ "classnames": "^2.2.6", "lodash": "^4.17.15", "moment": "^2.24.0", - "next": "^9.2.2-canary.20", + "next": "^9.2.2", "react": "^16.12.0", "react-dom": "^16.12.0", "sitemap": "^1.5.0", From 3dbc1e60982565574e786c9056847774e8765fc2 Mon Sep 17 00:00:00 2001 From: Roman Timashev Date: Thu, 20 Feb 2020 17:31:24 +0300 Subject: [PATCH 02/10] upd to v6.2.0 --- package-lock.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index b584c90c..8cb9d9ed 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "hudozka", - "version": "6.1.0", + "version": "6.2.0", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index bed8cf7b..051b11c1 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "hudozka", "private": true, - "version": "6.1.0", + "version": "6.2.0", "description": "", "scripts": { "start": "next dev", From d144eb9cb5182b284f6eed6e28f0bcbd9c861998 Mon Sep 17 00:00:00 2001 From: Roman Timashev Date: Thu, 20 Feb 2020 19:07:23 +0300 Subject: [PATCH 03/10] kazimir styles -> to css --- pages/_app.tsx | 2 ++ src/style/kazimir/{image.scss => image.css} | 24 ++++++++++----------- src/style/kazimir/video.css | 14 ++++++++++++ src/style/kazimir/video.scss | 14 ------------ src/style/style.scss | 3 --- 5 files changed, 28 insertions(+), 29 deletions(-) rename src/style/kazimir/{image.scss => image.css} (66%) create mode 100644 src/style/kazimir/video.css delete mode 100644 src/style/kazimir/video.scss diff --git a/pages/_app.tsx b/pages/_app.tsx index 2ccbe35d..aa65d576 100644 --- a/pages/_app.tsx +++ b/pages/_app.tsx @@ -1,4 +1,6 @@ import 'src/style.css' +import 'src/style/kazimir/image.css' +import 'src/style/kazimir/video.css' import 'src/style/style.scss' import App from 'next/app' diff --git a/src/style/kazimir/image.scss b/src/style/kazimir/image.css similarity index 66% rename from src/style/kazimir/image.scss rename to src/style/kazimir/image.css index 1c0a3ea8..88edc60b 100644 --- a/src/style/kazimir/image.scss +++ b/src/style/kazimir/image.css @@ -1,24 +1,25 @@ .kazimir__image { - --kazimir-caption-margin: 20px; + --kazimir-caption-margin: 20px; +} - p { +.kazimir__image p { margin-left: 0; margin-right: 0; - } +} - img { +.kazimir__image img { border-radius: 3px; box-shadow: 0 2px 10px rgba(0, 0, 0, 0.15); max-width: 100%; max-height: 35em; - } +} - figure { +.kazimir__image figure { margin: 0 0 var(--single-margin); - } +} - figcaption { +.kazimir__image figcaption { margin-left: var(--kazimir-caption-margin); font-size: 16px; @@ -26,11 +27,10 @@ color: #999; font-weight: 100; - } } @media screen and (max-width: var(--mobile-width)) { - .kazimir__image { - --kazimir-caption-margin: 10px; - } + .kazimir__image { + --kazimir-caption-margin: 10px; + } } diff --git a/src/style/kazimir/video.css b/src/style/kazimir/video.css new file mode 100644 index 00000000..23ffdaf8 --- /dev/null +++ b/src/style/kazimir/video.css @@ -0,0 +1,14 @@ +.kazimir__video { + width: 100%; + height: 0; + position: relative; + padding-bottom: var(--embed-video-ratio); + + margin-bottom: var(--single-margin); +} + +.kazimir__video iframe { + width: 100%; + height: 100%; + position: absolute; +} diff --git a/src/style/kazimir/video.scss b/src/style/kazimir/video.scss deleted file mode 100644 index b15f5710..00000000 --- a/src/style/kazimir/video.scss +++ /dev/null @@ -1,14 +0,0 @@ -.kazimir__video { - width: 100%; - height: 0; - position: relative; - padding-bottom: var(--embed-video-ratio); - - margin-bottom: var(--single-margin); - - iframe { - width: 100%; - height: 100%; - position: absolute; - } -} diff --git a/src/style/style.scss b/src/style/style.scss index fc2389e2..2e430ed0 100644 --- a/src/style/style.scss +++ b/src/style/style.scss @@ -16,6 +16,3 @@ @import "themes/theme-default"; @import "marker/MarkerTable"; - -@import "kazimir/video"; -@import "kazimir/image"; From 25d49ed5b7f79aa503536c5913383aece9ecb219 Mon Sep 17 00:00:00 2001 From: Roman Timashev Date: Thu, 20 Feb 2020 19:24:08 +0300 Subject: [PATCH 04/10] kazimir style updated --- src/style.css | 5 +++++ src/style/kazimir/image.css | 28 ++++++++-------------------- 2 files changed, 13 insertions(+), 20 deletions(-) diff --git a/src/style.css b/src/style.css index da9c3217..0f307217 100644 --- a/src/style.css +++ b/src/style.css @@ -90,6 +90,11 @@ /* OTHER */ --block-border-radius: 3px; + + /* KAZIMIR */ + --kazimir-caption-margin: 0px; + --kazimir-radius: 5px; + --kazimir-image-increase: 50px; } * { diff --git a/src/style/kazimir/image.css b/src/style/kazimir/image.css index 88edc60b..a693c1de 100644 --- a/src/style/kazimir/image.css +++ b/src/style/kazimir/image.css @@ -1,36 +1,24 @@ .kazimir__image { - --kazimir-caption-margin: 20px; + position: relative; + width: calc(100% + var(--kazimir-image-increase)); + margin-left: calc(-1 * var(--kazimir-image-increase) / 2); } .kazimir__image p { - margin-left: 0; - margin-right: 0; + margin-left: 0 !important; + margin-right: 0 !important; } .kazimir__image img { - border-radius: 3px; - box-shadow: 0 2px 10px rgba(0, 0, 0, 0.15); + border-radius: var(--kazimir-radius); max-width: 100%; max-height: 35em; } -.kazimir__image figure { - margin: 0 0 var(--single-margin); -} - .kazimir__image figcaption { - margin-left: var(--kazimir-caption-margin); - - font-size: 16px; + color: var(--color-text-second); + font-size: var(--font-size-second); font-style: italic; - color: #999; - font-weight: 100; } - -@media screen and (max-width: var(--mobile-width)) { - .kazimir__image { - --kazimir-caption-margin: 10px; - } -} From 023ef5a348da3cc79c6599266218ae3bf21f3528 Mon Sep 17 00:00:00 2001 From: Roman Timashev Date: Thu, 20 Feb 2020 19:24:16 +0300 Subject: [PATCH 05/10] article p margin removed --- src/style/components/Article.scss | 1 - 1 file changed, 1 deletion(-) diff --git a/src/style/components/Article.scss b/src/style/components/Article.scss index fbbb807c..84c61126 100644 --- a/src/style/components/Article.scss +++ b/src/style/components/Article.scss @@ -45,7 +45,6 @@ line-height: var(--article-line-height); } - p, h2, h3 { margin-left: var(--text-margin); From a1a1ec20cca5434a211985f9c4644049a59a3179 Mon Sep 17 00:00:00 2001 From: Roman Timashev Date: Thu, 20 Feb 2020 19:24:34 +0300 Subject: [PATCH 06/10] text css vars updated --- src/style.css | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/style.css b/src/style.css index 0f307217..149e9469 100644 --- a/src/style.css +++ b/src/style.css @@ -2,8 +2,8 @@ --white-shadow: 0 0.1em 0.3em rgba(0, 0, 0, 0.2); /* FONTS */ - --title-font: Shadow, 'PT Serif', Georgia, serif; - --text-font: 'PT Sans', Arial, sans-serif; + --title-font: Shadow, Georgia, serif; + --text-font: 'PT Sans', Helvetica, sans-serif; --smaller-font-size: 0.9rem; --normal-font-size: 1rem; @@ -34,7 +34,7 @@ /* FONTS */ --font-size-default: 14pt; - --font-size-second: 0.9rem; + --font-size-second: 12pt; --font-size-h1: 5rem; --font-size-h2: 2.5rem; @@ -63,7 +63,7 @@ /* TEXT COLOR */ --color-text: #303030; - --color-text-second: #ccc; + --color-text-second: #9090a0; --color-text-opposite: var(--light-color); --color-back-main: white; From cc693228c60993f3828402cc99b90c2d33d5261c Mon Sep 17 00:00:00 2001 From: Roman Timashev Date: Thu, 20 Feb 2020 19:39:38 +0300 Subject: [PATCH 07/10] article line height changed --- src/style/components/Article.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/style/components/Article.scss b/src/style/components/Article.scss index 84c61126..12fa83c1 100644 --- a/src/style/components/Article.scss +++ b/src/style/components/Article.scss @@ -1,5 +1,5 @@ .Article { - --article-line-height: 1.75em; + --article-line-height: 1.5em; --article-quote-padding: var(--half-margin); --article-quote-font-size: 1.25em; --article-head-margin-bottom: var(--small-margin); From 10cf899fe57f1f288e456cffc9a0374c1eafffc7 Mon Sep 17 00:00:00 2001 From: Roman Timashev Date: Thu, 20 Feb 2020 19:39:49 +0300 Subject: [PATCH 08/10] kazimir image style update --- src/style/kazimir/image.css | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/style/kazimir/image.css b/src/style/kazimir/image.css index a693c1de..390f0046 100644 --- a/src/style/kazimir/image.css +++ b/src/style/kazimir/image.css @@ -1,12 +1,12 @@ .kazimir__image { position: relative; width: calc(100% + var(--kazimir-image-increase)); - margin-left: calc(-1 * var(--kazimir-image-increase) / 2); + margin-left: calc(-0.5 * var(--kazimir-image-increase)); + margin-bottom: var(--size-m); } .kazimir__image p { - margin-left: 0 !important; - margin-right: 0 !important; + margin-left: calc(0.5 * var(--kazimir-image-increase)); } .kazimir__image img { From d7877893912d41fc7e431ab6905a93d4b5990a4e Mon Sep 17 00:00:00 2001 From: Roman Timashev Date: Thu, 20 Feb 2020 19:40:00 +0300 Subject: [PATCH 09/10] kazimir video update --- src/style/kazimir/video.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/style/kazimir/video.css b/src/style/kazimir/video.css index 23ffdaf8..d94b3566 100644 --- a/src/style/kazimir/video.css +++ b/src/style/kazimir/video.css @@ -4,7 +4,7 @@ position: relative; padding-bottom: var(--embed-video-ratio); - margin-bottom: var(--single-margin); + margin-bottom: var(--size-m); } .kazimir__video iframe { From f01ba799777d7624b8170a45196f076bff971c8b Mon Sep 17 00:00:00 2001 From: Roman Timashev Date: Thu, 20 Feb 2020 19:42:21 +0300 Subject: [PATCH 10/10] kazimir mobile style updated --- src/style.css | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/style.css b/src/style.css index 149e9469..ca60f6a6 100644 --- a/src/style.css +++ b/src/style.css @@ -200,5 +200,7 @@ a.invisible { --content-thin: 90%; --content-wide: 90%; + + --kazimir-image-increase: 0px; } }