Skip to content

Commit

Permalink
Merge pull request #7 from freshjuice-dev/develop
Browse files Browse the repository at this point in the history
Update Theme's modules and templates
  • Loading branch information
reatlat authored Jul 11, 2024
2 parents fc4cd16 + 422406c commit 0ef0b80
Show file tree
Hide file tree
Showing 23 changed files with 220 additions and 1,315 deletions.
30 changes: 4 additions & 26 deletions theme/css/tailwind.css
Original file line number Diff line number Diff line change
Expand Up @@ -2223,6 +2223,10 @@ lite-youtube.lyt-activated > .lty-playbtn{
justify-content:space-between;
}

.fj-gap-1{
gap:0.25rem;
}

.fj-gap-16{
gap:4rem;
}
Expand All @@ -2239,10 +2243,6 @@ lite-youtube.lyt-activated > .lty-playbtn{
gap:2rem;
}

.fj-gap-1{
gap:0.25rem;
}

.fj-gap-x-1{
-moz-column-gap:0.25rem;
column-gap:0.25rem;
Expand Down Expand Up @@ -2326,24 +2326,12 @@ lite-youtube.lyt-activated > .lty-playbtn{
border-left-width:calc(1px * calc(1 - var(--fj-divide-x-reverse)));
}

.fj-divide-x-4 > :not([hidden]) ~ :not([hidden]){
--fj-divide-x-reverse:0;
border-right-width:calc(4px * var(--fj-divide-x-reverse));
border-left-width:calc(4px * calc(1 - var(--fj-divide-x-reverse)));
}

.fj-divide-y > :not([hidden]) ~ :not([hidden]){
--fj-divide-y-reverse:0;
border-top-width:calc(1px * calc(1 - var(--fj-divide-y-reverse)));
border-bottom-width:calc(1px * var(--fj-divide-y-reverse));
}

.fj-divide-y-4 > :not([hidden]) ~ :not([hidden]){
--fj-divide-y-reverse:0;
border-top-width:calc(4px * calc(1 - var(--fj-divide-y-reverse)));
border-bottom-width:calc(4px * var(--fj-divide-y-reverse));
}

.fj-divide-gray-100 > :not([hidden]) ~ :not([hidden]){
--fj-divide-opacity:1;
border-color:rgb(243 244 246 / var(--fj-divide-opacity));
Expand All @@ -2353,11 +2341,6 @@ lite-youtube.lyt-activated > .lty-playbtn{
border-color:rgb(17 24 39 / 0.05);
}

.fj-divide-white > :not([hidden]) ~ :not([hidden]){
--fj-divide-opacity:1;
border-color:rgb(255 255 255 / var(--fj-divide-opacity));
}

.fj-overflow-hidden{
overflow:hidden;
}
Expand Down Expand Up @@ -2694,11 +2677,6 @@ lite-youtube.lyt-activated > .lty-playbtn{
padding-bottom:0.75rem;
}

.fj-py-32{
padding-top:8rem;
padding-bottom:8rem;
}

.fj-py-4{
padding-top:1rem;
padding-bottom:1rem;
Expand Down
Binary file removed theme/images/team-image.jpg
Binary file not shown.
Binary file modified theme/images/template-previews/about.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added theme/images/watermelon-juice-sharing.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions theme/modules/blog-listing.module/module.html
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@
{% if featured_post.featured_image %}
{% set featured_image = resize_image_url( featured_post.featured_image, 600, 315, 600 ) %}
{% endif %}
<img src="{{ featured_image or 'https://source.unsplash.com/600x315/?fresh+juice' }}"
<img src="{{ featured_image or 'https://resources.freshjuice.dev/images/600/composition-with-glass-of-watermelon-juice-and-sli.jpg' }}"
alt="{{ featured_post.name | striptags | safe }}"
width="600" height="315"
class="fj-m-0 fj-w-full md:fj-h-full fj-object-cover fj-aspect-video"/>
Expand Down Expand Up @@ -144,7 +144,7 @@ <h2 class="fj-text-xl md:fj-text-2xl lg:fj-text-4xl fj-mb-3">
{% if content.featured_image %}
{% set featured_image = resize_image_url( content.featured_image, 360, 189, 360 ) %}
{% endif %}
<img src="{{ featured_image or 'https://source.unsplash.com/600x315/?fresh+juice' }}"
<img src="{{ featured_image or 'https://resources.freshjuice.dev/images/400/a-rainbow-of-refreshments-a-table-filled-with-gla.jpg' }}"
alt="{{ content.name | striptags | safe }}"
width="360" height="189"
class="fj-m-0 fj-w-full fj-object-cover fj-aspect-video"/>
Expand Down
10 changes: 5 additions & 5 deletions theme/modules/price-card-with-details.module/fields.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,9 @@
"default" : "What's included"
}, {
"id" : "a0b675a1-c232-5c7a-d638-4789a941e235",
"name" : "features_item",
"name" : "features_list",
"display_width" : null,
"label" : "Features Item",
"label" : "Features List",
"required" : false,
"locked" : false,
"occurrence" : {
Expand All @@ -68,7 +68,7 @@
"title" : "Juicy Permanent",
"description" : "The best, the mightiest, the bravest juices and smoothies are there to help you smooth up for the day.",
"divider_text" : "What's included",
"features_item" : [ "Permanent Juiciness", "VIP access to secret Juicy Events", "Private Juice and Smoothie Butlers", "Hotels Secret Juice Service" ]
"features_list" : [ "Permanent Juiciness", "VIP access to secret Juicy Events", "Private Juice and Smoothie Butlers", "Hotels Secret Juice Service" ]
}
}, {
"id" : "108c4f09-fc25-b23c-13b5-48538075edb8",
Expand Down Expand Up @@ -126,7 +126,7 @@
"default" : {
"url" : {
"content_id" : null,
"href" : "https://source.unsplash.com/random/1024x1024/?infinite+smoothie",
"href" : "#nada",
"type" : "EXTERNAL"
},
"open_in_new_tab" : false,
Expand Down Expand Up @@ -168,7 +168,7 @@
"cta_link" : {
"url" : {
"content_id" : null,
"href" : "https://source.unsplash.com/random/1024x1024/?infinite+smoothie",
"href" : "#nada",
"type" : "EXTERNAL"
},
"open_in_new_tab" : false,
Expand Down
2 changes: 1 addition & 1 deletion theme/modules/price-card-with-details.module/module.html
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
{% endif %}

<ul role="list" class="fj-grid fj-grid-cols-1 fj-gap-4 fj-text-sm fj-leading-6 fj-text-gray-600 md:fj-grid-cols-2 md:fj-gap-6">
{% for item in module.two_column_group.features_item %}
{% for item in module.two_column_group.features_list %}
<li class="fj-flex fj-gap-x-3">
<svg class="fj-size-6 fj-flex-none fj-text-blue-600" viewBox="0 0 20 20" fill="currentColor" aria-hidden="true">
<path fill-rule="evenodd" d="M16.704 4.153a.75.75 0 01.143 1.052l-8 10.5a.75.75 0 01-1.127.075l-4.5-4.5a.75.75 0 011.06-1.06l3.894 3.893 7.48-9.817a.75.75 0 011.05-.143z" clip-rule="evenodd" />
Expand Down
Loading

0 comments on commit 0ef0b80

Please sign in to comment.