diff --git a/changelog/53_UNRELEASED_2019-xx-xx.md b/changelog/53_UNRELEASED_2019-xx-xx.md new file mode 100644 index 00000000..3f9a793a --- /dev/null +++ b/changelog/53_UNRELEASED_2019-xx-xx.md @@ -0,0 +1,2 @@ +- It's now possible to display a recipe directly from the meal plan (new "eye button") (thanks @kriddles) +- Some style/CSS detail-refinements diff --git a/localization/strings.pot b/localization/strings.pot index c3efd480..136583c5 100644 --- a/localization/strings.pot +++ b/localization/strings.pot @@ -1516,3 +1516,6 @@ msgstr "" msgid "Miss" msgstr "" + +msgid "Display recipe" +msgstr "" diff --git a/public/css/grocy.css b/public/css/grocy.css index 88399a17..c18d820d 100644 --- a/public/css/grocy.css +++ b/public/css/grocy.css @@ -58,6 +58,10 @@ a.discrete-link:focus { left: 0; overflow: auto; } + + body.fullscreen-card { + overflow: hidden; + } .form-check-input.is-valid ~ .form-check-label, .was-validated .form-check-input:valid ~ .form-check-label { diff --git a/public/viewjs/mealplan.js b/public/viewjs/mealplan.js index 871411f5..bc432b65 100644 --- a/public/viewjs/mealplan.js +++ b/public/viewjs/mealplan.js @@ -103,7 +103,7 @@ var calendar = $("#calendar").fullCalendar({ \ \ \ - \ + \ \ '); @@ -305,13 +305,13 @@ $(document).on("click", ".recipe-popup-button", function(e) var objectId = $(e.currentTarget).attr('data-recipe-id'); bootbox.dialog({ - message: '', - size: 'large', + message: '', + size: 'extra-large', backdrop: true, closeButton: false, buttons: { cancel: { - label: __t('Cancel'), + label: __t('Close'), className: 'btn-secondary responsive-button', callback: function() { diff --git a/views/recipes.blade.php b/views/recipes.blade.php index 14cf1ab7..2c2703a2 100644 --- a/views/recipes.blade.php +++ b/views/recipes.blade.php @@ -132,19 +132,19 @@
{{ $selectedRecipe->name }}   - + - +    - + - + - +