Undoing mistakes from auto-merge.

Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>

4 files changed, 8 insertions, 17 deletions

diff --git a/js/panels/Timeline/TimelinePanel.reel/css/TimelinePanel.css b/js/panels/Timeline/TimelinePanel.reel/css/TimelinePanel.css
index 129b9771..ca6fe6fd 100644
--- a/js/panels/Timeline/TimelinePanel.reel/css/TimelinePanel.css
+++ b/js/panels/Timeline/TimelinePanel.reel/css/TimelinePanel.css
@@ -10,12 +10,12 @@
     height: 100%;
 }
 .maintimeline{
-    border-style: double;
     -webkit-box-flex: 1;
     display: -webkit-box;
-    -webkit-box-orient: horizontal
+    -webkit-box-orient: horizontal;
     height : 100%;
     position: relative;
+    margin-top: 1px;
 }
 .leftinside{
     height: 100%;
diff --git a/js/panels/presets/default-animation-presets.js b/js/panels/presets/default-animation-presets.js
index 4793c356..578c1622 100644
--- a/js/panels/presets/default-animation-presets.js
+++ b/js/panels/presets/default-animation-presets.js
@@ -13,7 +13,6 @@ exports.animationPresets = {
                 "text": "Border Morph",
                 "selectorBase" : "border-morph",
                 "rules" : [{
-                    "selectorSuffix" : "",
                     "styles" : {
                         "-webkit-animation-name": "border-morph",
                         "-webkit-animation-duration": "2s",
@@ -93,7 +92,6 @@ exports.animationPresets = {
                 "text": "Rotater",
                 "selectorBase" : "rotate-with-alpha-keyframes",
                 "rules" : [{
-                    "selectorSuffix" : "",
                     "styles" : {
                         "-webkit-animation-name": "rotate-with-alpha-keyframes",
                         "-webkit-animation-duration": "5s",
diff --git a/js/panels/presets/default-style-presets.js b/js/panels/presets/default-style-presets.js
index 82bec34f..10b24ff4 100644
--- a/js/panels/presets/default-style-presets.js
+++ b/js/panels/presets/default-style-presets.js
@@ -11,9 +11,9 @@ exports.stylePresets = {
         "children": [
             {
                 "text": "Border-Radius",
+                "id": "njBorderRadius",
                 "selectorBase" : "border-radius-preset",
                 "rules" : [{
-                    "selectorSuffix" : "",
                     "styles" : {
                         "border-radius": "100px",
                         "border" : "1px solid #333"
@@ -22,9 +22,9 @@ exports.stylePresets = {
             },
             {
                 "text": "Drop Shadow",
+                "id": "njDropShadow",
                 "selectorBase" : "drop-shadow",
                 "rules" : [{
-                    "selectorSuffix" : "",
                     "styles" : {
                         "box-shadow": "2px 2px 50px rgba(0,0,0,0.5)",
                         "border" : "1px solid #CCC"
@@ -33,9 +33,10 @@ exports.stylePresets = {
             },
             {
                 "text": "Fancy Box",
+                "id": "njFancyBox",
                 "selectorBase" : "fancy-box",
                 "rules" : [{
-                    "selectorSuffix" : "",
+                    "selectorSuffix": "",
                     "styles" : {
                         "box-shadow": "inset 0 0 0 1px #666, inset 0 0 0 2px rgba(225, 225, 225, 0.4), 0 0 20px -10px #333",
                         "border" : "1px solid #FFF",
@@ -50,9 +51,9 @@ exports.stylePresets = {
         "children": [
             {
                 "text": "Italic",
+                "id": "njItalic",
                 "selectorBase" : "italicize",
                 "rules" : [{
-                    "selectorSuffix" : "",
                     "styles" : {
                         "font-style": "italic"
                     }
@@ -60,9 +61,9 @@ exports.stylePresets = {
             },
             {
                 "text": "Text Shadow",
+                "id": "njTextShadow",
                 "selectorBase" : "italicize",
                 "rules" : [{
-                    "selectorSuffix" : "",
                     "styles" : {
                         "text-shadow": "1px 1px 3px #333"
                     }
diff --git a/js/panels/presets/default-transition-presets.js b/js/panels/presets/default-transition-presets.js
index 15f4882f..f8968085 100644
--- a/js/panels/presets/default-transition-presets.js
+++ b/js/panels/presets/default-transition-presets.js
@@ -13,7 +13,6 @@ exports.transitionPresets = {
                 "text": "Fade In",
                 "selectorBase" : "fade-in",
                 "rules" : [{
-                    "selectorSuffix": "",
                     "styles" : {
                         "opacity": "0.25",
                         "-webkit-transition": "all 0.4s ease-in"
@@ -29,7 +28,6 @@ exports.transitionPresets = {
                 "text": "Fade Out",
                 "selectorBase" : "fade-out",
                 "rules" : [{
-                    "selectorSuffix": "",
                     "styles" : {
                         "opacity": "1",
                         "-webkit-transition": "all 0.4s ease-in"
@@ -48,7 +46,6 @@ exports.transitionPresets = {
                 "text": "Slide Right",
                 "selectorBase" : "slide-right",
                 "rules" : [{
-                    "selectorSuffix": "",
                     "styles" : {
                         "-webkit-transition": "all 0.4s ease-in"
                     }
@@ -63,7 +60,6 @@ exports.transitionPresets = {
                 "text": "Slide Left",
                 "selectorBase" : "slide-left",
                 "rules" : [{
-                    "selectorSuffix": "",
                     "styles" : {
                         "-webkit-transition": "all 0.4s ease-in"
                     }
@@ -78,7 +74,6 @@ exports.transitionPresets = {
                 "text": "Rotate",
                 "selectorBase" : "rotate",
                 "rules" : [{
-                    "selectorSuffix" : "",
                     "styles" : {
                         "-webkit-transition": "all 0.4s ease-in"
                     }
@@ -92,7 +87,6 @@ exports.transitionPresets = {
                 "text": "Scale Up",
                 "selectorBase" : "scale-up",
                 "rules" : [{
-                    "selectorSuffix" : "",
                     "styles" : {
                         "-webkit-transition": "-webkit-transform 0.4s ease-in"
                     }
@@ -107,7 +101,6 @@ exports.transitionPresets = {
                 "text": "Scale Down",
                 "selectorBase" : "scale-down",
                 "rules" : [{
-                    "selectorSuffix" : "",
                     "styles" : {
                         "-webkit-transition": "-webkit-transform 0.4s ease-in"
                     }
@@ -122,7 +115,6 @@ exports.transitionPresets = {
                 "text": "Remove 3D",
                 "selectorBase" : "remove-3d",
                 "rules" : [{
-                    "selectorSuffix": "",
                     "styles" : {
                         "-webkit-transition": "all 0.4s ease-in"
                     }