@@ -26,6 +26,10 @@
{{/if}}

{{/ if }}
<br>
<br>
<br>
<a class="text-1">I'm expecting</a>

</div>
</div>
@@ -17,7 +17,8 @@
}

.child-info{
margin: 0 1rem 0.5rem 1rem;
width: 70%;
margin-left: 15%;
}

.universe-preview:after{
@@ -36,7 +36,7 @@ <h1 class="child-name text-caps text-xbold gap-bottom-2-5 show-for-large-up">{{{

{{ else }}

Almost there – your universe still needs {{#if moreColors}}{{numberAsWords moreColors}} more {{plural moreColors 'colours'}} {{/if}}{{#if moreColors}}{{#if moreLooks}}and {{/if}}{{/if}}{{#if moreLooks}}{{numberAsWords moreLooks}} more {{plural moreLooks 'look'}}{{/if}}. <a href="/editor/{{ _id }}">Add {{plural moreColorsAndLooks 'it' 'them' }} now!</a>
Almost there – your universe still needs {{#if moreColors}}{{numberAsWords moreColors}} more {{plural moreColors 'colour'}} {{/if}}{{#if moreColors}}{{#if moreLooks}}and {{/if}}{{/if}}{{#if moreLooks}}{{numberAsWords moreLooks}} more {{plural moreLooks 'look'}}{{/if}}. <a href="/editor/{{ _id }}">Add {{plural moreColorsAndLooks 'it' 'them' }} now!</a>

{{/if}}

@@ -337,7 +337,7 @@ $helpTextHeight: 50px;
transition: opacity 0.2s;
z-index: 100;
opacity: 1;
mix-blend-mode: overlay;
mix-blend-mode: soft-light;
}

&:hover{
@@ -109,9 +109,8 @@
<div class="editor-ui look-picker">

{{#each looks }}


<div class="look-thumb" style="background-image: url({{lookPreview}})">

<div class="look-thumb" style="background-image: url({{thumb}})">
{{#if lookUsed ..}}
<div class="look-used-count">
<span>{{{lookUsed ..}}}</span>
@@ -837,13 +837,8 @@ Template.editor.helpers({
'lookUsed': function(context){
var times = context.universe.looks[this._id];
if(times) return '&times;' + times;
},

'lookPreview': function(){
var img = LookImages.findOne({owner: this._id});
return img.url;
}

}

});

function showPen(){
@@ -4,26 +4,60 @@

{{# columnContainer }}

<div class="pad-top-3 pad-bottom-3 text-2">

<p>You're ordering a box based on these colours:</p>

<p>
{{#each colors}}
{{>swatch color=color size=times}} <span class="text-xbold text-caps">{{name}}</span>
{{/each}}
</p>
<div class="pad-top-3 pad-bottom-6 gap-bottom-6 text-2">

<p>And these looks:</p>

<p>
<div class="row">

<div class="small-9 large-8 columns">

<div class="row">

<div class="medium-6 large-12 gap-bottom-2 columns">

<p class="text-1">You're ordering a box based on these colours:</p>

<p class="small-text-1 medium-text-1-5">
{{#each colors}}
{{>swatch }} <span class="text-xbold text-caps">{{name}}</span>
{{/each}}
</p>

</div>

<div class="medium-6 large-12 gap-bottom-2 columns">

<p class="text-1">And the following looks:</p>

<p class="small-text-1 medium-text-1-5">

{{#each looks}}

{{>lookLabel }}{{listSeparator (count ../universe/looks) i}}
<!--
<span class="{{textClass}} text-caps look-icon">{{> lookIcon }} {{name}}</span>
(&times;{{times}}){{listSeparator (count ../universe/looks) i}}
-->
{{/each}}

</p>

</div>

</div>

{{#each looks}}
<span class="{{textClass}} text-caps">{{> lookIcon }} {{name}}</span>
(&times;{{times}}){{listSeparator (count ../universe/looks) i}}
{{/each}}
</div>

</p>
<div class="small-3a medium-6 large-4 medium-push-3 large-push-0 columns small-pad-bottom-2">

<div class="full-width canvas-ratio pos-rel">

{{> universePreview universe}}

</div>

</div>

</div>

<p>

@@ -93,19 +127,36 @@

{{#if sizingConfirmed }}

<p class='text-2'><b>Deliver this box to:</b></p>
<h3>Deliver this box to:</h3>

{{> addressSelect id="orderFormAddress" select=true }}
<div class="gap-bottom-2">

{{#if sessionGet 'orderFormAddress' }}
{{> addressSelect id="orderFormAddress" select=true }}

<a class="place-order">Order your box!</a>
</div>

{{#if sessionGet 'orderFormAddress' }}

<a class="place-order">Order your box!</a>

{{/if}}

{{/if}}

{{/if}}

{{/ if }}
<p class='text-2'><b>Deliver this box to:</b></p>
<div class="gap-bottom-2">

{{> addressSelect id="orderFormAddress" select=true }}</div>
<p class="organic">
<span class="check {{#if sessionGet 'orderFormOrganicOnly'}}checked{{/if}}"><span class="checkbox"></span><span class="label">Organic Only</span></span>
<br>
</p>
<p class="text-1 gap-bottom-2-5">Most of our brands are organic; please tick this box if you <strong>only</strong> wish to receive organic products.</p>
<a class="place-order">Order your box!</a>
<p class="text-1 gap-bottom-2-5">We'll phone you for a chat, then charge £1 deposit.</p>


</div>

@@ -2,6 +2,7 @@ var GARMENTS_LIST = 'orderFormGarmentsList';
var SIZES_LIST = 'orderFormSizesList';
var SIZES_ENTERED = 'orderFormSizesEntered';
var SIZING_CONFIRMED = 'orderFormSizingConfirmed';
var ORGANIC_ONLY = 'orderFormOrganicOnly';


Template.orderForm.onCreated(function(){
@@ -22,6 +23,7 @@ Template.orderForm.onCreated(function(){
Session.set(SIZES_LIST, sizes);
Session.set(SIZES_ENTERED, {});
Session.set(SIZING_CONFIRMED, false);
Session.set(ORGANIC_ONLY, false);

});

@@ -49,32 +51,14 @@ Template.orderForm.helpers({
.value();

},

'looks': function(){

var minTimes = _.min(this.universe.looks);
var maxTimes = _.max(this.universe.looks);

var maxSize = 2.5;
var minSize = Math.max(maxSize - (maxTimes - minTimes), 1)

return _.chain(this.universe.looks)
.map(function(value, key){

var scaledTimes = scale(value, minTimes, maxTimes, minSize, maxSize);
scaledTimes = nearest(scaledTimes, 0.5);
scaledTimes = String(scaledTimes).replace('.', '-');

var look = Looks.findOne(key);
look.times = value;
look.textClass = 'text-xbold';

return look;

})
.sortBy(function(obj){return obj.times})
.reverse()
.map(function(obj, i){obj.i = i; return obj;})
.value();
return _.map(this.universe.looks, function(value, key){
var look = Looks.findOne(key);
look.times = value;
return look;
})

},

@@ -170,6 +154,10 @@ Template.orderForm.events({
'click .change-sizing': function(){
Session.set('sizingConfirmed', false);
},

'click .organic': function(){
Session.set(ORGANIC_ONLY, !Session.get(ORGANIC_ONLY));
},

'click .place-order': function(event, template){

@@ -1,12 +1,12 @@
.profile-logo{

height: 60%;
height: 70%;

.center{
width: 80%;

img{
//transform: rotate(-90deg);
transform: rotate(-90deg);
transform-origin: 50% 50%;
}

Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

Large diffs are not rendered by default.