Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local

95 files changed, 2430 insertions, 2308 deletions

diff --git a/css/ninja.css b/css/ninja.css
index cd7a35ab..682dfc9d 100755
--- a/css/ninja.css
+++ b/css/ninja.css
@@ -518,10 +518,6 @@ div.pp-button.button-divider div { height: 1px; width: 24px; background-color: b
 
 #pp-container-assets input.inline-editor { height: 11px; width: 80%; background-color: #242424 !important; color: #b2b2b2 !important; top: -2px; border-width: 0px; font-size: 11px; }
 
-.subToolHolderPanel { margin-left: 42px; }
-
-.subToolPanel { margin-top: -6px; }
-
 .properties_panel { overflow-x: hidden; color: white; }
 
 .properties_panel select { -webkit-appearance: none; font-size: 9px; color: white; background-color: #444444; border: 1px solid #313131; width: 120px; height: 15px; outline: none; background-image: url("../images/dropdown-bg.png"); background-repeat: no-repeat; background-position: right center; }
@@ -669,25 +665,25 @@ nav.menuBar ul ul, nav.menuBar ul li:hover ul ul, nav.menuBar ul ul li:hover ul
 
 nav.menuBar ul li:hover ul, nav.menuBar ul ul li:hover ul, nav.menuBar ul ul ul li:hover ul { display: block; }
 
-.subToolHolderPanel .toolbutton { float: left; -webkit-transform: scale(0.6); }
+.subToolHolderPanel { margin-left: 42px; padding: 6px; float: left; }
 
-.subToolHolderPanel .toolbutton:hover, .subToolHolderPanel .toolbutton.active { -webkit-transform: scale(0.75); }
+.subToolHolderPanel .toolbutton { float: left; -webkit-transform: scale(0.6); margin-top: -4px; }
 
-.subOption { float: left; margin-top: 5px; margin-left: 10px; margin-right: 10px; }
+.subToolHolderPanel .toolbutton:hover, .subToolHolderPanel .toolbutton.active { -webkit-transform: scale(0.75); }
 
-.toolSeparator { height: 1px; width: 30px; }
+.toolOptionsFloatChildren > * { float: left; }
 
-.toolSeparatorTop { margin-top: 3px; margin-bottom: 0px; }
+.toolOptionsSpacer { margin-right: 9px; }
 
-.toolSeparatorMiddle { margin-top: 0px; margin-bottom: 0px; }
+.toolColorChipCtrl { width: 18px; height: 18px; margin-top: 1px; margin-left: 3px; margin-right: 8px; border: 1px black solid; }
 
-.toolSeparatorBottom { margin-top: 0px; margin-bottom: 3px; }
+.toolColorChipIcon { width: 20px; height: 20px; margin-top: 1px; -webkit-transform: scale(0.8); background-color: #282828; }
 
-.toolImageBase { padding: 0px; width: 26px; height: 23px; opacity: 0.7; background-repeat: no-repeat; }
+.subToolHolderPanel input.toolOptsRadioButton { width: 24px; height: 24px; margin: 0px 5px 0px 0px; padding: 0px; cursor: pointer; border-radius: 3px; -webkit-user-select: none; border: 1px solid transparent; background: none; background-repeat: no-repeat; background-position: center center; -webkit-transform: scale(0.9); }
 
-.toolImageBase:hover { opacity: 1.0; }
+.subToolHolderPanel input.toolOptsRadioButton:hover { box-shadow: 0px 0px 2px 2px #999; -webkit-transform: scale(1); }
 
-.drawingMode { outline: blue solid thin; }
+.subToolHolderPanel input.toolOptsRadioButton:checked { box-shadow: inset 0px 0px 2px 2px #999; background-color: #363636; background-position: center center; background-repeat: no-repeat; -webkit-transform: scale(1); }
 
 .textBox { padding-top: 3px; min-width: 10em; margin-left: 5px; position: relative; margin-top: 0px; }
 
@@ -703,13 +699,13 @@ nav.menuBar ul li:hover ul, nav.menuBar ul ul li:hover ul, nav.menuBar ul ul ul
 
 .cornerRadius:hover, .cornerRadius:active { opacity: 1; }
 
-.cornerRadius.topLeft { -webkit-transform: rotate(0deg); }
+.cornerRadius.topLeft { -webkit-transform: rotate(0deg); margin-top: 1px; margin-right: 3px; }