76 files changed, 1442 insertions, 981 deletions
diff --git a/js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.js b/js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.js
index 0c950ffd..ecf0f9cd 100755
--- a/js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.js
+++ b/js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.js
@@ -1691,7 +1691,7 @@ NJCSSStyle.prototype.styleChange = function() {
 NJCSSStyle.prototype.getUnits = function(val) {
    if(val.split(/\s/).length > 1) {
        return false;
-    } else if(/px|em|pt|in|cm|mm|ex|pc|%/.test(val)) {
+    } else if(/(px|em|pt|in|cm|mm|ex|pc|%)$/.test(val)) {
        return val.replace(/^.*(px|em|pt|in|cm|mm|ex|pc|%).*/, '$1');
    }
    return null;
@@ -1771,7 +1771,7 @@ NJCSSStyle.prototype.updateValue = function(newValue, bypassUndo) {
        this.styleChange();
        return true;
    }
-    
    var IMPORTANT_FLAG = ' !important',
        dec = this.njRule.declaration,        
        acceptAsValid = false,
diff --git a/js/panels/Color/colorchippopup.reel/.sass-cache/2fbca323ccf38cf180e7675ba0d8d3e07adeffea/ColorPanelPopup.scssc b/js/panels/Color/colorchippopup.reel/.sass-cache/2fbca323ccf38cf180e7675ba0d8d3e07adeffea/ColorPanelPopup.scssc
deleted file mode 100755
index aa8bf258..00000000
--- a/js/panels/Color/colorchippopup.reel/.sass-cache/2fbca323ccf38cf180e7675ba0d8d3e07adeffea/ColorPanelPopup.scssc
+++ /dev/null
Binary files differ
diff --git a/js/panels/Color/colorchippopup.reel/.sass-cache/6f8390f69a31f1a976968b9c18d0824d78460db2/ColorPanelPopup.scssc b/js/panels/Color/colorchippopup.reel/.sass-cache/6f8390f69a31f1a976968b9c18d0824d78460db2/ColorPanelPopup.scssc
deleted file mode 100755
index fca60390..00000000
--- a/js/panels/Color/colorchippopup.reel/.sass-cache/6f8390f69a31f1a976968b9c18d0824d78460db2/ColorPanelPopup.scssc
+++ /dev/null
Binary files differ
diff --git a/js/panels/Color/colorchippopup.reel/.sass-cache/de22270a8ac487505e8876f1cd16286e094a5127/ColorPanelBase.scssc b/js/panels/Color/colorchippopup.reel/.sass-cache/de22270a8ac487505e8876f1cd16286e094a5127/ColorPanelBase.scssc
deleted file mode 100755
index fd7938d8..00000000
--- a/js/panels/Color/colorchippopup.reel/.sass-cache/de22270a8ac487505e8876f1cd16286e094a5127/ColorPanelBase.scssc
+++ /dev/null
Binary files differ
diff --git a/js/panels/Components/ComponentsPanelBase.reel/ComponentsPanelBase.js b/js/panels/Components/ComponentsPanelBase.reel/ComponentsPanelBase.js
index b6bee37d..3505393c 100755
--- a/js/panels/Components/ComponentsPanelBase.reel/ComponentsPanelBase.js
+++ b/js/panels/Components/ComponentsPanelBase.reel/ComponentsPanelBase.js
@@ -23,6 +23,36 @@ var ComponentsPanelBase = exports.ComponentsPanelBase = Montage.create(Component
            "text": "styles",
            "children": [
                {
+                    "text": "Widgets",
+                    "children": [
+                        {
+                            "text": "Feed Reader",
+                            "dataFile" : "node_modules/components-data/feed-reader.json",
+                            "component": "feedreader"
+                        },
+                        {
+                            "text": "Map",
+                            "dataFile" : "node_modules/components-data/map.json",
+                            "component": "map"
+                        },
+                        {
+                            "text": "Picasa Carousel",
+                            "dataFile" : "node_modules/components-data/picasa-carousel.json",
+                            "component": "picasa-carousel"
+                        },
+                        {
+                            "text": "Search Bar",
+                            "dataFile" : "node_modules/components-data/searchfield.json",
+                            "component": "searchfield"
+                        },
+                        {
+                            "text": "Youtube Channel",
+                            "dataFile" : "node_modules/components-data/youtube-channel.json",
+                            "component": "youtube-channel"
+                        }
+                    ]
+                },
+                {
                    "text": "Montage Components",
                    "children": [
                        {
@@ -50,7 +80,7 @@ var ComponentsPanelBase = exports.ComponentsPanelBase = Montage.create(Component
                            "dataFile" : "node_modules/components-data/number-input.json",
                            "component": "numberInput"
                        },
-                        {
+                       {
                            "

diff --git a/js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.js b/js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.js index 0c950ffd..ecf0f9cd 100755 --- a/js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.js +++ b/js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.js
@@ -1691,7 +1691,7 @@ NJCSSStyle.prototype.styleChange = function() {
1691	NJCSSStyle.prototype.getUnits = function(val) {	1691	NJCSSStyle.prototype.getUnits = function(val) {
1692	if(val.split(/\s/).length > 1) {	1692	if(val.split(/\s/).length > 1) {
1693	return false;	1693	return false;
1694	} else if(/px\|em\|pt\|in\|cm\|mm\|ex\|pc\|%/.test(val)) {	1694	} else if(/(px\|em\|pt\|in\|cm\|mm\|ex\|pc\|%)$/.test(val)) {
1695	return val.replace(/^.(px\|em\|pt\|in\|cm\|mm\|ex\|pc\|%)./, '$1');	1695	return val.replace(/^.(px\|em\|pt\|in\|cm\|mm\|ex\|pc\|%)./, '$1');
1696	}	1696	}
1697	return null;	1697	return null;
@@ -1771,7 +1771,7 @@ NJCSSStyle.prototype.updateValue = function(newValue, bypassUndo) {
1771	this.styleChange();	1771	this.styleChange();
1772	return true;	1772	return true;
1773	}	1773	}
1774		1774
1775	var IMPORTANT_FLAG = ' !important',	1775	var IMPORTANT_FLAG = ' !important',
1776	dec = this.njRule.declaration,	1776	dec = this.njRule.declaration,
1777	acceptAsValid = false,	1777	acceptAsValid = false,


diff --git a/js/panels/Color/colorchippopup.reel/.sass-cache/2fbca323ccf38cf180e7675ba0d8d3e07adeffea/ColorPanelPopup.scssc b/js/panels/Color/colorchippopup.reel/.sass-cache/2fbca323ccf38cf180e7675ba0d8d3e07adeffea/ColorPanelPopup.scssc deleted file mode 100755 index aa8bf258..00000000 --- a/js/panels/Color/colorchippopup.reel/.sass-cache/2fbca323ccf38cf180e7675ba0d8d3e07adeffea/ColorPanelPopup.scssc +++ /dev/null
Binary files differ


diff --git a/js/panels/Color/colorchippopup.reel/.sass-cache/6f8390f69a31f1a976968b9c18d0824d78460db2/ColorPanelPopup.scssc b/js/panels/Color/colorchippopup.reel/.sass-cache/6f8390f69a31f1a976968b9c18d0824d78460db2/ColorPanelPopup.scssc deleted file mode 100755 index fca60390..00000000 --- a/js/panels/Color/colorchippopup.reel/.sass-cache/6f8390f69a31f1a976968b9c18d0824d78460db2/ColorPanelPopup.scssc +++ /dev/null
Binary files differ


diff --git a/js/panels/Color/colorchippopup.reel/.sass-cache/de22270a8ac487505e8876f1cd16286e094a5127/ColorPanelBase.scssc b/js/panels/Color/colorchippopup.reel/.sass-cache/de22270a8ac487505e8876f1cd16286e094a5127/ColorPanelBase.scssc deleted file mode 100755 index fd7938d8..00000000 --- a/js/panels/Color/colorchippopup.reel/.sass-cache/de22270a8ac487505e8876f1cd16286e094a5127/ColorPanelBase.scssc +++ /dev/null
Binary files differ


diff --git a/js/panels/Components/ComponentsPanelBase.reel/ComponentsPanelBase.js b/js/panels/Components/ComponentsPanelBase.reel/ComponentsPanelBase.js index b6bee37d..3505393c 100755 --- a/js/panels/Components/ComponentsPanelBase.reel/ComponentsPanelBase.js +++ b/js/panels/Components/ComponentsPanelBase.reel/ComponentsPanelBase.js
@@ -23,6 +23,36 @@ var ComponentsPanelBase = exports.ComponentsPanelBase = Montage.create(Component
23	"text": "styles",	23	"text": "styles",
24	"children": [	24	"children": [
25	{	25	{
		26	"text": "Widgets",
		27	"children": [
		28	{
		29	"text": "Feed Reader",
		30	"dataFile" : "node_modules/components-data/feed-reader.json",
		31	"component": "feedreader"
		32	},
		33	{
		34	"text": "Map",
		35	"dataFile" : "node_modules/components-data/map.json",
		36	"component": "map"
		37	},
		38	{
		39	"text": "Picasa Carousel",
		40	"dataFile" : "node_modules/components-data/picasa-carousel.json",
		41	"component": "picasa-carousel"
		42	},
		43	{
		44	"text": "Search Bar",
		45	"dataFile" : "node_modules/components-data/searchfield.json",
		46	"component": "searchfield"
		47	},
		48	{
		49	"text": "Youtube Channel",
		50	"dataFile" : "node_modules/components-data/youtube-channel.json",
		51	"component": "youtube-channel"
		52	}
		53	]
		54	},
		55	{
26	"text": "Montage Components",	56	"text": "Montage Components",
27	"children": [	57	"children": [
28	{	58	{
@@ -50,7 +80,7 @@ var ComponentsPanelBase = exports.ComponentsPanelBase = Montage.create(Component
50	"dataFile" : "node_modules/components-data/number-input.json",	80	"dataFile" : "node_modules/components-data/number-input.json",
51	"component": "numberInput"	81	"component": "numberInput"
52	},	82	},
53	{	83	{
54	"