From 77862b48699a5e1f163337b0fa6f7736a0cf17b7 Mon Sep 17 00:00:00 2001 From: Artur Arseniev Date: Thu, 23 Jun 2016 13:46:39 +0200 Subject: [PATCH] Fix stack property reading from target --- index.html | 47 +++++++++++++++++++-- src/style_manager/view/PropertyStackView.js | 1 + 2 files changed, 45 insertions(+), 3 deletions(-) diff --git a/index.html b/index.html index 6002adc8b..829ad092c 100755 --- a/index.html +++ b/index.html @@ -111,9 +111,17 @@ @@ -122,16 +130,44 @@ background-color: #312833; padding-bottom: 100px; padding-top: 100px; + height: 500px; + color:#eee; + position: relative; + font-weight: 100; + } + .copyright { + background-color: rgba(0, 0, 0, 0.15); + color: rgba(238, 238, 238, 0.5); + bottom: 0; + padding: 1em 0; + position: absolute; + width: 100%; + font-size: 0.75em; + } + .made-with{ + float: left; + width: 50%; + padding: 5px 0; + } + .foot-social-btns{ + float: right; + width: 50%; + text-align: right; + padding: 5px 0; } .clearfix{ clear:both} .header-banner{ - background: url("./img/bg-gr-v.png") repeat scroll left top, rgba(0, 0, 0, 0) url("http://www.freewhd.com/wp-content/uploads/2014/01/work-desk-14949.jpg") no-repeat scroll center center; padding-top: 35px; padding-bottom: 100px; color: #ffffff; font-family: Helvetica, serif; font-weight: 100; + background-image:url("./img/bg-gr-v.png"), url("./img/work-desk.jpg"); + background-attachment:scroll, scroll; + background-position:left top, center center; + background-repeat:repeat-y, no-repeat; + background-size: contain, cover; } .container-width{ width: 100%; @@ -190,11 +226,16 @@ background-color:#d983a6; border-radius:5px; transition: all 0.5s ease; + cursor: pointer; } .lead-btn:hover{ background-color:#ffffff; color:#4c114e; } + .lead-btn:active{ + background-color:#4d114f; + color:#fff; + } .flex-sect{ background-color: #fafafa; padding: 100px 0; @@ -340,7 +381,7 @@ background-color:rgba(0, 0, 0, 0.1); font-size: 35px; text-align: center; - padding: 20px 0; + padding: 35px 0; } .pc-regular{ background-color: #da78a0; diff --git a/src/style_manager/view/PropertyStackView.js b/src/style_manager/view/PropertyStackView.js index 2f7720021..438843f7f 100644 --- a/src/style_manager/view/PropertyStackView.js +++ b/src/style_manager/view/PropertyStackView.js @@ -100,6 +100,7 @@ define(['backbone','./PropertyCompositeView', 'text!./../templates/propertyStack if(this.model.get('detached')){ var valist = propView.componentValue.split(','); result = valist[this.model.get('stackIndex')]; + result = result ? result.trim() : result; }else{ var aStack = this.getStackValues(); var strVar = aStack[this.model.get('stackIndex')];