aboutsummaryrefslogtreecommitdiff
path: root/js/panels
diff options
context:
space:
mode:
authorEric Guzman2012-05-10 14:51:31 -0700
committerEric Guzman2012-05-10 14:51:31 -0700
commit39f23ad4868482f395d2e210490a2d73545a9d84 (patch)
treec702d67585f72cddf55932411e7100133bc58452 /js/panels
parent733e16b55a6de807cdbb60b0f2cea36fc1619fd4 (diff)
parent632a53278826a33506b302b573ee0681840f2d6c (diff)
downloadninja-39f23ad4868482f395d2e210490a2d73545a9d84.tar.gz
Merge branch 'refs/heads/master' into CSSPanelUpdates
Conflicts: js/panels/CSSPanel/ComputedStyleSubPanel.reel/ComputedStyleSubPanel.html
Diffstat (limited to 'js/panels')
-rwxr-xr-xjs/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.html6
-rwxr-xr-xjs/panels/Materials/materials-library-panel.reel/materials-library-panel.css43
-rwxr-xr-xjs/panels/Materials/materials-library-panel.reel/materials-library-panel.html14
-rwxr-xr-xjs/panels/Materials/materials-popup.reel/materials-popup.css15
-rwxr-xr-xjs/panels/Materials/materials-popup.reel/materials-popup.html26
-rwxr-xr-xjs/panels/Panel.reel/Panel.html14
-rwxr-xr-xjs/panels/PanelContainer.reel/PanelContainer.html3
-rwxr-xr-xjs/panels/Splitter.js35
-rw-r--r--js/panels/Timeline/Keyframe.reel/Keyframe.html2
-rw-r--r--js/panels/Timeline/Layer.reel/Layer.html4
-rw-r--r--js/panels/Timeline/Layer.reel/Layer.js43
-rw-r--r--js/panels/Timeline/PropertyTrack.reel/PropertyTrack.html2
-rw-r--r--js/panels/Timeline/Span.reel/Span.html2
-rw-r--r--js/panels/Timeline/Style.reel/Style.html12
-rw-r--r--js/panels/Timeline/Style.reel/Style.js6
-rw-r--r--js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html60
-rw-r--r--js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js39
-rw-r--r--js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html1
-rw-r--r--js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js34
-rw-r--r--js/panels/Timeline/Track.reel/Track.html6
-rw-r--r--js/panels/Timeline/Track.reel/Track.js12
-rw-r--r--js/panels/Timeline/TrackSpacer.reel/TrackSpacer.html4
-rw-r--r--js/panels/Timeline/Tween.reel/Tween.html6
-rw-r--r--js/panels/Timeline/Tween.reel/Tween.js5
-rwxr-xr-xjs/panels/color/colorchippopup.reel/colorchippopup.html2
-rwxr-xr-xjs/panels/color/colorpanelbase.reel/colorpanelbase.html2
-rwxr-xr-xjs/panels/color/colorpanelpopup.reel/colorpanelpopup.html2
-rwxr-xr-xjs/panels/color/colorpopup-manager.js2
-rwxr-xr-xjs/panels/color/colortoolbar.reel/colortoolbar.html2
-rwxr-xr-xjs/panels/components-panel.reel/components-panel.html4
-rwxr-xr-xjs/panels/components-panel.reel/components-panel.js64
-rw-r--r--js/panels/presets/animations-presets.reel/animations-presets.html4
-rw-r--r--js/panels/presets/content.reel/content.html12
-rw-r--r--js/panels/presets/style-presets.reel/style-presets.html7
-rw-r--r--js/panels/presets/transitions-presets.reel/transitions-presets.html4
-rwxr-xr-xjs/panels/properties.reel/properties.html16
-rwxr-xr-xjs/panels/properties.reel/properties.js6
-rwxr-xr-xjs/panels/properties.reel/section.reel/section.html6
-rwxr-xr-xjs/panels/properties.reel/sections/custom-rows/color-select.reel/color-select.html6
-rwxr-xr-xjs/panels/properties.reel/sections/custom-rows/dual-row.reel/dual-row.html6
-rwxr-xr-xjs/panels/properties.reel/sections/custom-rows/single-row.reel/single-row.html4
-rwxr-xr-xjs/panels/properties.reel/sections/custom.reel/custom.html6
-rwxr-xr-xjs/panels/properties.reel/sections/position-and-size.reel/position-and-size.html18
-rwxr-xr-xjs/panels/properties.reel/sections/three-d-view.reel/three-d-view.html30
44 files changed, 261 insertions, 336 deletions
diff --git a/js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.html b/js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.html
index c62b2b23..1d74fab4 100755
--- a/js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.html
+++ b/js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.html
@@ -38,13 +38,13 @@
38 </script> 38 </script>
39 </head> 39 </head>
40<body> 40<body>
41 <div id="css_panel" class="css_panel"> 41 <div data-montage-id="css_panel" class="css_panel">
42 <!-- Stylesheet list subsection --> 42 <!-- Stylesheet list subsection -->
43 <h2 id="nj-css-sheets-header" class="nj-section-header"> 43 <h2 id="nj-css-sheets-header" class="nj-section-header">
44 <div id="nj-css-sheets-arrow" class="panelDisclosureIcon"></div> 44 <div id="nj-css-sheets-arrow" class="panelDisclosureIcon"></div>
45 Stylesheets <span id="nj-current-doc-name"></span> 45 Stylesheets <span id="nj-current-doc-name"></span>
46 </h2> 46 </h2>
47 <div id="nj-section-stylesheets" class="nj-sub-panel"> 47 <div data-montage-id="nj-section-stylesheets" id="nj-section-stylesheets" class="nj-sub-panel">
48 <ul id="nj-sheet-list"></ul> 48 <ul id="nj-sheet-list"></ul>
49 </div> 49 </div>
50 <div id="nj-css-stylesheet-toolbar" class="nj-css-toolbar"> 50 <div id="nj-css-stylesheet-toolbar" class="nj-css-toolbar">
@@ -59,7 +59,7 @@
59 <span id="nj-num-items">0</span> elements selected 59 <span id="nj-num-items">0</span> elements selected
60 </span> 60 </span>
61 </h2> 61 </h2>
62 <div id="nj-computed-sub-panel"></div> 62 <div data-montage-id="nj-computed-sub-panel" id="nj-computed-sub-panel"></div>
63 <div id="nj-section-styles" class="nj-sub-panel"> 63 <div id="nj-section-styles" class="nj-sub-panel">
64 <!-- <ul id="nj-css-rule-list"></ul> --> 64 <!-- <ul id="nj-css-rule-list"></ul> -->
65 </div> 65 </div>
diff --git a/js/panels/Materials/materials-library-panel.reel/materials-library-panel.css b/js/panels/Materials/materials-library-panel.reel/materials-library-panel.css
index fe88ebf6..bed3acfe 100755
--- a/js/panels/Materials/materials-library-panel.reel/materials-library-panel.css
+++ b/js/panels/Materials/materials-library-panel.reel/materials-library-panel.css
@@ -5,43 +5,34 @@
5 </copyright> */ 5 </copyright> */
6 6
7.materials_library_panel hr { 7.materials_library_panel hr {
8 float: left; 8 float: left;
9 clear: both; 9 clear: both;
10 width: 100%; 10 width: 100%;
11 display: block; 11 display: block;
12 background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0.5, #1d1d1d), color-stop(0.75, #424242)); 12 background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0.5, #1d1d1d), color-stop(0.75, #424242));
13 border: none; 13 border: none;
14 height: 2px; 14 height: 2px;
15 margin: 4px 0px 4px 0px; 15 margin: 4px 0 4px 0;
16} 16}
17 17
18 18
19#ml_buttons { 19.ml_buttons {
20 clear:both; 20 clear:both;
21 float: left; 21 float: left;
22 margin: 0px -4px 0px 4px; 22 margin: 0 -4px 0 4px;
23 width: 97%; 23 width: 97%;
24} 24}
25 25
26#ml_buttons .nj-skinned{ 26.ml_buttons .nj-skinned {
27 height: 22px; 27 height: 22px;
28 overflow: hidden; 28 overflow: hidden;
29 display: block; 29 display: block;
30 cursor: pointer; 30 cursor: pointer;
31 margin: 0px 1px; 31 margin: 0 1px;
32}
33
34#ml_add_btn {
35 float: left;
36 width: 60px;
37}
38
39#ml_copy_btn {
40 float: left; 32 float: left;
41 width: 60px; 33 width: 60px;
42} 34}
43 35
44#ml_delete_btn { 36.ml_buttons .nj-skinned:last-child {
45 float: right; 37 float: right;
46 width: 60px;
47} \ No newline at end of file 38} \ No newline at end of file
diff --git a/js/panels/Materials/materials-library-panel.reel/materials-library-panel.html b/js/panels/Materials/materials-library-panel.reel/materials-library-panel.html
index 741ff6aa..7fc48a55 100755
--- a/js/panels/Materials/materials-library-panel.reel/materials-library-panel.html
+++ b/js/panels/Materials/materials-library-panel.reel/materials-library-panel.html
@@ -88,15 +88,15 @@
88 </head> 88 </head>
89 <body> 89 <body>
90 90
91 <div id="materials_library_panel" class="materials_library_panel"> 91 <div data-montage-id="materials_library_panel" class="materials_library_panel">
92 <section id="ml_tree_holder" class="animationsLibrary"> 92 <section data-montage-id="ml_tree_holder" class="animationsLibrary">
93 <div id="materials_library_tree"></div> 93 <div data-montage-id="materials_library_tree"></div>
94 </section> 94 </section>
95 <hr /> 95 <hr />
96 <div id="ml_buttons"> 96 <div data-montage-id="ml_buttons" class="ml_buttons">
97 <button id="ml_add_btn" class="nj-skinned">Add</button> 97 <button data-montage-id="ml_add_btn" class="nj-skinned">Add</button>
98 <button id="ml_copy_btn" class="nj-skinned">Copy</button> 98 <button data-montage-id="ml_copy_btn" class="nj-skinned">Copy</button>
99 <button id="ml_delete_btn" class="nj-skinned">Delete</button> 99 <button data-montage-id="ml_delete_btn" class="nj-skinned">Delete</button>
100 </div> 100 </div>
101 </div> 101 </div>
102