From e3c43ac4d04e74b12b7a9985156eb0f79cf8c601 Mon Sep 17 00:00:00 2001 From: Matthias Mair Date: Sat, 23 Apr 2022 01:04:19 +0200 Subject: [PATCH 01/16] refactor functions --- _data/functions/general.yml | 2 +- functions/index.md => functions.md | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) rename functions/index.md => functions.md (96%) diff --git a/_data/functions/general.yml b/_data/functions/general.yml index c1422b50..f159720b 100644 --- a/_data/functions/general.yml +++ b/_data/functions/general.yml @@ -1,6 +1,6 @@ title: InvenTree builds it vast functions on top of a few core workflows link: - internal: functions/index.md + internal: functions.md text: functions: - title: Organize Parts diff --git a/functions/index.md b/functions.md similarity index 96% rename from functions/index.md rename to functions.md index 8fdf7b41..8f7817fc 100644 --- a/functions/index.md +++ b/functions.md @@ -1,5 +1,6 @@ --- layout: default +permalink: /functions --- {% include block/hero.html title='A wealth of functions' title_2='is provided' image='https://dummyimage.com/860x600' color='by default with InvenTree' detail='By default InvenTree ships with a lot of functions in the area of part, inventory, supplier, manufacturer, machine and BOM managment. From c2c4048bb6ca628c86b9c28ff7d73ae14116285c Mon Sep 17 00:00:00 2001 From: Matthias Mair Date: Sat, 23 Apr 2022 01:04:34 +0200 Subject: [PATCH 02/16] add python package to extend --- extend/index.md | 1 + 1 file changed, 1 insertion(+) diff --git a/extend/index.md b/extend/index.md index a021b839..fcda7b3f 100644 --- a/extend/index.md +++ b/extend/index.md @@ -8,5 +8,6 @@ InvenTree is designeds to be part of a larger system of tools to support both ho - [API](api) - [Integrate](integrate) into other tools - Tools for [migrating to InvenTreen](migrate) +- Python [package](https://inventree.readthedocs.io/en/latest/extend/python/) # TODO From 606eb592f49dbddadcf6abb0d9faa0e4a4204713 Mon Sep 17 00:00:00 2001 From: Matthias Mair Date: Sat, 23 Apr 2022 12:52:19 +0200 Subject: [PATCH 03/16] make height constaint simpler --- _layouts/alternatives.html | 2 +- _layouts/content.html | 2 +- _layouts/default.html | 8 ++++++-- _layouts/plugin_highlight.html | 2 +- _layouts/post.html | 2 +- blog.html | 2 +- 6 files changed, 11 insertions(+), 7 deletions(-) diff --git a/_layouts/alternatives.html b/_layouts/alternatives.html index 837b61a4..5c49c134 100644 --- a/_layouts/alternatives.html +++ b/_layouts/alternatives.html @@ -1,7 +1,7 @@ --- layout: content --- -
+
{% include partial/alert.html style='info' title='caveat' diff --git a/_layouts/content.html b/_layouts/content.html index a2a72a19..6bb16c43 100644 --- a/_layouts/content.html +++ b/_layouts/content.html @@ -2,7 +2,7 @@ layout: default --- -
- + +
{% include base/header.html %} - {{ content }} +
+
+
{% include base/footer.html %} +
diff --git a/_layouts/plugin_highlight.html b/_layouts/plugin_highlight.html index ef5cdf9e..7f030e58 100644 --- a/_layouts/plugin_highlight.html +++ b/_layouts/plugin_highlight.html @@ -1,7 +1,7 @@ --- layout: content --- -
+

{{ page.title }}

{{ content }} {% if page.plugin %} diff --git a/_layouts/post.html b/_layouts/post.html index 048e7f5a..ff1b535f 100644 --- a/_layouts/post.html +++ b/_layouts/post.html @@ -15,7 +15,7 @@ layout: default {% endif %} -
+

{{ page.title }}

{{ page.date | date_to_string }} diff --git a/blog.html b/blog.html index 70a3fd09..a54f32c7 100644 --- a/blog.html +++ b/blog.html @@ -3,7 +3,7 @@ layout: default title: Blog permalink: /blog --- -

+

InvenTree Blog

From d7ba89e5ec95d544c74314b6dff1ca1cd7918974 Mon Sep 17 00:00:00 2001 From: Matthias Mair Date: Sat, 23 Apr 2022 12:58:05 +0200 Subject: [PATCH 04/16] reduce styling code --- _layouts/alternatives.html | 2 +- _layouts/content.html | 2 +- _layouts/plugin_highlight.html | 2 +- _layouts/post.html | 2 +- assets/index.css | 4 ++++ 5 files changed, 8 insertions(+), 4 deletions(-) diff --git a/_layouts/alternatives.html b/_layouts/alternatives.html index 5c49c134..447c6060 100644 --- a/_layouts/alternatives.html +++ b/_layouts/alternatives.html @@ -1,7 +1,7 @@ --- layout: content --- -
+
{% include partial/alert.html style='info' title='caveat' diff --git a/_layouts/content.html b/_layouts/content.html index 6bb16c43..df620392 100644 --- a/_layouts/content.html +++ b/_layouts/content.html @@ -2,7 +2,7 @@ layout: default --- -
+

{{ page.title }}

{{ content }} {% if page.plugin %} diff --git a/_layouts/post.html b/_layouts/post.html index ff1b535f..ab438757 100644 --- a/_layouts/post.html +++ b/_layouts/post.html @@ -15,7 +15,7 @@ layout: default {% endif %} -
+

{{ page.title }}

{{ page.date | date_to_string }} diff --git a/assets/index.css b/assets/index.css index 8bac2d6d..e897d3ce 100644 --- a/assets/index.css +++ b/assets/index.css @@ -8,6 +8,10 @@ layout: empty @layer components { + article { + @apply prose prose-sm sm:prose lg:prose-lg xl:prose-xl mx-auto + } + .custom-underline-blue { @apply border-b-4 border-blue-400; } From 59d9adc6e22269f8ce3ab4fc3cd6eb2af878b716 Mon Sep 17 00:00:00 2001 From: Matthias Mair Date: Sat, 23 Apr 2022 13:05:16 +0200 Subject: [PATCH 05/16] fix django link --- assets/index.css | 4 ++++ deploy/index.md | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/assets/index.css b/assets/index.css index e897d3ce..c3533fa0 100644 --- a/assets/index.css +++ b/assets/index.css @@ -74,4 +74,8 @@ layout: empty position: initial; @apply list-none } + + .max-w-p90 { + max-width: 90% + } } diff --git a/deploy/index.md b/deploy/index.md index 3d66270c..d01581fd 100644 --- a/deploy/index.md +++ b/deploy/index.md @@ -12,4 +12,4 @@ There are multiple methods to deploy InvenTree. The most popular (and by the dev ### Other Options -The core InvenTree server is built using the widely used python-based framework [Django](https://django.org/). Therefore there are deployment methods for nearly all plattforms and architectures. If you want to read more about InvenTree's structure and a typical installation read the [architecture overview](../contribute/code/architecture). \ No newline at end of file +The core InvenTree server is built using the widely used python-based framework [Django](https://djangoproject.com/). Therefore there are deployment methods for nearly all plattforms and architectures. If you want to read more about InvenTree's structure and a typical installation read the [architecture overview](../contribute/code/architecture). \ No newline at end of file From 128cb8a6f457e82713047d31a17b4afdf92193e5 Mon Sep 17 00:00:00 2001 From: Matthias Mair Date: Sat, 23 Apr 2022 13:05:58 +0200 Subject: [PATCH 06/16] fix footer style --- _includes/base/footer.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/_includes/base/footer.html b/_includes/base/footer.html index 8e7a8c83..1941fb2b 100644 --- a/_includes/base/footer.html +++ b/_includes/base/footer.html @@ -1,5 +1,5 @@

-
+
logo @@ -8,11 +8,11 @@

{{ site.tagline }}

-
+
{% assign footer = footer|default: site.data.general.footer %} {% for cat in footer %} -
+

{{ cat.title }}

+
\ No newline at end of file diff --git a/assets/github.svg b/assets/github.svg new file mode 100644 index 00000000..dee6ea38 --- /dev/null +++ b/assets/github.svg @@ -0,0 +1 @@ + \ No newline at end of file From d8071f2cb3cca417e41149b6b0b72c18d31f7c65 Mon Sep 17 00:00:00 2001 From: Matthias Mair Date: Sat, 23 Apr 2022 13:52:20 +0200 Subject: [PATCH 14/16] add links to footer --- _includes/base/footer.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/_includes/base/footer.html b/_includes/base/footer.html index fd9412f7..5db44b07 100644 --- a/_includes/base/footer.html +++ b/_includes/base/footer.html @@ -9,11 +9,12 @@
- {% assign footer = footer|default: site.data.general.footer %} {% for cat in footer %}
-

{{ cat.title }}

+

+ {% if cat.link %}{% endif %}{{cat.title}}{% if cat.link %}{% endif %} +

{% endfor %} -
From 1db079e5127d5591b0bfbe57679068b776f6a34d Mon Sep 17 00:00:00 2001 From: Matthias Mair Date: Sat, 23 Apr 2022 14:03:55 +0200 Subject: [PATCH 15/16] clean up svg --- _includes/block/features.html | 4 ++-- _includes/block/functions.html | 4 ++-- _includes/fnc/learn_more.html | 3 --- _includes/partial/alert.html | 2 +- _layouts/post.html | 6 +----- assets/back.svg | 1 + assets/info.svg | 1 + assets/learn.svg | 1 + 8 files changed, 9 insertions(+), 13 deletions(-) delete mode 100644 _includes/fnc/learn_more.html create mode 100644 assets/back.svg create mode 100644 assets/info.svg create mode 100644 assets/learn.svg diff --git a/_includes/block/features.html b/_includes/block/features.html index d5b0ba3d..554a528a 100644 --- a/_includes/block/features.html +++ b/_includes/block/features.html @@ -7,7 +7,7 @@

{{ include.data.title }}

{% if include.link %} {% assign link=include.data.link|default:include.link %} - {% include fnc/learn_more.html %} + {% endif %}
@@ -25,7 +25,7 @@ {% if include.extend and item.extend %}

{{ item.extend }}{% endif %}

{% if item.link %} - Learn More {% include fnc/learn_more.html %} + Learn More {% endif %} diff --git a/_includes/block/functions.html b/_includes/block/functions.html index d6772322..4cc26d2d 100644 --- a/_includes/block/functions.html +++ b/_includes/block/functions.html @@ -11,7 +11,7 @@ {% if include.data.title %}

{{ include.data.title }}

{% endif %} {% if include.data.text %}

{{ include.data.text }}

{% endif %} {% if include.data.link and include.no_link != true %} - Learn More {% include fnc/learn_more.html %} + Learn More {% endif %} {% endif %} @@ -25,7 +25,7 @@ {% if include.extend and item.extend %}

{{ item.extend }}{% endif %}

{% if item.link %} - Learn More {% include fnc/learn_more.html %} + Learn More {% endif %} {% endfor %} diff --git a/_includes/fnc/learn_more.html b/_includes/fnc/learn_more.html deleted file mode 100644 index 7196b2b0..00000000 --- a/_includes/fnc/learn_more.html +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/_includes/partial/alert.html b/_includes/partial/alert.html index bcb50576..1040d9bc 100644 --- a/_includes/partial/alert.html +++ b/_includes/partial/alert.html @@ -1,7 +1,7 @@