Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
  • Loading branch information
reiddk committed Sep 21, 2018
2 parents 4863282 + f64f972 commit 9f9b229
Show file tree
Hide file tree
Showing 26 changed files with 1,594 additions and 10 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,12 @@ after_success:
deploy:
- provider: script
skip_cleanup: true
script: npm run release && theme upload -d dist -p $PROD_PASSWORD -s $PROD_SHOP -t $PROD_THEME_ID --force --no-update-notifier --ignores './themekit_ignores'
script: npm run release && theme upload -d dist -p $PROD_PASSWORD -s $PROD_SHOP -t $PROD_THEME_ID --no-update-notifier --ignores './themekit_ignores'
on:
branch: master

- provider: script
skip_cleanup: true
script: theme upload -d dist -p $STAGE_PASSWORD -s $STAGE_SHOP -t $STAGE_THEME_ID --force --no-update-notifier --ignores './themekit_ignores'
script: theme upload -d dist -p $STAGE_PASSWORD -s $STAGE_SHOP -t $STAGE_THEME_ID --no-update-notifier --ignores './themekit_ignores'
on:
branch: develop
5 changes: 5 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@
"imports-loader": "^0.8.0",
"jquery": "1.11.0",
"jquery.scrollto": "^2.1.2",
"lazysizes": "^4.1.2",
"lodash": "3.9.3",
"masonry-layout": "3.3.0",
"normalize.css": "^8.0.0",
Expand Down
1 change: 0 additions & 1 deletion src/assets/scripts/util/autofit-images.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ var autoFitImages = {
});
this.loadImagesByWidth(autoFitImages.el.imageString, autoFitImages.el.backgroundString);
this.loadIfNotVisible(0);

},
getClosestWidth: function(element, baseNode) {
var elementWidth = element.offsetWidth;
Expand Down
3 changes: 3 additions & 0 deletions src/assets/styles/app.scss
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,9 @@
@import './sections/story-grid';
@import './sections/testimonials';
@import './sections/cookie-notification';
@import './sections/static-hero';
@import './sections/image-text';
@import './sections/recipe-cards';

// Templates TODO - product entry point
@import './templates/password-page';
Expand Down
23 changes: 23 additions & 0 deletions src/assets/styles/sections/image-text.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
.image-text {
width:100%;
background-size:cover;
background-repeat:no-repeat;
background-position:center;
h2 {
font-family: 'CooperHewitt-Bold';
}
.top-margin {
margin-top: 100px;
}
.button-margin {
margin-top: 25px;
margin-bottom:100px;
a {
padding: 10px 35px !important;
font-family: 'CooperHewitt-Light' !important;
}
}
.image-text-image {
width:100%;
}
}
37 changes: 37 additions & 0 deletions src/assets/styles/sections/recipe-cards.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
.recipe-cards {
margin: 50px 0px;
.grid {
max-width:1200px;
margin:auto;
padding-right:30px;
}
.btn {
width: 100% !important;
font-size: 1.2em;
font-family: 'CooperHewitt-Medium';
}
.section-title {
font-size: 2em;
font-family: 'CooperHewitt-Bold';
}
}

.recipe-card {
margin: 50px 0px;
height: 500px;
position:relative;
width:100%;
background-size:cover;
background-repeat:no-repeat;
background-position:center;
.btn {
position:absolute;
bottom: 0px;
}
.card-title {
color: white;
font-size: 2em;
padding: 20px;
font-family: 'CooperHewitt-Medium';
}
}
20 changes: 20 additions & 0 deletions src/assets/styles/sections/static-hero.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
.static-hero {
height:500px;
width:100%;
background-size:cover;
background-repeat:no-repeat;
background-position:center;
h2 {
font-family: 'CooperHewitt-Bold';
}
.top-margin {
margin-top: 25%;
}
.button-margin {
margin-top: 5%;
a {
padding: 10px 35px !important;
font-family: 'CooperHewitt-Light' !important;
}
}
}
2 changes: 1 addition & 1 deletion src/layout/theme.liquid
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
{% include 'style-tags' %}
{{ content_for_header }}
{% include 'script-tags-head' %}

{%- include 'bold-product' with product, hide_action: 'header' -%}
</head>
<body id="{{ page_title | handle }}" class="{% if customer %}customer-logged-in {% endif %}template-{{ template | replace: '.', ' ' | truncatewords: 1, '' | handle }}" >
<div class="fadeout-overlay"></div>
Expand Down
3 changes: 2 additions & 1 deletion src/sections/cart.liquid
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
Loop through products in the cart
{% endcomment %}
{% for item in cart.items %}
{% include 'bold-cart-item' with item %}
<div class="cart__row">
<div class="grid--full cart__row--table-large">
<div class="grid__item large--one-half">
Expand Down Expand Up @@ -105,7 +106,7 @@
<span class="cart__mini-labels medium-down--one-half medium-down--text-left">{{ 'cart.label.quantity' | t }}</span>

<div class="medium-down--floatL">
<input class='medium-down--one-half medium-down--text-right' type="number" name="updates[]" id="updates_{{ item.id }}" value="{{ item.quantity }}" min="0" data-id="{{item.id}}">
<input class='medium-down--one-half medium-down--text-right' type="number" name="updates[]" id="updates_{{ item.id }}" value="{{ item.quantity }}" min="0" data-id="{{item.id}}" {{ bold_qty_attr }} />
</div>

</div>
Expand Down
1 change: 1 addition & 0 deletions src/sections/collection-template.liquid
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,7 @@
<div class="grid--product-wrapper">
<div class="grid--products grid--full">
{% for product in collection.products %}
{% include 'bold-product' with product, hide_action: 'skip' %}
{% include 'easylockdown_filter_collection' with product %}
{% assign hover_class = section.settings.collection_style %}
{% assign fit_image_class = 'grid__item--variable-height grid__image' %}
Expand Down
116 changes: 116 additions & 0 deletions src/sections/image-text.liquid
Original file line number Diff line number Diff line change
@@ -0,0 +1,116 @@

<div class="image-text">
<div class="grid" style="max-width:1200px;margin:auto;">
<div class="grid__item">
<div class="grid">
{% if section.settings.text_orientation == 'two' %}
<div class="grid__item large--one-half">
{% assign imageWidths = "400 600 800 1000" %}
{% assign imageObject = section.settings.section_image %}
{% assign imageClasses = 'image-text-image' %}
{% include 'lazy-load-image' %}
</div>
{% endif %}
<div class="grid__item large--one-half">
<div class="top-margin">
<h2 style="color:{{section.settings.header_color}}">{{section.settings.header}}</h2>
<hr class="accent">
<div style="color: {{section.settings.text_color}}">{{section.settings.text}}</div>
<div class="button-margin">
{% assign text = section.settings.button_text %}
{% assign url = section.settings.button_link %}
{% include 'cta-button' %}
</div>
</div>
</div>
{% if section.settings.text_orientation == 'one' %}
<div class="grid__item large--one-half">
{% assign imageWidths = "400 600 800 1000" %}
{% assign imageObject = section.settings.section_image %}
{% assign imageClasses = 'image-text-image' %}
{% include 'lazy-load-image' %}
</div>
{% endif %}
</div>
</div>

</div>
</div>

{% if section.settings.static_image_background %}
{% assign backgroundImageWidths = "1100 1300 1500" %}
{% assign backgroundClass = ".image-text" %}
{% assign imageObject = section.settings.static_image_background %}
{% include 'lazy-load-background' %}
{% endif %}

{% schema %}
{
"name": "Image Text",
"class": "image-text-wrapper",
"settings": [
{
"type": "image_picker",
"id": "section_image",
"label": "Section Image",
"info": "Required."
},
{
"type": "image_picker",
"id": "static_image_background",
"label": "Section Background Image",
"info": "Make at least 1100 px wide"
},
{
"type": "radio",
"id": "text_orientation",
"label": "Text left vs Text right",
"options": [
{ "value": "one", "label": "Text left" },
{ "value": "two", "label": "Text right" }
],
"default": "two",
"info": "This determines the orientation of this section"
},
{
"type":"text",
"id":"header",
"label":"Section 2 Headline",
"default":"BEST BLENDER"
},
{
"type": "color",
"id": "header_color",
"label": "Header Color",
"default": "#000000"
},
{
"type":"text",
"id":"text",
"label":"Text",
"default":"Every Blendtec is professional-grade with the most powerful motors in the industry, the longest warranty in the business, and fashion-forward industrial designs that look great on your countertop. Blendtec blenders are the most advanced blenders you can buy."
},
{
"type": "color",
"id": "text_color",
"label": "Text Color",
"default": "#000000"
},
{
"type":"text",
"id": "button_text",
"label":"Button Text",
"default":"Get Yours"
},
{
"type": "url",
"id": "button_link",
"label": "Button Link"
}
],
"presets": [{
"name": "Image Text",
"category": "Text"
}]
}
{% endschema %}
1 change: 1 addition & 0 deletions src/sections/product-main-template.liquid
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
- http://schema.org/docs/gs.html
{% endcomment %}
{% include 'bold-product' with product, hide_action: 'break', output: 'none' %}
{% assign on_sale = false %}
{% if product.compare_at_price > product.price %}
{% unless hide_on_sale_badge %}
Expand Down
1 change: 1 addition & 0 deletions src/sections/product-template.liquid
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
- http://schema.org/docs/gs.html
{% endcomment %}
{% include 'bold-product' with product, hide_action: 'break', output: 'none' %}
{% assign on_sale = false %}
{% if product.compare_at_price > product.price %}
{% unless hide_on_sale_badge %}
Expand Down
81 changes: 81 additions & 0 deletions src/sections/recipe-cards.liquid
Original file line number Diff line number Diff line change
@@ -0,0 +1,81 @@

<div class="recipe-cards">
<div class="grid">
<div class="grid__item large--two-thirds medium--two-thirds section-title">{{section.settings.section_title}}</div>
<div class="grid__item large--one-third medium--one-third">
{% assign text = section.settings.more_recipes %}
{% assign url = section.settings.recipes_link %}
{% include 'cta-button' %}
</div>
</div>
<div class="grid">
{% assign viewRecipes = section.settings.view_recipe %}
<div class="grid__item large--one-third medium--one-third">
{% assign art = articles[section.settings.featured_article] %}
{% assign cardClass = 'recipe-card-1' %}
{% include 'recipe-card' %}
</div>
<div class="grid__item large--one-third medium--one-third">
{% assign art = articles[section.settings.featured_article_2] %}
{% assign cardClass = 'recipe-card-2' %}
{% include 'recipe-card' %}
</div>
<div class="grid__item large--one-third medium--one-third">
{% assign art = articles[section.settings.featured_article_3] %}
{% assign cardClass = 'recipe-card-3' %}
{% include 'recipe-card' %}
</div>
</div>
</div>


{% schema %}
{
"name": "Recipe Cards",
"class": "recipe-cards-wrapper",
"settings": [
{
"type": "article",
"id": "featured_article",
"label": "Choose a recipe you want to display."
},
{
"type": "article",
"id": "featured_article_2",
"label": "Choose a recipe you want to display."
},
{
"type": "article",
"id": "featured_article_3",
"label": "Choose a recipe you want to display."
},
{
"type":"text",
"id":"more_recipes",
"label":"Top Button",
"default":"View More Recipes"
},
{
"type":"text",
"id":"view_recipe",
"label":"View Recipe Button",
"default":"View Recipe"
},
{
"type": "url",
"id": "recipes_link",
"label": "More Recipes Link"
},
{
"type":"text",
"id":"section_title",
"label":"Section title",
"default":"RECIPES"
}
],
"presets": [{
"name": "Recipe Cards",
"category": "Text"
}]
}
{% endschema %}
Loading

0 comments on commit 9f9b229

Please sign in to comment.