Compare commits

..

No commits in common. "cbcb3f1c5a853b4caf01588653bb842b63cb8102" and "2a97a3b2c7a139ffaf0df12688409462db788f95" have entirely different histories.

4 changed files with 7 additions and 38 deletions

View File

@ -106,7 +106,6 @@ the_header(
</div> </div>
</div> </div>
<?php if(CURRENT_USER): ?> <?php if(CURRENT_USER): ?>
<?php if($context['usermenu_recipe_prefetch']): ?>
<div class="daily-meals"> <div class="daily-meals">
<h2 class="title">Your Menu for <?= date("l"); ?></h2> <h2 class="title">Your Menu for <?= date("l"); ?></h2>
<div class="daily-meals-grid"> <div class="daily-meals-grid">
@ -117,12 +116,6 @@ the_header(
?> ?>
</div> </div>
</div> </div>
<?php else: ?>
<div class="daily-meals">
<h2 class="title">No meals added for <?= date("l"); ?></h2>
<p class="no-daily-meals-msg">You have not added any recipes for <?= date("l");?>, please go to the catalog and add recipes.</p>
</div>
<?php endif; ?>
<?php endif; ?> <?php endif; ?>
</div> </div>

View File

@ -5,7 +5,7 @@
<div class="daily-meal-info"> <div class="daily-meal-info">
<div class="daily-meal-title"> <div class="daily-meal-title">
<h3><?= $recipe->field_title ?></h3> <h3><?= $recipe->field_title ?></h3>
<span class="meta"><i class="fa-regular fa-clock"></i> <?= $recipe->field_estimated_time ?> mins to make</span> <span class="meta"><i class="fa-regular fa-clock"></i><?= $recipe->field_estimated_time ?>mins to make</span>
</div> </div>
<div class="daily-meal-ingredients"> <div class="daily-meal-ingredients">
<ul class="ingredients-list"> <ul class="ingredients-list">

View File

@ -17,7 +17,6 @@ the_header(
<?php <?php
foreach ($context['weeks'] as $day => $recipe_prefetches) { foreach ($context['weeks'] as $day => $recipe_prefetches) {
?> ?>
<?php if(!empty($recipe_prefetches)): ?>
<div class="daily-meals"> <div class="daily-meals">
<h2 class="title">Your Menu for <?= ucfirst($day) ?></h2> <h2 class="title">Your Menu for <?= ucfirst($day) ?></h2>
<div class="daily-meals-grid"> <div class="daily-meals-grid">
@ -29,12 +28,6 @@ foreach ($context['weeks'] as $day => $recipe_prefetches) {
?> ?>
</div> </div>
</div> </div>
<?php else: ?>
<div class="daily-meals">
<h2 class="title">No meals added for <?= ucfirst($day); ?></h2>
<p class="no-daily-meals-msg">You have not added any recipes for <?= ucfirst($day);?>, please go to the catalog and add recipes.</p>
</div>
<?php endif; ?>
<?php <?php
} }
?> ?>

View File

@ -334,15 +334,12 @@ body {
.reviews-grid { .reviews-grid {
display: grid; display: grid;
grid-template-columns: repeat(3, 310px); grid-template-columns: repeat(3, 310px);
grid-auto-rows: 175px; grid-template-rows: repeat(2, 175px);
row-gap: 20px; row-gap: 20px;
column-gap: 50px; column-gap: 50px;
} }
.recent-review { .recent-review {
display: flex;
flex-direction: column;
justify-content: space-around;
height: 100%; height: 100%;
width: 310px; width: 310px;
padding: 15px; padding: 15px;
@ -409,7 +406,7 @@ body {
.daily-meals-grid { .daily-meals-grid {
display: grid; display: grid;
grid-template-columns: repeat(2, 300px); grid-template-columns: repeat(2, 300px);
grid-auto-rows: auto; grid-template-rows: repeat(3, 100px);
row-gap: 20px; row-gap: 20px;
column-gap: 20px; column-gap: 20px;
margin: 0 auto; margin: 0 auto;
@ -455,7 +452,6 @@ body {
font-family: var(--title-font); font-family: var(--title-font);
font-size: 14px; font-size: 14px;
color: var(--common-text); color: var(--common-text);
margin-bottom: 3px;
} }
@ -473,27 +469,19 @@ body {
} }
.ingredients-list { .ingredients-list {
/* columns: 2;
-webkit-columns: 2;
-moz-columns: 2; */
margin-left: 15px; margin-left: 15px;
display: grid; display: grid;
grid-template-columns: 1fr 1fr; grid-template-columns: 1fr 1fr;
row-gap: 3px; row-gap: 3px;
column-gap: 8px; column-gap: 8px;
padding: 0; padding: 0;
height: 100%;
} }
.ingredients-list li { .ingredients-list li {
margin-right: 15px; margin-right: 5px;
max-width: 72px;
}
.daily-meal-ingredients{
height: 100%;
}
.no-daily-meals-msg{
width: 100%;
text-align: center;
} }
@ -1169,11 +1157,6 @@ label {
width: 50%; width: 50%;
} }
.review{
margin-bottom: 20px;
border-bottom: 1px solid #b3b3b3;
}
.subtitle{ .subtitle{
font-family: var(--title-font); font-family: var(--title-font);
font-size: 16px; font-size: 16px;