diff --git a/README.md b/README.md index 28dc83ed..4398c00f 100644 --- a/README.md +++ b/README.md @@ -96,7 +96,7 @@ Share some information on how you use Tandoor to help me improve the application Beginning with version 0.10.0 the code in this repository is licensed under the [GNU AGPL v3](https://www.gnu.org/licenses/agpl-3.0.de.html) license with a [common clause](https://commonsclause.com/) selling exception. See [LICENSE.md](https://github.com/vabene1111/recipes/blob/develop/LICENSE.md) for details. -> NOTE: There appears to be a whole range of legal issues with licensing anything else then the standard completely open licenses. +> NOTE: There appears to be a whole range of legal issues with licensing anything other than the standard completely open licenses. > I am in the process of getting some professional legal advice to sort out these issues. > Please also see [Issue 238](https://github.com/vabene1111/recipes/issues/238) for some discussion and **reasoning** regarding the topic. diff --git a/cookbook/templates/base.html b/cookbook/templates/base.html index 4bade1a5..14b3a18f 100644 --- a/cookbook/templates/base.html +++ b/cookbook/templates/base.html @@ -10,7 +10,7 @@ {% block title %} {% endblock %} - + @@ -481,6 +481,14 @@ overflow-x: hidden; } } + + #id_base_container { + padding-bottom: env(safe-area-inset-bottom); + } + + .fixed-bottom { + padding-bottom: max(0.5rem, calc(env(safe-area-inset-bottom) - 0.5rem)) !important; + } diff --git a/docs/system/backup.md b/docs/system/backup.md index 308e3561..39f4a302 100644 --- a/docs/system/backup.md +++ b/docs/system/backup.md @@ -45,7 +45,7 @@ To restore: cat pgdump.sql | sudo docker exec -i docker_db_recipes_1 psql postgres -U djangouser ``` -This connects to the postgres table instead of the actual dgangodb table, as the import function needs to delete the table, which can't be dropped off you're connected to it. +This connects to the postgres table instead of the actual djangodb table, as the import function needs to delete the table, which can't be dropped off you're connected to it. ## Backup using export and import You can now export recipes from Tandoor using the export function. This method requires a working web interface. diff --git a/docs/system/updating.md b/docs/system/updating.md index b6d88588..404da607 100644 --- a/docs/system/updating.md +++ b/docs/system/updating.md @@ -81,7 +81,7 @@ sudo mv -R ~/.docker/compose/postgres ~/.docker/compose/postgres.old ``` 8. Install postgres extensions ``` bash - docker exec -it {{database_container}} psql + docker exec -it {{database_container}} psql postgres -U {{djangouser}} ``` then ``` psql diff --git a/requirements.txt b/requirements.txt index 297e3e77..99b2e99f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -14,7 +14,7 @@ bleach==6.0.0 gunicorn==20.1.0 lxml==4.9.3 Markdown==3.5.1 -Pillow==10.1.0 +Pillow==10.2.0 psycopg2-binary==2.9.5 python-dotenv==1.0.0 requests==2.31.0 diff --git a/vue/package.json b/vue/package.json index 23be9a3f..4f56ee31 100644 --- a/vue/package.json +++ b/vue/package.json @@ -45,7 +45,7 @@ "vue-template-compiler": "2.7.14", "vue2-touch-events": "^3.2.2", "vuedraggable": "^2.24.3", - "workbox-webpack-plugin": "^6.5.4", + "workbox-webpack-plugin": "^7.0.0", "workbox-window": "^7.0.0" }, "devDependencies": { diff --git a/vue/src/apps/RecipeEditView/RecipeEditView.vue b/vue/src/apps/RecipeEditView/RecipeEditView.vue index 7fd5dbe7..74ff16a4 100644 --- a/vue/src/apps/RecipeEditView/RecipeEditView.vue +++ b/vue/src/apps/RecipeEditView/RecipeEditView.vue @@ -1321,3 +1321,9 @@ textarea:not(.form-control) { border: 0 !important; } + + diff --git a/vue/src/components/BottomNavigationBar.vue b/vue/src/components/BottomNavigationBar.vue index 3801d9bd..23b0a244 100644 --- a/vue/src/components/BottomNavigationBar.vue +++ b/vue/src/components/BottomNavigationBar.vue @@ -108,4 +108,4 @@ export default { -o-transform: translate(-50%, 0); transform: translate(-50%, 0); } - \ No newline at end of file + diff --git a/vue/src/components/Buttons/RecipeSwitcher.vue b/vue/src/components/Buttons/RecipeSwitcher.vue index c724eadb..f001cc52 100644 --- a/vue/src/components/Buttons/RecipeSwitcher.vue +++ b/vue/src/components/Buttons/RecipeSwitcher.vue @@ -231,7 +231,7 @@ export default { font-size: 1.25rem; line-height: 1; background-color: transparent; - border: 1px solid rgba(46, 46, 46, 0.5); + border: 1px solid rgba(46, 46, 46, 0.1); border-radius: 0.1875rem; z-index: 1001; } diff --git a/vue/src/components/RecipeCard.vue b/vue/src/components/RecipeCard.vue index 8445be26..53e26992 100755 --- a/vue/src/components/RecipeCard.vue +++ b/vue/src/components/RecipeCard.vue @@ -2,8 +2,7 @@
-