Merge branch 'refs/heads/NinjaInternal' into Color

author: Jose Antonio Marquez 2012-02-28 13:33:31 -0800
committer: Jose Antonio Marquez 2012-02-28 13:33:31 -0800
commit: 3a25881b3a463e4f695be2f663f141710ba1d1c1 (patch)
tree: 657d55ad394de168dd627cf89b875906d10584e2
parent: d764428023d87446fbbb153d8e04a23b900d71d5 (diff)
parent: 7c9291a5bab4abd849547f8878f6fb962fc88250 (diff)
download: ninja-3a25881b3a463e4f695be2f663f141710ba1d1c1.tar.gz
104 files changed, 2933 insertions, 1188 deletions
diff --git a/css/ninja.css b/css/ninja.css
index 4d450208..7baf4204 100755
--- a/css/ninja.css
+++ b/css/ninja.css
@@ -82,7 +82,7 @@ body { position: absolute; margin: 0px; width: 100%; height: 100%; background-co
 #bottomPanelContainer { background: transparent; height: 150px; min-height: 80px; max-height: 50%; overflow: auto; }
-.panelContainer { display: block; -webkit-box-orient: vertical; position: relative; }
+.panelContainer { display: -webkit-box; -webkit-box-orient: vertical; position: relative; }
 #leftPanelContainer { width: 40px; -webkit-box-align: stretch; -webkit-box-sizing: border-box; margin-left: 2px; }
@@ -212,6 +212,10 @@ body { position: absolute; margin: 0px; width: 100%; height: 100%; background-co
 #mainContent .CodeMirror-scroll { height: 100%; overflow: scroll; overflow-x: auto; overflow-y: auto; }
+.montage-editor-frame { position: absolute; z-index: 7; top: 0; left: 0; display: none; -webkit-user-select: initial; }
+.montage-editor { padding: 0px; word-wrap: normal; }
 .panelContainer { margin: 0px; padding: 0px 0px; position: relative; overflow: auto; }
 .panelDisclosureIcon { background-image: url("../images/panels/panelDisclosureIcon.png"); background-repeat: no-repeat; width: 16px; height: 16px; float: left; -webkit-transition-property: rotate; -webkit-transition-duration: 0.2s; -webkit-transition-timing-function: linear; padding-right: 2px; }
@@ -888,49 +892,34 @@ input[type="radio"]:disabled { opacity: .3; background: #282828; border-width: 1
 /*width: 26px;*/
 /*opacity: 0.7;*/
 /*}*/
-/*//  Selection Tool Options  */
+.topAlignUp { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: -240px -54px; background-repeat: no-repeat; height: 23px; width: 26px; }
-/*.topAlignUp {*/
-/*@include background-pos(8,2,26px,23px);*/
+.rightAlignUp { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: -270px -54px; background-repeat: no-repeat; height: 23px; width: 26px; }
-/*}*/
-/*.rightAlignUp {*/
+.bottomAlignUp { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: -300px -54px; background-repeat: no-repeat; height: 23px; width: 26px; }
-/*@include background-pos(9,2,26px,23px);*/
-/*}*/
+.verticalLeftUp { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: -330px -54px; background-repeat: no-repeat; height: 23px; width: 26px; }
-/*.bottomAlignUp {*/
-/*@include background-pos(10,2,26px,23px);*/
+.verticalCenterUp { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: -360px -54px; background-repeat: no-repeat; height: 23px; width: 26px; }
-/*}*/
-/*.verticalLeftUp {*/
+.verticalRightUp { background-image: url("..
author	Jose Antonio Marquez	2012-02-28 13:33:31 -0800
committer	Jose Antonio Marquez	2012-02-28 13:33:31 -0800
commit	3a25881b3a463e4f695be2f663f141710ba1d1c1 (patch)
tree	657d55ad394de168dd627cf89b875906d10584e2
parent	d764428023d87446fbbb153d8e04a23b900d71d5 (diff)
parent	7c9291a5bab4abd849547f8878f6fb962fc88250 (diff)
download	ninja-3a25881b3a463e4f695be2f663f141710ba1d1c1.tar.gz

diff --git a/css/ninja.css b/css/ninja.css index 4d450208..7baf4204 100755 --- a/css/ninja.css +++ b/css/ninja.css
@@ -82,7 +82,7 @@ body { position: absolute; margin: 0px; width: 100%; height: 100%; background-co
82		82
83	#bottomPanelContainer { background: transparent; height: 150px; min-height: 80px; max-height: 50%; overflow: auto; }	83	#bottomPanelContainer { background: transparent; height: 150px; min-height: 80px; max-height: 50%; overflow: auto; }
84		84
85	.panelContainer { display: block; -webkit-box-orient: vertical; position: relative; }	85	.panelContainer { display: -webkit-box; -webkit-box-orient: vertical; position: relative; }
86		86
87	#leftPanelContainer { width: 40px; -webkit-box-align: stretch; -webkit-box-sizing: border-box; margin-left: 2px; }	87	#leftPanelContainer { width: 40px; -webkit-box-align: stretch; -webkit-box-sizing: border-box; margin-left: 2px; }
88		88
@@ -212,6 +212,10 @@ body { position: absolute; margin: 0px; width: 100%; height: 100%; background-co
212		212
213	#mainContent .CodeMirror-scroll { height: 100%; overflow: scroll; overflow-x: auto; overflow-y: auto; }	213	#mainContent .CodeMirror-scroll { height: 100%; overflow: scroll; overflow-x: auto; overflow-y: auto; }
214		214
		215	.montage-editor-frame { position: absolute; z-index: 7; top: 0; left: 0; display: none; -webkit-user-select: initial; }
		216
		217	.montage-editor { padding: 0px; word-wrap: normal; }
		218
215	.panelContainer { margin: 0px; padding: 0px 0px; position: relative; overflow: auto; }	219	.panelContainer { margin: 0px; padding: 0px 0px; position: relative; overflow: auto; }
216		220
217	.panelDisclosureIcon { background-image: url("../images/panels/panelDisclosureIcon.png"); background-repeat: no-repeat; width: 16px; height: 16px; float: left; -webkit-transition-property: rotate; -webkit-transition-duration: 0.2s; -webkit-transition-timing-function: linear; padding-right: 2px; }	221	.panelDisclosureIcon { background-image: url("../images/panels/panelDisclosureIcon.png"); background-repeat: no-repeat; width: 16px; height: 16px; float: left; -webkit-transition-property: rotate; -webkit-transition-duration: 0.2s; -webkit-transition-timing-function: linear; padding-right: 2px; }
@@ -888,49 +892,34 @@ input[type="radio"]:disabled { opacity: .3; background: #282828; border-width: 1
888	/width: 26px;/	892	/width: 26px;/
889	/opacity: 0.7;/	893	/opacity: 0.7;/
890	/}/	894	/}/
891	/// Selection Tool Options /	895	.topAlignUp { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: -240px -54px; background-repeat: no-repeat; height: 23px; width: 26px; }
892	/.topAlignUp {/	896
893	/@include background-pos(8,2,26px,23px);/	897	.rightAlignUp { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: -270px -54px; background-repeat: no-repeat; height: 23px; width: 26px; }
894	/}/	898
895	/.rightAlignUp {/	899	.bottomAlignUp { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: -300px -54px; background-repeat: no-repeat; height: 23px; width: 26px; }
896	/@include background-pos(9,2,26px,23px);/	900
897	/}/	901	.verticalLeftUp { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: -330px -54px; background-repeat: no-repeat; height: 23px; width: 26px; }
898	/.bottomAlignUp {/	902
899	/@include background-pos(10,2,26px,23px);/	903	.verticalCenterUp { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: -360px -54px; background-repeat: no-repeat; height: 23px; width: 26px; }
900	/}/	904
901	/.verticalLeftUp {/	905	.verticalRightUp { background-image: url("..