diff --git a/content/00-welcome/05-todos.md b/content/00-welcome/05-todos.md index cfb60a8..7455fae 100644 --- a/content/00-welcome/05-todos.md +++ b/content/00-welcome/05-todos.md @@ -9,10 +9,6 @@ * DONE: License feature * DONE: Enhance with plugins -[:contactform :] - ----- - ## Visual Editor * DONE: Refactor and redesign @@ -30,9 +26,6 @@ * DONE: disable enable * DONE: Add load sign (from navigation) * DONE: File is not published from tmp to media/files if you save the block. -* ToDo: Customfields not styled yet. -* ToDo: Warn if open another block -* ToDo: finish youtube component ## Raw Editor @@ -44,8 +37,6 @@ * DONE: Refactor and redesign * DONE: fix status in navigation * DONE: refresh navigation after changes -* ToDo: fix error messages -* ToDo: Wrong frontend navigation if unpublished pages ## Publish Controller @@ -98,10 +89,13 @@ * DONE: Version check * DONE: Proxy support * DONE: SVG checker: https://github.com/TribalSystems/SVG-Sanitizer -* NEARLY DONE: Backend form builder +* DONE: Backend form builder +* DONE: Image generation on the fly +* DONE: Delete folder in base level +* Make folder delete easier with glob or scandir +* Handle formdata centrally ??? * Markdown secure rendering * Responsive design -* Image generation on the fly * Captcha integration * Fix error api systemnavi * Reference feature @@ -109,12 +103,21 @@ * Clear cache * Show security Log * User search only for +10 users +* fix error messages +* Wrong frontend navigation if unpublished pages +* Customfields not styled yet. +* Warn if open another block +* finish youtube component +* Solution for logo and favicon ## Cleanups: * DONE: Events * Error messages * Translations +* https://stackoverflow.com/questions/15041608/searching-all-files-in-folder-for-strings +* https://github.com/skfaisal93/AnyWhereInFiles/blob/master/anywhereinfiles-1.4.php +* https://github.com/stephenhodgkiss/extract-translation-text-from-php-js ## Info: Select userroles @@ -129,3 +132,8 @@ * In plugin php code with setPremiumLicense * In static plugins, it checks manual premium list and method setPremiumLicense and more +## Plugins + +* MAKER: Rebuild search +* MAKER: Rebuild contactform with shortcode + diff --git a/content/00-welcome/05-todos.txt b/content/00-welcome/05-todos.txt deleted file mode 100644 index 922e67e..0000000 --- a/content/00-welcome/05-todos.txt +++ /dev/null @@ -1 +0,0 @@ -["# ToDos Version 2","[TOC]","## System settings","* DONE: Migrate from backend to frontend with vue and api\n* DONE: Redesign\n* DONE: License feature\n* DONE: Enhance with plugins","[:contactform :]","----","## Visual Editor","* DONE: Refactor and redesign\n* DONE: Fix toc component in new block\n* DONE: Fix hr component in new block\n* DONE: finish shortcode component\n* DONE: Fix inline formats\n* DONE: fix lenght of page\n* DONE: Fix design of new block at the end (background color)\n* DONE: Move Block\n* DONE: Fix headline design\n* DONE: Fix save on two enter\n* DONE: fix quote design\n* DONE: Fix toc preview\n* DONE: disable enable \n* DONE: Add load sign (from navigation)\n* DONE: File is not published from tmp to media\/files if you save the block.\n* ToDo: Customfields not styled yet.\n* ToDo: Warn if open another block\n* ToDo: finish youtube component","## Raw Editor","* DONE: Refactor and redesign\n* DONE: Integrate highlighting","## Navigation","* DONE: Refactor and redesign\n* DONE: fix status in navigation\n* DONE: refresh navigation after changes\n* ToDo: fix error messages\n* ToDo: Wrong frontend navigation if unpublished pages","## Publish Controller","* DONE: Refactor and redesign\n* DONE: Create \n* DONE: publish\n* DONE: unpublish\n* DONE: discard\n* DONE: delete\n* DONE: save draft\n* DONE: switch to raw","## Meta Tabs","* DONE: Refactor and redesign\n* DONE: Enhance with plugins","## Medialib","* DONE: Refactor and redesign","## Posts","* DONE: Refactor and redesign","## Plugins","* Asset Class in progress","## Frontend","* DONE: Refactor\n* DONE: Test restrictions","## Other big tasks","* DONE: System setup\n* DONE: Recover Password","## Medium tasks","* DONE: Merge processAssets modell\n* DONE: Table of content duplicated for published pages\n* DONE: Session handling: csrf fail and session start error if restrictions are active\n* DONE: Image and files for meta","## Open tasks","* * * DONE: Sitemap and ping\n* DONE: Version check\n* DONE: Proxy support\n* DONE: SVG checker: https:\/\/github.com\/TribalSystems\/SVG-Sanitizer\n* DONE: Backend form builder\n* Handle formdata centrally ???\n* DONE: Image generation on the fly\n* Markdown secure rendering\n* Responsive design\n* Captcha integration\n* Fix error api systemnavi\n* Bug: Delete folder in base level\n* Reference feature\n* Typemill Utilities\n* Clear cache\n* Show security Log\n* User search only for +10 users","## Cleanups:","* DONE: Events\n* Error messages\n* Translations","## Info: Select userroles","* Userroles for file restriction: in vue-blox-components loaded via api\n* Userroles for userfields: in php model user getUserFields()\n* Userroles for meta: in php controller apiAuthorMeta getMeta()\n* Plugins and themes: in php model extension getThemeDefinitions()","## Info: License Check","* On activation in apiControllerExtension. It checks the license in yaml.\n* In plugin php code with setPremiumLicense\n* In static plugins, it checks manual premium list and method setPremiumLicense and more ","## Plugins","* MAKER: Rebuild search\n* MAKER: Rebuild contactform with shortcode"] \ No newline at end of file diff --git a/content/02-blog/index.txt b/content/02-blog/index.txt deleted file mode 100644 index 8ce9f8f..0000000 --- a/content/02-blog/index.txt +++ /dev/null @@ -1 +0,0 @@ -["# blog","Content"] \ No newline at end of file diff --git a/content/02-blog/index.yaml b/content/02-blog/index.yaml deleted file mode 100644 index be1e822..0000000 --- a/content/02-blog/index.yaml +++ /dev/null @@ -1,20 +0,0 @@ -meta: - navtitle: blog - title: blog - description: Content - heroimage: null - heroimagealt: null - owner: Sebastian - author: null - allowedrole: null - alloweduser: null - manualdate: null - modified: '2023-08-25' - created: '2023-08-25' - time: 20-03-01 - reference: null - referencetype: null - hide: false - noindex: false - contains: posts - glossary: null diff --git a/data/navigation/navi-draft.txt b/data/navigation/navi-draft.txt index ae5a16f..fa2b493 100644 --- a/data/navigation/navi-draft.txt +++ b/data/navigation/navi-draft.txt @@ -1 +1 @@ -a:3:{i:0;O:8:"stdClass":22:{s:12:"originalName";s:10:"00-welcome";s:11:"elementType";s:6:"folder";s:8:"contains";s:5:"pages";s:6:"status";s:9:"published";s:8:"fileType";s:2:"md";s:5:"order";s:2:"00";s:4:"name";s:7:"welcome";s:4:"slug";s:7:"welcome";s:4:"path";s:11:"/00-welcome";s:15:"pathWithoutType";s:17:"/00-welcome/index";s:9:"urlRelWoF";s:8:"/welcome";s:6:"urlRel";s:17:"/typemill/welcome";s:6:"urlAbs";s:33:"http://localhost/typemill/welcome";s:3:"key";i:0;s:7:"keyPath";i:0;s:12:"keyPathArray";a:1:{i:0;s:1:"0";}s:7:"chapter";i:1;s:6:"active";b:0;s:12:"activeParent";b:0;s:4:"hide";b:0;s:13:"folderContent";a:6:{i:0;O:8:"stdClass":20:{s:12:"originalName";s:24:"00-setup-your-website.md";s:11:"elementType";s:4:"file";s:6:"status";s:9:"published";s:8:"fileType";s:2:"md";s:5:"order";s:2:"00";s:4:"name";s:18:"setup your website";s:4:"slug";s:18:"setup-your-website";s:4:"path";s:36:"/00-welcome/00-setup-your-website.md";s:15:"pathWithoutType";s:33:"/00-welcome/00-setup-your-website";s:3:"key";i:0;s:7:"keyPath";s:3:"0.0";s:12:"keyPathArray";a:2:{i:0;s:1:"0";i:1;s:1:"0";}s:7:"chapter";s:3:"1.1";s:9:"urlRelWoF";s:27:"/welcome/setup-your-website";s:6:"urlRel";s:36:"/typemill/welcome/setup-your-website";s:6:"urlAbs";s:52:"http://localhost/typemill/welcome/setup-your-website";s:6:"active";b:0;s:12:"activeParent";b:0;s:4:"hide";b:0;s:7:"noindex";b:0;}i:1;O:8:"stdClass":20:{s:12:"originalName";s:19:"01-manage-access.md";s:11:"elementType";s:4:"file";s:6:"status";s:9:"published";s:8:"fileType";s:2:"md";s:5:"order";s:2:"01";s:4:"name";s:13:"manage access";s:4:"slug";s:13:"manage-access";s:4:"path";s:31:"/00-welcome/01-manage-access.md";s:15:"pathWithoutType";s:28:"/00-welcome/01-manage-access";s:3:"key";i:1;s:7:"keyPath";s:3:"0.1";s:12:"keyPathArray";a:2:{i:0;s:1:"0";i:1;s:1:"1";}s:7:"chapter";s:3:"1.2";s:9:"urlRelWoF";s:22:"/welcome/manage-access";s:6:"urlRel";s:31:"/typemill/welcome/manage-access";s:6:"urlAbs";s:47:"http://localhost/typemill/welcome/manage-access";s:6:"active";b:0;s:12:"activeParent";b:0;s:4:"hide";b:0;s:7:"noindex";b:0;}i:2;O:8:"stdClass":20:{s:12:"originalName";s:19:"02-write-content.md";s:11:"elementType";s:4:"file";s:6:"status";s:9:"published";s:8:"fileType";s:2:"md";s:5:"order";s:2:"02";s:4:"name";s:13:"write content";s:4:"slug";s:13:"write-content";s:4:"path";s:31:"/00-welcome/02-write-content.md";s:15:"pathWithoutType";s:28:"/00-welcome/02-write-content";s:3:"key";i:2;s:7:"keyPath";s:3:"0.2";s:12:"keyPathArray";a:2:{i:0;s:1:"0";i:1;s:1:"2";}s:7:"chapter";s:3:"1.3";s:9:"urlRelWoF";s:22:"/welcome/write-content";s:6:"urlRel";s:31:"/typemill/welcome/write-content";s:6:"urlAbs";s:47:"http://localhost/typemill/welcome/write-content";s:6:"active";b:0;s:12:"activeParent";b:0;s:4:"hide";b:0;s:7:"noindex";b:0;}i:3;O:8:"stdClass":20:{s:12:"originalName";s:14:"03-get-help.md";s:11:"elementType";s:4:"file";s:6:"status";s:9:"published";s:8:"fileType";s:2:"md";s:5:"order";s:2:"03";s:4:"name";s:8:"get help";s:4:"slug";s:8:"get-help";s:4:"path";s:26:"/00-welcome/03-get-help.md";s:15:"pathWithoutType";s:23:"/00-welcome/03-get-help";s:3:"key";i:3;s:7:"keyPath";s:3:"0.3";s:12:"keyPathArray";a:2:{i:0;s:1:"0";i:1;s:1:"3";}s:7:"chapter";s:3:"1.4";s:9:"urlRelWoF";s:17:"/welcome/get-help";s:6:"urlRel";s:26:"/typemill/welcome/get-help";s:6:"urlAbs";s:42:"http://localhost/typemill/welcome/get-help";s:6:"active";b:0;s:12:"activeParent";b:0;s:4:"hide";b:0;s:7:"noindex";b:0;}i:4;O:8:"stdClass":20:{s:12:"originalName";s:19:"04-markdown-test.md";s:11:"elementType";s:4:"file";s:6:"status";s:9:"published";s:8:"fileType";s:2:"md";s:5:"order";s:2:"04";s:4:"name";s:13:"markdown test";s:4:"slug";s:13:"markdown-test";s:4:"path";s:31:"/00-welcome/04-markdown-test.md";s:15:"pathWithoutType";s:28:"/00-welcome/04-markdown-test";s:3:"key";i:4;s:7:"keyPath";s:3:"0.4";s:12:"keyPathArray";a:2:{i:0;s:1:"0";i:1;s:1:"4";}s:7:"chapter";s:3:"1.5";s:9:"urlRelWoF";s:22:"/welcome/markdown-test";s:6:"urlRel";s:31:"/typemill/welcome/markdown-test";s:6:"urlAbs";s:47:"http://localhost/typemill/welcome/markdown-test";s:6:"active";b:0;s:12:"activeParent";b:0;s:4:"hide";b:0;s:7:"noindex";b:0;}i:5;O:8:"stdClass":20:{s:12:"originalName";s:14:"05-todos.txtmd";s:11:"elementType";s:4:"file";s:6:"status";s:8:"modified";s:8:"fileType";s:3:"txt";s:5:"order";s:2:"05";s:4:"name";s:6:"To Dos";s:4:"slug";s:5:"todos";s:4:"path";s:26:"/00-welcome/05-todos.txtmd";s:15:"pathWithoutType";s:20:"/00-welcome/05-todos";s:3:"key";i:5;s:7:"keyPath";s:3:"0.5";s:12:"keyPathArray";a:2:{i:0;s:1:"0";i:1;s:1:"5";}s:7:"chapter";s:3:"1.6";s:9:"urlRelWoF";s:14:"/welcome/todos";s:6:"urlRel";s:23:"/typemill/welcome/todos";s:6:"urlAbs";s:39:"http://localhost/typemill/welcome/todos";s:6:"active";b:0;s:12:"activeParent";b:0;s:4:"hide";b:0;s:7:"noindex";b:0;}}s:7:"noindex";b:0;}i:1;O:8:"stdClass":22:{s:12:"originalName";s:16:"01-cyanine-theme";s:11:"elementType";s:6:"folder";s:8:"contains";s:5:"pages";s:6:"status";s:9:"published";s:8:"fileType";s:2:"md";s:5:"order";s:2:"01";s:4:"name";s:13:"cyanine theme";s:4:"slug";s:13:"cyanine-theme";s:4:"path";s:17:"/01-cyanine-theme";s:15:"pathWithoutType";s:23:"/01-cyanine-theme/index";s:9:"urlRelWoF";s:14:"/cyanine-theme";s:6:"urlRel";s:23:"/typemill/cyanine-theme";s:6:"urlAbs";s:39:"http://localhost/typemill/cyanine-theme";s:3:"key";i:1;s:7:"keyPath";i:1;s:12:"keyPathArray";a:1:{i:0;s:1:"1";}s:7:"chapter";i:2;s:6:"active";b:0;s:12:"activeParent";b:0;s:4:"hide";b:0;s:13:"folderContent";a:4:{i:0;O:8:"stdClass":20:{s:12:"originalName";s:17:"00-landingpage.md";s:11:"elementType";s:4:"file";s:6:"status";s:9:"published";s:8:"fileType";s:2:"md";s:5:"order";s:2:"00";s:4:"name";s:11:"landingpage";s:4:"slug";s:11:"landingpage";s:4:"path";s:35:"/01-cyanine-theme/00-landingpage.md";s:15:"pathWithoutType";s:32:"/01-cyanine-theme/00-landingpage";s:3:"key";i:0;s:7:"keyPath";s:3:"1.0";s:12:"keyPathArray";a:2:{i:0;s:1:"1";i:1;s:1:"0";}s:7:"chapter";s:3:"2.1";s:9:"urlRelWoF";s:26:"/cyanine-theme/landingpage";s:6:"urlRel";s:35:"/typemill/cyanine-theme/landingpage";s:6:"urlAbs";s:51:"http://localhost/typemill/cyanine-theme/landingpage";s:6:"active";b:0;s:12:"activeParent";b:0;s:4:"hide";b:0;s:7:"noindex";b:1;}i:1;O:8:"stdClass":20:{s:12:"originalName";s:22:"01-colors-and-fonts.md";s:11:"elementType";s:4:"file";s:6:"status";s:9:"published";s:8:"fileType";s:2:"md";s:5:"order";s:2:"01";s:4:"name";s:16:"colors and fonts";s:4:"slug";s:16:"colors-and-fonts";s:4:"path";s:40:"/01-cyanine-theme/01-colors-and-fonts.md";s:15:"pathWithoutType";s:37:"/01-cyanine-theme/01-colors-and-fonts";s:3:"key";i:1;s:7:"keyPath";s:3:"1.1";s:12:"keyPathArray";a:2:{i:0;s:1:"1";i:1;s:1:"1";}s:7:"chapter";s:3:"2.2";s:9:"urlRelWoF";s:31:"/cyanine-theme/colors-and-fonts";s:6:"urlRel";s:40:"/typemill/cyanine-theme/colors-and-fonts";s:6:"urlAbs";s:56:"http://localhost/typemill/cyanine-theme/colors-and-fonts";s:6:"active";b:0;s:12:"activeParent";b:0;s:4:"hide";b:0;s:7:"noindex";b:0;}i:2;O:8:"stdClass":20:{s:12:"originalName";s:12:"02-footer.md";s:11:"elementType";s:4:"file";s:6:"status";s:9:"published";s:8:"fileType";s:2:"md";s:5:"order";s:2:"02";s:4:"name";s:6:"footer";s:4:"slug";s:6:"footer";s:4:"path";s:30:"/01-cyanine-theme/02-footer.md";s:15:"pathWithoutType";s:27:"/01-cyanine-theme/02-footer";s:3:"key";i:2;s:7:"keyPath";s:3:"1.2";s:12:"keyPathArray";a:2:{i:0;s:1:"1";i:1;s:1:"2";}s:7:"chapter";s:3:"2.3";s:9:"urlRelWoF";s:21:"/cyanine-theme/footer";s:6:"urlRel";s:30:"/typemill/cyanine-theme/footer";s:6:"urlAbs";s:46:"http://localhost/typemill/cyanine-theme/footer";s:6:"active";b:0;s:12:"activeParent";b:0;s:4:"hide";b:0;s:7:"noindex";b:0;}i:3;O:8:"stdClass":20:{s:12:"originalName";s:22:"03-content-elements.md";s:11:"elementType";s:4:"file";s:6:"status";s:9:"published";s:8:"fileType";s:2:"md";s:5:"order";s:2:"03";s:4:"name";s:16:"content elements";s:4:"slug";s:16:"content-elements";s:4:"path";s:40:"/01-cyanine-theme/03-content-elements.md";s:15:"pathWithoutType";s:37:"/01-cyanine-theme/03-content-elements";s:3:"key";i:3;s:7:"keyPath";s:3:"1.3";s:12:"keyPathArray";a:2:{i:0;s:1:"1";i:1;s:1:"3";}s:7:"chapter";s:3:"2.4";s:9:"urlRelWoF";s:31:"/cyanine-theme/content-elements";s:6:"urlRel";s:40:"/typemill/cyanine-theme/content-elements";s:6:"urlAbs";s:56:"http://localhost/typemill/cyanine-theme/content-elements";s:6:"active";b:0;s:12:"activeParent";b:0;s:4:"hide";b:0;s:7:"noindex";b:0;}}s:7:"noindex";b:0;}i:2;O:8:"stdClass":22:{s:12:"originalName";s:7:"02-blog";s:11:"elementType";s:6:"folder";s:8:"contains";s:5:"posts";s:6:"status";s:11:"unpublished";s:8:"fileType";s:3:"txt";s:5:"order";s:2:"02";s:4:"name";s:4:"blog";s:4:"slug";s:4:"blog";s:4:"path";s:8:"/02-blog";s:15:"pathWithoutType";s:14:"/02-blog/index";s:9:"urlRelWoF";s:5:"/blog";s:6:"urlRel";s:14:"/typemill/blog";s:6:"urlAbs";s:30:"http://localhost/typemill/blog";s:3:"key";i:2;s:7:"keyPath";i:2;s:12:"keyPathArray";a:1:{i:0;s:1:"2";}s:7:"chapter";i:3;s:6:"active";b:0;s:12:"activeParent";b:0;s:4:"hide";b:0;s:13:"folderContent";a:0:{}s:7:"noindex";b:0;}} \ No newline at end of file +a:2:{i:0;O:8:"stdClass":22:{s:12:"originalName";s:10:"00-welcome";s:11:"elementType";s:6:"folder";s:8:"contains";s:5:"pages";s:6:"status";s:9:"published";s:8:"fileType";s:2:"md";s:5:"order";s:2:"00";s:4:"name";s:7:"welcome";s:4:"slug";s:7:"welcome";s:4:"path";s:11:"/00-welcome";s:15:"pathWithoutType";s:17:"/00-welcome/index";s:9:"urlRelWoF";s:8:"/welcome";s:6:"urlRel";s:17:"/typemill/welcome";s:6:"urlAbs";s:33:"http://localhost/typemill/welcome";s:3:"key";i:0;s:7:"keyPath";i:0;s:12:"keyPathArray";a:1:{i:0;s:1:"0";}s:7:"chapter";i:1;s:6:"active";b:0;s:12:"activeParent";b:0;s:4:"hide";b:0;s:13:"folderContent";a:6:{i:0;O:8:"stdClass":20:{s:12:"originalName";s:24:"00-setup-your-website.md";s:11:"elementType";s:4:"file";s:6:"status";s:9:"published";s:8:"fileType";s:2:"md";s:5:"order";s:2:"00";s:4:"name";s:18:"setup your website";s:4:"slug";s:18:"setup-your-website";s:4:"path";s:36:"/00-welcome/00-setup-your-website.md";s:15:"pathWithoutType";s:33:"/00-welcome/00-setup-your-website";s:3:"key";i:0;s:7:"keyPath";s:3:"0.0";s:12:"keyPathArray";a:2:{i:0;s:1:"0";i:1;s:1:"0";}s:7:"chapter";s:3:"1.1";s:9:"urlRelWoF";s:27:"/welcome/setup-your-website";s:6:"urlRel";s:36:"/typemill/welcome/setup-your-website";s:6:"urlAbs";s:52:"http://localhost/typemill/welcome/setup-your-website";s:6:"active";b:0;s:12:"activeParent";b:0;s:4:"hide";b:0;s:7:"noindex";b:0;}i:1;O:8:"stdClass":20:{s:12:"originalName";s:19:"01-manage-access.md";s:11:"elementType";s:4:"file";s:6:"status";s:9:"published";s:8:"fileType";s:2:"md";s:5:"order";s:2:"01";s:4:"name";s:13:"manage access";s:4:"slug";s:13:"manage-access";s:4:"path";s:31:"/00-welcome/01-manage-access.md";s:15:"pathWithoutType";s:28:"/00-welcome/01-manage-access";s:3:"key";i:1;s:7:"keyPath";s:3:"0.1";s:12:"keyPathArray";a:2:{i:0;s:1:"0";i:1;s:1:"1";}s:7:"chapter";s:3:"1.2";s:9:"urlRelWoF";s:22:"/welcome/manage-access";s:6:"urlRel";s:31:"/typemill/welcome/manage-access";s:6:"urlAbs";s:47:"http://localhost/typemill/welcome/manage-access";s:6:"active";b:0;s:12:"activeParent";b:0;s:4:"hide";b:0;s:7:"noindex";b:0;}i:2;O:8:"stdClass":20:{s:12:"originalName";s:19:"02-write-content.md";s:11:"elementType";s:4:"file";s:6:"status";s:9:"published";s:8:"fileType";s:2:"md";s:5:"order";s:2:"02";s:4:"name";s:13:"write content";s:4:"slug";s:13:"write-content";s:4:"path";s:31:"/00-welcome/02-write-content.md";s:15:"pathWithoutType";s:28:"/00-welcome/02-write-content";s:3:"key";i:2;s:7:"keyPath";s:3:"0.2";s:12:"keyPathArray";a:2:{i:0;s:1:"0";i:1;s:1:"2";}s:7:"chapter";s:3:"1.3";s:9:"urlRelWoF";s:22:"/welcome/write-content";s:6:"urlRel";s:31:"/typemill/welcome/write-content";s:6:"urlAbs";s:47:"http://localhost/typemill/welcome/write-content";s:6:"active";b:0;s:12:"activeParent";b:0;s:4:"hide";b:0;s:7:"noindex";b:0;}i:3;O:8:"stdClass":20:{s:12:"originalName";s:14:"03-get-help.md";s:11:"elementType";s:4:"file";s:6:"status";s:9:"published";s:8:"fileType";s:2:"md";s:5:"order";s:2:"03";s:4:"name";s:8:"get help";s:4:"slug";s:8:"get-help";s:4:"path";s:26:"/00-welcome/03-get-help.md";s:15:"pathWithoutType";s:23:"/00-welcome/03-get-help";s:3:"key";i:3;s:7:"keyPath";s:3:"0.3";s:12:"keyPathArray";a:2:{i:0;s:1:"0";i:1;s:1:"3";}s:7:"chapter";s:3:"1.4";s:9:"urlRelWoF";s:17:"/welcome/get-help";s:6:"urlRel";s:26:"/typemill/welcome/get-help";s:6:"urlAbs";s:42:"http://localhost/typemill/welcome/get-help";s:6:"active";b:0;s:12:"activeParent";b:0;s:4:"hide";b:0;s:7:"noindex";b:0;}i:4;O:8:"stdClass":20:{s:12:"originalName";s:19:"04-markdown-test.md";s:11:"elementType";s:4:"file";s:6:"status";s:9:"published";s:8:"fileType";s:2:"md";s:5:"order";s:2:"04";s:4:"name";s:13:"markdown test";s:4:"slug";s:13:"markdown-test";s:4:"path";s:31:"/00-welcome/04-markdown-test.md";s:15:"pathWithoutType";s:28:"/00-welcome/04-markdown-test";s:3:"key";i:4;s:7:"keyPath";s:3:"0.4";s:12:"keyPathArray";a:2:{i:0;s:1:"0";i:1;s:1:"4";}s:7:"chapter";s:3:"1.5";s:9:"urlRelWoF";s:22:"/welcome/markdown-test";s:6:"urlRel";s:31:"/typemill/welcome/markdown-test";s:6:"urlAbs";s:47:"http://localhost/typemill/welcome/markdown-test";s:6:"active";b:0;s:12:"activeParent";b:0;s:4:"hide";b:0;s:7:"noindex";b:0;}i:5;O:8:"stdClass":20:{s:12:"originalName";s:11:"05-todos.md";s:11:"elementType";s:4:"file";s:6:"status";s:9:"published";s:8:"fileType";s:2:"md";s:5:"order";s:2:"05";s:4:"name";s:6:"To Dos";s:4:"slug";s:5:"todos";s:4:"path";s:23:"/00-welcome/05-todos.md";s:15:"pathWithoutType";s:20:"/00-welcome/05-todos";s:3:"key";i:5;s:7:"keyPath";s:3:"0.5";s:12:"keyPathArray";a:2:{i:0;s:1:"0";i:1;s:1:"5";}s:7:"chapter";s:3:"1.6";s:9:"urlRelWoF";s:14:"/welcome/todos";s:6:"urlRel";s:23:"/typemill/welcome/todos";s:6:"urlAbs";s:39:"http://localhost/typemill/welcome/todos";s:6:"active";b:0;s:12:"activeParent";b:0;s:4:"hide";b:0;s:7:"noindex";b:0;}}s:7:"noindex";b:0;}i:1;O:8:"stdClass":22:{s:12:"originalName";s:16:"01-cyanine-theme";s:11:"elementType";s:6:"folder";s:8:"contains";s:5:"pages";s:6:"status";s:9:"published";s:8:"fileType";s:2:"md";s:5:"order";s:2:"01";s:4:"name";s:13:"cyanine theme";s:4:"slug";s:13:"cyanine-theme";s:4:"path";s:17:"/01-cyanine-theme";s:15:"pathWithoutType";s:23:"/01-cyanine-theme/index";s:9:"urlRelWoF";s:14:"/cyanine-theme";s:6:"urlRel";s:23:"/typemill/cyanine-theme";s:6:"urlAbs";s:39:"http://localhost/typemill/cyanine-theme";s:3:"key";i:1;s:7:"keyPath";i:1;s:12:"keyPathArray";a:1:{i:0;s:1:"1";}s:7:"chapter";i:2;s:6:"active";b:0;s:12:"activeParent";b:0;s:4:"hide";b:0;s:13:"folderContent";a:4:{i:0;O:8:"stdClass":20:{s:12:"originalName";s:17:"00-landingpage.md";s:11:"elementType";s:4:"file";s:6:"status";s:9:"published";s:8:"fileType";s:2:"md";s:5:"order";s:2:"00";s:4:"name";s:11:"landingpage";s:4:"slug";s:11:"landingpage";s:4:"path";s:35:"/01-cyanine-theme/00-landingpage.md";s:15:"pathWithoutType";s:32:"/01-cyanine-theme/00-landingpage";s:3:"key";i:0;s:7:"keyPath";s:3:"1.0";s:12:"keyPathArray";a:2:{i:0;s:1:"1";i:1;s:1:"0";}s:7:"chapter";s:3:"2.1";s:9:"urlRelWoF";s:26:"/cyanine-theme/landingpage";s:6:"urlRel";s:35:"/typemill/cyanine-theme/landingpage";s:6:"urlAbs";s:51:"http://localhost/typemill/cyanine-theme/landingpage";s:6:"active";b:0;s:12:"activeParent";b:0;s:4:"hide";b:0;s:7:"noindex";b:1;}i:1;O:8:"stdClass":20:{s:12:"originalName";s:22:"01-colors-and-fonts.md";s:11:"elementType";s:4:"file";s:6:"status";s:9:"published";s:8:"fileType";s:2:"md";s:5:"order";s:2:"01";s:4:"name";s:16:"colors and fonts";s:4:"slug";s:16:"colors-and-fonts";s:4:"path";s:40:"/01-cyanine-theme/01-colors-and-fonts.md";s:15:"pathWithoutType";s:37:"/01-cyanine-theme/01-colors-and-fonts";s:3:"key";i:1;s:7:"keyPath";s:3:"1.1";s:12:"keyPathArray";a:2:{i:0;s:1:"1";i:1;s:1:"1";}s:7:"chapter";s:3:"2.2";s:9:"urlRelWoF";s:31:"/cyanine-theme/colors-and-fonts";s:6:"urlRel";s:40:"/typemill/cyanine-theme/colors-and-fonts";s:6:"urlAbs";s:56:"http://localhost/typemill/cyanine-theme/colors-and-fonts";s:6:"active";b:0;s:12:"activeParent";b:0;s:4:"hide";b:0;s:7:"noindex";b:0;}i:2;O:8:"stdClass":20:{s:12:"originalName";s:12:"02-footer.md";s:11:"elementType";s:4:"file";s:6:"status";s:9:"published";s:8:"fileType";s:2:"md";s:5:"order";s:2:"02";s:4:"name";s:6:"footer";s:4:"slug";s:6:"footer";s:4:"path";s:30:"/01-cyanine-theme/02-footer.md";s:15:"pathWithoutType";s:27:"/01-cyanine-theme/02-footer";s:3:"key";i:2;s:7:"keyPath";s:3:"1.2";s:12:"keyPathArray";a:2:{i:0;s:1:"1";i:1;s:1:"2";}s:7:"chapter";s:3:"2.3";s:9:"urlRelWoF";s:21:"/cyanine-theme/footer";s:6:"urlRel";s:30:"/typemill/cyanine-theme/footer";s:6:"urlAbs";s:46:"http://localhost/typemill/cyanine-theme/footer";s:6:"active";b:0;s:12:"activeParent";b:0;s:4:"hide";b:0;s:7:"noindex";b:0;}i:3;O:8:"stdClass":20:{s:12:"originalName";s:22:"03-content-elements.md";s:11:"elementType";s:4:"file";s:6:"status";s:9:"published";s:8:"fileType";s:2:"md";s:5:"order";s:2:"03";s:4:"name";s:16:"content elements";s:4:"slug";s:16:"content-elements";s:4:"path";s:40:"/01-cyanine-theme/03-content-elements.md";s:15:"pathWithoutType";s:37:"/01-cyanine-theme/03-content-elements";s:3:"key";i:3;s:7:"keyPath";s:3:"1.3";s:12:"keyPathArray";a:2:{i:0;s:1:"1";i:1;s:1:"3";}s:7:"chapter";s:3:"2.4";s:9:"urlRelWoF";s:31:"/cyanine-theme/content-elements";s:6:"urlRel";s:40:"/typemill/cyanine-theme/content-elements";s:6:"urlAbs";s:56:"http://localhost/typemill/cyanine-theme/content-elements";s:6:"active";b:0;s:12:"activeParent";b:0;s:4:"hide";b:0;s:7:"noindex";b:0;}}s:7:"noindex";b:0;}} \ No newline at end of file diff --git a/data/navigation/navi-extended.txt b/data/navigation/navi-extended.txt index 504f95e..7497497 100644 --- a/data/navigation/navi-extended.txt +++ b/data/navigation/navi-extended.txt @@ -38,7 +38,7 @@ navtitle: 'To Dos' hide: false noindex: false - path: /00-welcome/05-todos.txtmd + path: /00-welcome/05-todos.md keyPath: '0.5' /cyanine-theme: navtitle: 'cyanine theme' @@ -70,9 +70,3 @@ noindex: false path: /01-cyanine-theme/03-content-elements.md keyPath: '1.3' -/blog: - navtitle: blog - hide: false - noindex: false - path: /02-blog - keyPath: 2 diff --git a/system/typemill/Controllers/ControllerApiAuthorMeta.php b/system/typemill/Controllers/ControllerApiAuthorMeta.php index f514546..8d3c190 100644 --- a/system/typemill/Controllers/ControllerApiAuthorMeta.php +++ b/system/typemill/Controllers/ControllerApiAuthorMeta.php @@ -47,8 +47,7 @@ class ControllerApiAuthorMeta extends Controller if(!$metadata) { - die('no page meta'); -# $pagemeta = $writeMeta->getPageMetaBlank($this->content, $this->settings, $this->item); + $metadata = $meta->addMetaDefaults($metadata, $item, $this->settings['author']); } # if item is a folder diff --git a/system/typemill/Controllers/ControllerApiSystemVersions.php b/system/typemill/Controllers/ControllerApiSystemVersions.php index 0edf0d6..62ba950 100644 --- a/system/typemill/Controllers/ControllerApiSystemVersions.php +++ b/system/typemill/Controllers/ControllerApiSystemVersions.php @@ -67,7 +67,7 @@ class ControllerApiSystemVersions extends Controller { $latestVersion = $versions['system']['typemill'] ?? false; $installedVersion = $data ?? false; - if($latestVersion && $installedVersion && version_compare($latestVersion, $installedVersion) <= 0) + if($latestVersion && $installedVersion && version_compare($latestVersion, $installedVersion) > 0) { $updateVersions['system'] = $latestVersion; } @@ -78,7 +78,7 @@ class ControllerApiSystemVersions extends Controller { $latestVersion = $details['version'] ?? false; $installedVersion = $data[$name] ?? false; - if($latestVersion && $installedVersion && version_compare($latestVersion, $installedVersion) <= 0) + if($latestVersion && $installedVersion && version_compare($latestVersion, $installedVersion) > 0) { $updateVersions[$name] = $details; } diff --git a/system/typemill/Controllers/ControllerWebAuth.php b/system/typemill/Controllers/ControllerWebAuth.php index 68f076c..3091507 100644 --- a/system/typemill/Controllers/ControllerWebAuth.php +++ b/system/typemill/Controllers/ControllerWebAuth.php @@ -13,6 +13,7 @@ class ControllerWebAuth extends Controller public function show(Request $request, Response $response) { return $this->c->get('view')->render($response, 'auth/login.twig', [ + 'recover' => $this->settings['recoverpw'] ?? false, #'captcha' => $this->checkIfAddCaptcha(), ]); } diff --git a/system/typemill/Controllers/ControllerWebRecover.php b/system/typemill/Controllers/ControllerWebRecover.php index d3732b2..9417d8a 100644 --- a/system/typemill/Controllers/ControllerWebRecover.php +++ b/system/typemill/Controllers/ControllerWebRecover.php @@ -22,7 +22,7 @@ class ControllerWebRecover extends Controller { $params = $request->getParsedBody(); $settings = $this->c->get('settings'); - $urlinfo = $this->c->get('urlinfo'); + $urlinfo = $this->c->get('urlinfo'); if(!isset($params['email']) OR filter_var($params['email'], \FILTER_VALIDATE_EMAIL) === false ) { diff --git a/system/typemill/Controllers/ControllerWebSetup.php b/system/typemill/Controllers/ControllerWebSetup.php index 671f63f..6c57dfa 100644 --- a/system/typemill/Controllers/ControllerWebSetup.php +++ b/system/typemill/Controllers/ControllerWebSetup.php @@ -81,6 +81,8 @@ class ControllerWebSetup extends Controller if($username) { + usleep(30000); + $user->setUser($username); $user->login(); @@ -92,6 +94,8 @@ class ControllerWebSetup extends Controller $urlinfo = $this->c->get('urlinfo'); $route = $urlinfo['baseurl'] . '/tm/system'; + usleep(30000); + return $response->withHeader('Location', $route)->withStatus(302); } } diff --git a/system/typemill/Models/Content.php b/system/typemill/Models/Content.php index a517c5b..7cb0bf1 100644 --- a/system/typemill/Models/Content.php +++ b/system/typemill/Models/Content.php @@ -171,6 +171,20 @@ class Content } } + $result = $this->deletePage($item); + + if($result !== true) + { + return $result; + } + + $result = $this->storage->deleteContentFolder($item->path); + + if($result !== true) + { + return $this->storage->getError(); + } + return true; } diff --git a/system/typemill/Models/Meta.php b/system/typemill/Models/Meta.php index def7571..5755ef2 100644 --- a/system/typemill/Models/Meta.php +++ b/system/typemill/Models/Meta.php @@ -21,18 +21,6 @@ class Meta $metadata = $this->storage->getYaml('contentFolder', '', $item->pathWithoutType . '.yaml'); return $metadata; - - - - # compare with meta that are in use right now (e.g. changed theme, disabled plugin) - $metascheme = $this->getYaml('cache', 'metatabs.yaml'); - - if($metascheme) - { - $meta = $this->whitelistMeta($meta,$metascheme); - } - - return $meta; } public function getMetaDefinitions($settings, $folder) @@ -98,7 +86,14 @@ class Meta { $modified = false; - if(!is_array($meta['meta'])){ $meta['meta'] = []; } + if(!is_array($meta)) + { + $meta = []; + } + if(!isset($meta['meta']) OR !is_array($meta['meta'])) + { + $meta['meta'] = []; + } if(!isset($meta['meta']['owner'])) { diff --git a/system/typemill/Models/Settings.php b/system/typemill/Models/Settings.php index 5e353e9..2829dc5 100644 --- a/system/typemill/Models/Settings.php +++ b/system/typemill/Models/Settings.php @@ -120,7 +120,7 @@ class Settings } public function updateSettings(array $newSettings) - { + { $userSettings = $this->getUserSettings(); # only allow if usersettings already exists (setup has been done) @@ -128,14 +128,22 @@ class Settings { # merge usersettings with new settings $settings = array_merge($userSettings, $newSettings); - + # make sure that multidimensional arrays are merged correctly # for example: only one plugin data will be passed with new settings, with array merge all others will be deleted. - foreach($newSettings as $key => $settingsItem) + foreach($newSettings as $key => $settingsItems) { - if(is_array($settingsItem) && isset($userSettings[$key])) + if(is_array($settingsItems) && isset($userSettings[$key])) { - $settings[$key] = array_merge($userSettings[$key], $newSettings[$key]); + if($this->array_is_list($settingsItems)) + { + # for numeric/list arrays instead of associative arrays we only use new values + $settings[$key] = $newSettings[$key]; + } + else + { + $settings[$key] = array_merge($userSettings[$key], $newSettings[$key]); + } } } @@ -148,6 +156,15 @@ class Settings return false; } + private function array_is_list(array $arr) + { + if ($arr === []) + { + return true; + } + return array_keys($arr) === range(0, count($arr) - 1); + } + public function getSettingsDefinitions() { return $this->storage->getYaml('systemSettings', '', 'system.yaml'); diff --git a/system/typemill/Models/Storage.php b/system/typemill/Models/Storage.php index 3fc58da..335518d 100644 --- a/system/typemill/Models/Storage.php +++ b/system/typemill/Models/Storage.php @@ -199,10 +199,8 @@ class Storage return false; } - - $this->error = "The path $filepath is not a folder."; - return false; + return true; } public function checkFile($location, $folder, $filename) diff --git a/system/typemill/Models/User.php b/system/typemill/Models/User.php index a7acf1e..977e4c3 100644 --- a/system/typemill/Models/User.php +++ b/system/typemill/Models/User.php @@ -208,7 +208,8 @@ class User if(isset($this->user['recovertoken']) OR isset($this->user['recoverdate'])) { - $this->unsetFromUser($this->user['username'], ['recovertoken', 'recoverdate']); + $this->unsetValue('recovertoken'); + $this->unsetValue('recoverdate'); } # update user last login diff --git a/system/typemill/author/auth/login.twig b/system/typemill/author/auth/login.twig index 6f13bac..7f6b202 100644 --- a/system/typemill/author/auth/login.twig +++ b/system/typemill/author/auth/login.twig @@ -4,9 +4,9 @@ {% block content %} -
+
-
+

Login

@@ -16,7 +16,7 @@
- +
- + + {% if recover %} +
+ {{ translate('forgot password') }} +
+ {% endif %} +
- - - {% if settings.recoverpw %} - - - {% else %} - -
- - {% endif %} -
-
+

Welcome back!

-

What kind of information would be helpful or entertaining here?

+

Login to the author area or go to the homepage

diff --git a/system/typemill/author/auth/recover.twig b/system/typemill/author/auth/recover.twig index 9d621d7..b796bba 100644 --- a/system/typemill/author/auth/recover.twig +++ b/system/typemill/author/auth/recover.twig @@ -4,9 +4,9 @@ {% block content %} -
+
-
+
@@ -37,13 +37,17 @@ class="block w-full mt-6 px-3 py-3 border-0 font-medium text-xs leading-tight uppercase border-2 border-stone-50 text-stone-50 pointer hover:bg-stone-50 hover:text-stone-800 cursor-pointer focus:outline-none focus:ring-0 transition duration-100 ease-in-out" /> +
+ {{ translate('go to login') }} +
+
-
+

Forgot your password?

Enter the email of your user-account, click the recover-button and check your mailbox for further instructions.

diff --git a/system/typemill/author/auth/recoverconf.twig b/system/typemill/author/auth/recoverconf.twig index ddf884f..a0ff5c7 100644 --- a/system/typemill/author/auth/recoverconf.twig +++ b/system/typemill/author/auth/recoverconf.twig @@ -4,9 +4,9 @@ {% block content %} -
+
-
+
@@ -16,14 +16,14 @@
-
+

{{ title }}

{{ message }}

{{ 'to the login page'|translate }}

+ >{{ 'go to login'|translate }}

diff --git a/system/typemill/author/auth/reset.twig b/system/typemill/author/auth/reset.twig index 6baca8a..76acc34 100644 --- a/system/typemill/author/auth/reset.twig +++ b/system/typemill/author/auth/reset.twig @@ -4,9 +4,9 @@ {% block content %} -
+
-
+
@@ -14,7 +14,7 @@
- +
- + @@ -59,15 +59,14 @@
-
+

Forgot your password?

-

No problem, simply create a new one on the left.

-

Want to stay save with your passwords? Here are some tips:

+

No problem, you can create a new one here. And you might find the following tips helpful:

    -
  • Let the password manager of your browser remember your passwords.

    -
  • If you don't want to rely on your browser, use a separate password manager like keepass or others.
    • -
  • Last but not least: Do not use the same password for several applications.
    • +
  • Use a strong and individual password for every account.
    • +
  • Your browser can remember all of your passwords.

    +
  • The best option is a separate password manager like keepass and others.
diff --git a/system/typemill/author/auth/setup.twig b/system/typemill/author/auth/setup.twig index f212d9a..12bd383 100644 --- a/system/typemill/author/auth/setup.twig +++ b/system/typemill/author/auth/setup.twig @@ -4,9 +4,9 @@ {% block content %} -
+
-
+

{{ 'Setup'|translate }}

@@ -73,7 +73,7 @@
-
+
{% if systemerrors %}

Systemcheck

@@ -84,8 +84,8 @@ {% endfor %} {% else %} -

Here comes Typemill

-

Hey writer, author, editor, content-guru, or website-manager, we hope you like Typemill, because we coded it just for you.

+

Welcome to Typemill

+

Hey writer, author, editor, content-guru, or website-manager. We hope you like Typemill, because we coded it just for you.

Get inspired and enjoy your writing!

{% endif %}
diff --git a/system/typemill/author/css/output.css b/system/typemill/author/css/output.css index dd205e3..63181d6 100644 --- a/system/typemill/author/css/output.css +++ b/system/typemill/author/css/output.css @@ -970,10 +970,6 @@ video { min-height: 100vh; } -.w-1\/2 { - width: 50%; -} - .w-full { width: 100%; } @@ -990,6 +986,10 @@ video { width: 8rem; } +.w-1\/2 { + width: 50%; +} + .w-1\/5 { width: 20%; } @@ -1152,6 +1152,10 @@ video { flex-direction: column; } +.flex-col-reverse { + flex-direction: column-reverse; +} + .flex-wrap { flex-wrap: wrap; } @@ -1238,6 +1242,10 @@ video { border-right-width: 8px; } +.border-b { + border-bottom-width: 1px; +} + .border-b-2 { border-bottom-width: 2px; } @@ -1250,10 +1258,6 @@ video { border-right-width: 2px; } -.border-b { - border-bottom-width: 1px; -} - .border-r { border-right-width: 1px; } @@ -1300,6 +1304,11 @@ video { border-color: rgb(250 250 249 / var(--tw-border-opacity)); } +.border-white { + --tw-border-opacity: 1; + border-color: rgb(255 255 255 / var(--tw-border-opacity)); +} + .border-stone-200 { --tw-border-opacity: 1; border-color: rgb(231 229 228 / var(--tw-border-opacity)); @@ -1340,11 +1349,6 @@ video { border-color: rgb(239 68 68 / var(--tw-border-opacity)); } -.border-white { - --tw-border-opacity: 1; - border-color: rgb(255 255 255 / var(--tw-border-opacity)); -} - .border-yellow-500 { --tw-border-opacity: 1; border-color: rgb(234 179 8 / var(--tw-border-opacity)); @@ -1448,11 +1452,6 @@ video { background-color: rgb(234 179 8 / var(--tw-bg-opacity)); } -.bg-stone-800 { - --tw-bg-opacity: 1; - background-color: rgb(41 37 36 / var(--tw-bg-opacity)); -} - .bg-opacity-90 { --tw-bg-opacity: 0.9; } @@ -1465,6 +1464,10 @@ video { background-clip: padding-box; } +.p-5 { + padding: 1.25rem; +} + .p-3 { padding: 0.75rem; } @@ -1514,6 +1517,11 @@ video { padding-bottom: 0.75rem; } +.py-4 { + padding-top: 1rem; + padding-bottom: 1rem; +} + .px-4 { padding-left: 1rem; padding-right: 1rem; @@ -1574,9 +1582,8 @@ video { padding-bottom: 4rem; } -.py-4 { - padding-top: 1rem; - padding-bottom: 1rem; +.pl-4 { + padding-left: 1rem; } .pr-6 { @@ -1595,10 +1602,6 @@ video { padding-bottom: 1.5rem; } -.pl-4 { - padding-left: 1rem; -} - .pl-3 { padding-left: 0.75rem; } @@ -1655,10 +1658,6 @@ video { padding-top: 0.75rem; } -.pt-4 { - padding-top: 1rem; -} - .text-left { text-align: left; } @@ -1683,9 +1682,9 @@ video { font-family: ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace; } -.text-6xl { - font-size: 3.75rem; - line-height: 1; +.text-4xl { + font-size: 2.25rem; + line-height: 2.5rem; } .text-base { @@ -1698,11 +1697,6 @@ video { line-height: 1rem; } -.text-4xl { - font-size: 2.25rem; - line-height: 2.5rem; -} - .text-sm { font-size: 0.875rem; line-height: 1.25rem; @@ -1766,26 +1760,21 @@ video { color: rgb(55 65 81 / var(--tw-text-opacity)); } -.text-rose-600 { - --tw-text-opacity: 1; - color: rgb(225 29 72 / var(--tw-text-opacity)); -} - .text-stone-50 { --tw-text-opacity: 1; color: rgb(250 250 249 / var(--tw-text-opacity)); } -.text-stone-700 { - --tw-text-opacity: 1; - color: rgb(68 64 60 / var(--tw-text-opacity)); -} - .text-stone-400 { --tw-text-opacity: 1; color: rgb(168 162 158 / var(--tw-text-opacity)); } +.text-stone-700 { + --tw-text-opacity: 1; + color: rgb(68 64 60 / var(--tw-text-opacity)); +} + .text-stone-500 { --tw-text-opacity: 1; color: rgb(120 113 108 / var(--tw-text-opacity)); @@ -1928,10 +1917,6 @@ video { transition-duration: 150ms !important; } -.duration-150 { - transition-duration: 150ms; -} - .duration-100 { transition-duration: 100ms; } @@ -1960,21 +1945,16 @@ video { border-color: rgb(20 184 166 / var(--tw-border-opacity)); } -.hover\:border-teal-800:hover { - --tw-border-opacity: 1; - border-color: rgb(17 94 89 / var(--tw-border-opacity)); -} - -.hover\:bg-gray-200:hover { - --tw-bg-opacity: 1; - background-color: rgb(229 231 235 / var(--tw-bg-opacity)); -} - .hover\:bg-stone-50:hover { --tw-bg-opacity: 1; background-color: rgb(250 250 249 / var(--tw-bg-opacity)); } +.hover\:bg-teal-700:hover { + --tw-bg-opacity: 1; + background-color: rgb(15 118 110 / var(--tw-bg-opacity)); +} + .hover\:bg-teal-500:hover { --tw-bg-opacity: 1; background-color: rgb(20 184 166 / var(--tw-bg-opacity)); @@ -2020,16 +2000,16 @@ video { background-color: rgb(13 148 136 / var(--tw-bg-opacity)); } -.hover\:bg-teal-700:hover { - --tw-bg-opacity: 1; - background-color: rgb(15 118 110 / var(--tw-bg-opacity)); -} - .hover\:bg-yellow-600:hover { --tw-bg-opacity: 1; background-color: rgb(202 138 4 / var(--tw-bg-opacity)); } +.hover\:text-stone-800:hover { + --tw-text-opacity: 1; + color: rgb(41 37 36 / var(--tw-text-opacity)); +} + .hover\:text-stone-50:hover { --tw-text-opacity: 1; color: rgb(250 250 249 / var(--tw-text-opacity)); @@ -2050,16 +2030,6 @@ video { color: rgb(68 64 60 / var(--tw-text-opacity)); } -.hover\:text-stone-800:hover { - --tw-text-opacity: 1; - color: rgb(41 37 36 / var(--tw-text-opacity)); -} - -.hover\:text-teal-800:hover { - --tw-text-opacity: 1; - color: rgb(17 94 89 / var(--tw-text-opacity)); -} - .hover\:underline:hover { -webkit-text-decoration-line: underline; text-decoration-line: underline; @@ -2154,4 +2124,61 @@ video { .md\:max-w-md { max-width: 28rem; } +} + +@media (min-width: 1024px) { + .lg\:inline { + display: inline; + } + + .lg\:hidden { + display: none; + } + + .lg\:w-1\/2 { + width: 50%; + } + + .lg\:w-1\/4 { + width: 25%; + } + + .lg\:w-3\/4 { + width: 75%; + } + + .lg\:flex-row { + flex-direction: row; + } + + .lg\:border-b-4 { + border-bottom-width: 4px; + } + + .lg\:bg-white { + --tw-bg-opacity: 1; + background-color: rgb(255 255 255 / var(--tw-bg-opacity)); + } + + .lg\:p-3 { + padding: 0.75rem; + } + + .lg\:px-4 { + padding-left: 1rem; + padding-right: 1rem; + } + + .lg\:pt-4 { + padding-top: 1rem; + } + + .lg\:pb-3 { + padding-bottom: 0.75rem; + } + + .lg\:text-black { + --tw-text-opacity: 1; + color: rgb(0 0 0 / var(--tw-text-opacity)); + } } \ No newline at end of file diff --git a/system/typemill/author/layouts/layoutSystem.twig b/system/typemill/author/layouts/layoutSystem.twig index 54a0b12..7f4ae67 100644 --- a/system/typemill/author/layouts/layoutSystem.twig +++ b/system/typemill/author/layouts/layoutSystem.twig @@ -34,11 +34,11 @@ {% include 'partials/flash.twig' %} -
-