aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xcss/ninja.css14
-rw-r--r--js/components/about-box.reel/about-box.html2
-rwxr-xr-xjs/components/layout/document-entry.reel/document-entry.html2
-rwxr-xr-xjs/components/tools-properties/pen-properties.reel/pen-properties.html2
-rwxr-xr-xjs/components/tools-properties/selection-properties.reel/selection-properties.html2
-rw-r--r--js/components/treeview/branch.reel/branch.html8
-rw-r--r--js/components/treeview/leaf.reel/leaf.html4
-rw-r--r--js/components/treeview/ninja-branch.reel/ninja-branch.html10
-rw-r--r--js/components/treeview/ninja-leaf.reel/ninja-leaf.html4
-rw-r--r--js/components/treeview/treeview.reel/treeview.html4
-rwxr-xr-xjs/io/ui/cloudpopup.reel/cloudpopup.html2
-rwxr-xr-xjs/ninja.reel/ninja.html42
-rwxr-xr-xscss/imports/scss/_MainWindow.scss13
-rwxr-xr-xscss/imports/scss/_PanelUI.scss1
14 files changed, 51 insertions, 59 deletions
diff --git a/css/ninja.css b/css/ninja.css
index 297ed7cd..7fa654bd 100755
--- a/css/ninja.css
+++ b/css/ninja.css
@@ -118,9 +118,9 @@ body { position: absolute; margin: 0px; width: 100%; height: 100%; background-co
118 118
119#sceneBar { height: 70px; background-color: #474747; } 119#sceneBar { height: 70px; background-color: #474747; }
120 120
121#mainContainer #rulerTop { display: none; background: gray url("../images/temp/ruler-top.png"); height: 15px; margin-bottom: 0px; border-right: 11px solid black; } 121#mainContainer .rulerTop { display: none; background: gray url("../images/temp/ruler-top.png"); height: 15px; margin-bottom: 0px; border-right: 11px solid black; }
122 122
123#rulerLeft { display: none; background: gray url("../images/temp/ruler-left.png"); width: 16px; border-bottom: 11px solid black; } 123.rulerLeft { display: none; background: gray url("../images/temp/ruler-left.png"); width: 16px; border-bottom: 11px solid black; }
124 124
125#stateBar { height: 20px; background-color: #282828; margin-bottom: 0px; } 125#stateBar { height: 20px; background-color: #282828; margin-bottom: 0px; }
126 126
@@ -164,9 +164,7 @@ body { position: absolute; margin: 0px; width: 100%; height: 100%; background-co
164 164
165.verticalBox { -webkit-box-orient: vertical; -moz-box-orient: vertical; box-orient: vertical; } 165.verticalBox { -webkit-box-orient: vertical; -moz-box-orient: vertical; box-orient: vertical; }
166 166
167#rightPanelContent { overflow-y: hidden; } 167.openDocumentsTab { height: 25px; position: relative; overflow: hidden; color: white; }
168
169#openDocumentsTabComponent { height: 25px; position: relative; overflow: hidden; color: white; }
170 168
171#openDocuments { float: left; height: 25px; width: 100%; font-size: 12px; list-style: none; margin: 0; padding: 0; position: relative; text-decoration: none; } 169#openDocuments { float: left; height: 25px; width: 100%; font-size: 12px; list-style: none; margin: 0; padding: 0; position: relative; text-decoration: none; }
172 170
@@ -174,7 +172,7 @@ body { position: absolute; margin: 0px; width: 100%; height: 100%; background-co
174 172
175#openDocuments li:hover, #openDocuments li:active, #openDocuments li.activeTab { background-color: #7f7f7f; } 173#openDocuments li:hover, #openDocuments li:active, #openDocuments li.activeTab { background-color: #7f7f7f; }
176 174
177#documentBar { height: 25px; width: 1000px; position: relative; overflow: hidden; color: white; } 175.documentBar { height: 25px; width: 1000px; position: relative; overflow: hidden; color: white; }
178 176
179.montage-popup-modal-mask { opacity: 1; background: -webkit-radial-gradient(center, ellipse cover, rgba(0, 0, 0, 0.65) 0%, rgba(0, 0, 0, 0.8) 80%); } 177.montage-popup-modal-mask { opacity: 1; background: -webkit-radial-gradient(center, ellipse cover, rgba(0, 0, 0, 0.65) 0%, rgba(0, 0, 0, 0.8) 80%); }
180 178
@@ -212,7 +210,7 @@ body { position: absolute; margin: 0px; width: 100%; height: 100%; background-co
212 210
213#mainContent .CodeMirror { width: 100%; height: 100%; background: white; } 211#mainContent .CodeMirror { width: 100%; height: 100%; background: white; }
214 212
215#mainContent .CodeMirror-scroll { height: 100%; overflow:auto; } 213#mainContent .CodeMirror-scroll { height: 100%; overflow: auto; }
216 214
217.montage-editor-frame { position: absolute; z-index: 7; top: 0; left: 0; display: none; -webkit-user-select: initial; } 215.montage-editor-frame { position: absolute; z-index: 7; top: 0; left: 0; display: none; -webkit-user-select: initial; }
218 216
@@ -648,7 +646,7 @@ button.panel-button { -webkit-appearance: none; font-size: 9px; color: white; ba
648 646
649.panel.collapsed .arrowIcon { -webkit-transform: rotate(-90deg); } 647.panel.collapsed .arrowIcon { -webkit-transform: rotate(-90deg); }
650 648
651.rightPanelContent { position: absolute; height: 100%; width: 100%; } 649.rightPanelContent { position: absolute; overflow-y: hidden; height: 100%; width: 100%; }
652 650
653#rightPanelContainer .panel { -webkit-box-flex: 100; } 651#rightPanelContainer .panel { -webkit-box-flex: 100; }
654 652
diff --git a/js/components/about-box.reel/about-box.html b/js/components/about-box.reel/about-box.html
index 1f41699e..ecdd4389 100644
--- a/js/components/about-box.reel/about-box.html
+++ b/js/components/about-box.reel/about-box.html
@@ -21,7 +21,7 @@
21 </script> 21 </script>
22</head> 22</head>
23<body> 23<body>
24<div class="mainAboutBoxContainer" id="mainAboutBoxContainer"> 24<div data-montage-id="mainAboutBoxContainer" class="mainAboutBoxContainer">
25 <div id="about_box_ninja_logo"></div> 25 <div id="about_box_ninja_logo"></div>
26 <div id="aboutBoxTextBlock" class="baseAboutBoxText"> 26 <div id="aboutBoxTextBlock" class="baseAboutBoxText">
27 <p class="mediumAboutBoxText">Version: <span id="aboutBoxVersionNumber">0.0.0.0</span></p> 27 <p class="mediumAboutBoxText">Version: <span id="aboutBoxVersionNumber">0.0.0.0</span></p>
diff --git a/js/components/layout/document-entry.reel/document-entry.html b/js/components/layout/document-entry.reel/document-entry.html
index 8fd978a3..679ebb62 100755
--- a/js/components/layout/document-entry.reel/document-entry.html
+++ b/js/components/layout/document-entry.reel/document-entry.html
@@ -25,7 +25,7 @@
25 <body> 25 <body>
26 <li data-montage-id="documentEntry" class="documentEntry"> 26 <li data-montage-id="documentEntry" class="documentEntry">
27 <div data-montage-id="isActive"></div> 27 <div data-montage-id="isActive"></div>
28 <span id="name"></span> 28 <span data-montage-id="name"></span>
29 <img src="js/components/layout/document-entry.reel/close_button.gif"> 29 <img src="js/components/layout/document-entry.reel/close_button.gif">
30 </li> 30 </li>
31 </body> 31 </body>
diff --git a/js/components/tools-properties/pen-properties.reel/pen-properties.html b/js/components/tools-properties/pen-properties.reel/pen-properties.html
index b3221456..68ab85f6 100755
--- a/js/components/tools-properties/pen-properties.reel/pen-properties.html
+++ b/js/components/tools-properties/pen-properties.reel/pen-properties.html
@@ -38,7 +38,7 @@
38 38
39 <body> 39 <body>
40 <div data-montage-id="penProperties" class="subToolHolderPanel"> 40 <div data-montage-id="penProperties" class="subToolHolderPanel">
41 <div da="strokesContainer" class="leftLabel" style="margin-left:25px; padding-top: 3px;"> 41 <div id="strokesContainer" class="leftLabel" style="margin-left:25px; padding-top: 3px;">
42 <label class="label"> Stroke:</label> 42 <label class="label"> Stroke:</label>
43 <div data-montage-id="strokeSize" class="label"></div> 43 <div data-montage-id="strokeSize" class="label"></div>
44 </div> 44 </div>
diff --git a/js/components/tools-properties/selection-properties.reel/selection-properties.html b/js/components/tools-properties/selection-properties.reel/selection-properties.html
index 728ffb0a..b93aacd0 100755
--- a/js/components/tools-properties/selection-properties.reel/selection-properties.html
+++ b/js/components/tools-properties/selection-properties.reel/selection-properties.html
@@ -26,7 +26,7 @@
26 26
27 <body> 27 <body>
28 <div data-montage-id="selectionProperties" class="subToolHolderPanel"> 28 <div data-montage-id="selectionProperties" class="subToolHolderPanel">
29 <label class="label subOption optionLabel"><input id="transformCheck" type="checkbox" name="transformControl" class="checkBoxAlign"/>Transform Controls</label> 29 <label class="label subOption optionLabel"><input data-montage-id="transformCheck" type="checkbox" name="transformControl" class="checkBoxAlign"/>Transform Controls</label>
30 <div id="toolPropertiesPanel-selectionDivOptions"> 30 <div id="toolPropertiesPanel-selectionDivOptions">
31 <div class="subOption"><div id="topAlign" class="topAlignUp" title="Top Align"></div></div> 31 <div class="subOption"><div id="topAlign" class="topAlignUp" title="Top Align"></div></div>
32 <div class="subOption"><div id="rightAlign" class="rightAlignUp" title="Right Align"></div></div> 32 <div class="subOption"><div id="rightAlign" class="rightAlignUp" title="Right Align"></div></div>
diff --git a/js/components/treeview/branch.reel/branch.html b/js/components/treeview/branch.reel/branch.html
index 97b03382..d3060d96 100644
--- a/js/components/treeview/branch.reel/branch.html
+++ b/js/components/treeview/branch.reel/branch.html
@@ -129,11 +129,11 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
129 </script> 129 </script>
130</head> 130</head>
131<body> 131<body>
132 <div id="branch" class="branch"> 132 <div data-montage-id="branch" class="branch">
133 <span id="label" class="branch-label"></span> 133 <span data-montage-id="label" class="branch-label"></span>
134 134
135 <ul id="branchList"> 135 <ul data-montage-id="branchList">
136 <li id="treeItem"></li> 136 <li data-montage-id="treeItem"></li>
137 </ul> 137 </ul>
138 </div> 138 </div>
139</body> 139</body>
diff --git a/js/components/treeview/leaf.reel/leaf.html b/js/components/treeview/leaf.reel/leaf.html
index 360b85a9..a644d4f9 100644
--- a/js/components/treeview/leaf.reel/leaf.html
+++ b/js/components/treeview/leaf.reel/leaf.html
@@ -34,8 +34,8 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
34 </script> 34 </script>
35</head> 35</head>
36<body> 36<body>
37 <div id="leaf" class="leaf"> 37 <div data-montage-id="leaf" class="leaf">
38 <span id="label" class="leaf-label"></span> 38 <span data-montage-id="label" class="leaf-label"></span>
39 </div> 39 </div>
40</body> 40</body>
41</html> \ No newline at end of file 41</html> \ No newline at end of file
diff --git a/js/components/treeview/ninja-branch.reel/ninja-branch.html b/js/components/treeview/ninja-branch.reel/ninja-branch.html
index 3a3f3658..60894fbc 100644
--- a/js/components/treeview/ninja-branch.reel/ninja-branch.html
+++ b/js/components/treeview/ninja-branch.reel/ninja-branch.html
@@ -131,11 +131,11 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
131 </script> 131 </script>
132</head> 132</head>
133<body> 133<body>
134 <div id="branch" class="branch"> 134 <div data-montage-id="branch" class="branch">
135 <div id="label" class="branch-label"></div> 135 <div data-montage-id="label" class="branch-label"></div>
136 <div id="branchCollapser" class="branchCollapser"> 136 <div data-montage-id="branchCollapser" class="branchCollapser">
137 <ul id="branchList"> 137 <ul data-montage-id="branchList">
138 <li id="treeItem"></li> 138 <li data-montage-id="treeItem"></li>
139 </ul> 139 </ul>
140 </div> 140 </div>
141 141
diff --git a/js/components/treeview/ninja-leaf.reel/ninja-leaf.html b/js/components/treeview/ninja-leaf.reel/ninja-leaf.html
index b759b723..6d00bb21 100644
--- a/js/components/treeview/ninja-leaf.reel/ninja-leaf.html
+++ b/js/components/treeview/ninja-leaf.reel/ninja-leaf.html
@@ -34,8 +34,8 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
34 </script> 34 </script>
35</head> 35</head>
36<body> 36<body>
37 <div id="leaf" class="leaf"> 37 <div data-montage-id="leaf" class="leaf">
38 <div id="label" class="leaf-label" draggable="true"></div> 38 <div data-montage-id="label" class="leaf-label" draggable="true"></div>
39 </div> 39 </div>
40</body> 40</body>
41</html> \ No newline at end of file 41</html> \ No newline at end of file
diff --git a/js/components/treeview/treeview.reel/treeview.html b/js/components/treeview/treeview.reel/treeview.html
index 3ef9f116..1bed0f0b 100644
--- a/js/components/treeview/treeview.reel/treeview.html
+++ b/js/components/treeview/treeview.reel/treeview.html
@@ -43,8 +43,8 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
43 </script> 43 </script>
44</head> 44</head>
45<body>