aboutsummaryrefslogtreecommitdiff
path: root/js/panels
diff options
context:
space:
mode:
authorNivesh Rajbhandari2012-02-20 11:14:44 -0800
committerNivesh Rajbhandari2012-02-20 11:14:44 -0800
commitabf78e2d7a97d295ce5a1c425fd359d47379137e (patch)
treed08c91bd2aef31e6325e0b499b2ffc390018bec6 /js/panels
parente80a79bff57fecf3aa9b869d8ed2de5fd815287c (diff)
parente23708721a71ca4c71365f5f8e8ac7d6113926db (diff)
downloadninja-abf78e2d7a97d295ce5a1c425fd359d47379137e.tar.gz
Merge branch 'refs/heads/ninja-internal' into ToolFixes
Diffstat (limited to 'js/panels')
-rwxr-xr-x[-rw-r--r--]js/panels/CSSPanel/CSSPanel.js0
-rwxr-xr-x[-rw-r--r--]js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.css6
-rwxr-xr-x[-rw-r--r--]js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.html11
-rwxr-xr-x[-rw-r--r--]js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.js0
-rwxr-xr-x[-rw-r--r--]js/panels/CSSPanel/ComputedStyleSubPanel.reel/ComputedStyleSubPanel.html0
-rwxr-xr-x[-rw-r--r--]js/panels/CSSPanel/ComputedStyleSubPanel.reel/ComputedStyleSubPanel.js0
-rwxr-xr-x[-rw-r--r--]js/panels/CSSPanel/ComputedStyleSubPanel.reel/computed-style-sub-panel.css0
-rwxr-xr-x[-rw-r--r--]js/panels/CSSPanel/css-property-name-list.js0
-rwxr-xr-x[-rw-r--r--]js/panels/CSSPanel/css-shorthand-map.js0
-rwxr-xr-x[-rw-r--r--]js/panels/CSSPanel/css-value-completion-map.js0
-rwxr-xr-x[-rw-r--r--]js/panels/Color/colorbutton-manager.js0
-rwxr-xr-x[-rw-r--r--]js/panels/Color/colorchippopup.reel/.sass-cache/2fbca323ccf38cf180e7675ba0d8d3e07adeffea/ColorPanelPopup.scsscbin15335 -> 15335 bytes
-rwxr-xr-x[-rw-r--r--]js/panels/Color/colorchippopup.reel/.sass-cache/6f8390f69a31f1a976968b9c18d0824d78460db2/ColorPanelPopup.scsscbin17879 -> 17879 bytes
-rwxr-xr-x[-rw-r--r--]js/panels/Color/colorchippopup.reel/.sass-cache/de22270a8ac487505e8876f1cd16286e094a5127/ColorPanelBase.scsscbin23592 -> 23592 bytes
-rwxr-xr-x[-rw-r--r--]js/panels/Color/colorchippopup.reel/colorchippopup.html0
-rwxr-xr-x[-rw-r--r--]js/panels/Color/colorchippopup.reel/colorchippopup.js0
-rwxr-xr-x[-rw-r--r--]js/panels/Color/colorchippopup.reel/css/colorchippopup.css0
-rwxr-xr-x[-rw-r--r--]js/panels/Color/colorchippopup.reel/img/icon_bitmap.pngbin3072 -> 3072 bytes
-rwxr-xr-x[-rw-r--r--]js/panels/Color/colorchippopup.reel/img/icon_colorwheel.pngbin3420 -> 3420 bytes
-rwxr-xr-x[-rw-r--r--]js/panels/Color/colorchippopup.reel/img/icon_gradient.pngbin2815 -> 2815 bytes
-rwxr-xr-x[-rw-r--r--]js/panels/Color/colorchippopup.reel/img/icon_nofill.pngbin2951 -> 2951 bytes
-rwxr-xr-x[-rw-r--r--]js/panels/Color/colorchippopup.reel/img/knob.pngbin1036 -> 1036 bytes
-rwxr-xr-x[-rw-r--r--]js/panels/Color/colorpanel.js0
-rwxr-xr-x[-rw-r--r--]js/panels/Color/colorpanelbase.reel/colorpanelbase.html0
-rwxr-xr-x[-rw-r--r--]js/panels/Color/colorpanelbase.reel/colorpanelbase.js0
-rwxr-xr-x[-rw-r--r--]js/panels/Color/colorpanelbase.reel/css/colorpanelbase.css0
-rwxr-xr-x[-rw-r--r--]js/panels/Color/colorpanelbase.reel/img/icon_default.pngbin3011 -> 3011 bytes
-rwxr-xr-x[-rw-r--r--]js/panels/Color/colorpanelbase.reel/img/icon_nocolor.pngbin3036 -> 3036 bytes
-rwxr-xr-x[-rw-r--r--]js/panels/Color/colorpanelbase.reel/img/icon_swap.pngbin2961 -> 2961 bytes
-rwxr-xr-x[-rw-r--r--]js/panels/Color/colorpanelbase.reel/img/knob.pngbin1036 -> 1036 bytes
-rwxr-xr-x[-rw-r--r--]js/panels/Color/colorpanelpopup.reel/colorpanelpopup.html0
-rwxr-xr-x[-rw-r--r--]js/panels/Color/colorpanelpopup.reel/colorpanelpopup.js0
-rwxr-xr-x[-rw-r--r--]js/panels/Color/colorpanelpopup.reel/css/colorpanelpopup.css0
-rwxr-xr-x[-rw-r--r--]js/panels/Color/colorpanelpopup.reel/css/colorpanelpopup.scss0
-rwxr-xr-x[-rw-r--r--]js/panels/Color/colorpanelpopup.reel/img/icon_bitmap.pngbin3072 -> 3072 bytes
-rwxr-xr-x[-rw-r--r--]js/panels/Color/colorpanelpopup.reel/img/icon_colorwheel.pngbin3420 -> 3420 bytes
-rwxr-xr-x[-rw-r--r--]js/panels/Color/colorpanelpopup.reel/img/icon_gradient.pngbin2815 -> 2815 bytes
-rwxr-xr-x[-rw-r--r--]js/panels/Color/colorpanelpopup.reel/img/icon_nofill.pngbin2951 -> 2951 bytes
-rwxr-xr-x[-rw-r--r--]js/panels/Color/colorpanelpopup.reel/img/knob.pngbin1036 -> 1036 bytes
-rwxr-xr-x[-rw-r--r--]js/panels/Color/colorpopup-manager.js0
-rwxr-xr-x[-rw-r--r--]js/panels/Color/colortoolbar.reel/colortoolbar.html0
-rwxr-xr-x[-rw-r--r--]js/panels/Color/colortoolbar.reel/colortoolbar.js0
-rwxr-xr-x[-rw-r--r--]js/panels/Color/colortoolbar.reel/css/colortoolbar.css0
-rw-r--r--js/panels/Components/Components.xml28
-rwxr-xr-x[-rw-r--r--]js/panels/Components/ComponentsPanel.js0
-rwxr-xr-x[-rw-r--r--]js/panels/Components/ComponentsPanelBase.reel/ComponentsPanelBase.css0
-rwxr-xr-x[-rw-r--r--]js/panels/Components/ComponentsPanelBase.reel/ComponentsPanelBase.html39
-rwxr-xr-x[-rw-r--r--]js/panels/Components/ComponentsPanelBase.reel/ComponentsPanelBase.js423
-rwxr-xr-x[-rw-r--r--]js/panels/Materials/Materials.xml0
-rwxr-xr-x[-rw-r--r--]js/panels/Materials/MaterialsPanel.js0
-rwxr-xr-x[-rw-r--r--]js/panels/Materials/materials-library-panel.reel/materials-library-panel.css0
-rwxr-xr-x[-rw-r--r--]js/panels/Materials/materials-library-panel.reel/materials-library-panel.html0
-rwxr-xr-x[-rw-r--r--]js/panels/Materials/materials-library-panel.reel/materials-library-panel.js0
-rwxr-xr-x[-rw-r--r--]js/panels/Materials/materials-popup.reel/materials-popup.css0
-rwxr-xr-x[-rw-r--r--]js/panels/Materials/materials-popup.reel/materials-popup.html0
-rwxr-xr-x[-rw-r--r--]js/panels/Materials/materials-popup.reel/materials-popup.js0
-rwxr-xr-x[-rw-r--r--]js/panels/Panel.reel/Panel.html0
-rwxr-xr-x[-rw-r--r--]js/panels/Panel.reel/Panel.js0
-rwxr-xr-x[-rw-r--r--]js/panels/PanelBase.js0
-rwxr-xr-x[-rw-r--r--]js/panels/PanelContainer/PanelContainer.reel/PanelContainer.html0
-rwxr-xr-x[-rw-r--r--]js/panels/PanelContainer/PanelContainer.reel/PanelContainer.js4
-rwxr-xr-x[-rw-r--r--]js/panels/Project/ProjectPanel.js0
-rwxr-xr-x[-rw-r--r--]js/panels/Project/projectpanelbase.reel/ProjectPanelBase.js0
-rwxr-xr-x[-rw-r--r--]js/panels/Project/projectpanelbase.reel/projectpanelbase.html0
-rwxr-xr-x[-rw-r--r--]js/panels/Resizer.js0
-rwxr-xr-x[-rw-r--r--]js/panels/Splitter.js0
-rwxr-xr-x[-rw-r--r--]js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html0
-rwxr-xr-x[-rw-r--r--]js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js0
-rw-r--r--js/panels/presets/content.reel/content.css52
-rw-r--r--js/panels/presets/content.reel/content.html66
-rw-r--r--js/panels/presets/content.reel/content.js79
-rw-r--r--js/panels/presets/default-style-presets.js72
-rw-r--r--js/panels/presets/default-transition-presets.js93
-rw-r--r--js/panels/presets/presets-panel.js15
-rw-r--r--js/panels/presets/style-presets.reel/style-presets.css0
-rw-r--r--js/panels/presets/style-presets.reel/style-presets.html59
-rw-r--r--js/panels/presets/style-presets.reel/style-presets.js79
-rw-r--r--js/panels/presets/transitions-presets.reel/transitions-presets.css0
-rw-r--r--js/panels/presets/transitions-presets.reel/transitions-presets.html58
-rw-r--r--js/panels/presets/transitions-presets.reel/transitions-presets.js46
-rwxr-xr-x[-rw-r--r--]js/panels/properties/content.reel/content.css0
-rwxr-xr-x[-rw-r--r--]js/panels/properties/content.reel/content.html0
-rwxr-xr-x[-rw-r--r--]js/panels/properties/content.reel/content.js9
-rwxr-xr-x[-rw-r--r--]js/panels/properties/properties-panel.js0
-rwxr-xr-x[-rw-r--r--]js/panels/properties/section.reel/section.html0
-rwxr-xr-x[-rw-r--r--]js/panels/properties/section.reel/section.js0
-rwxr-xr-x[-rw-r--r--]js/panels/properties/sections/custom-rows/color-select.reel/color-select.html0
-rwxr-xr-x[-rw-r--r--]js/panels/properties/sections/custom-rows/color-select.reel/color-select.js0
-rwxr-xr-x[-rw-r--r--]js/panels/properties/sections/custom-rows/dual-row.reel/dual-row.html0
-rwxr-xr-x[-rw-r--r--]js/panels/properties/sections/custom-rows/dual-row.reel/dual-row.js0
-rwxr-xr-x[-rw-r--r--]js/panels/properties/sections/custom-rows/single-row.reel/single-row.html0
-rwxr-xr-x[-rw-r--r--]js/panels/properties/sections/custom-rows/single-row.reel/single-row.js0
-rwxr-xr-x[-rw-r--r--]js/panels/properties/sections/custom.reel/custom.html0
-rwxr-xr-x[-rw-r--r--]js/panels/properties/sections/custom.reel/custom.js0
-rwxr-xr-x[-rw-r--r--]js/panels/properties/sections/position-and-size.reel/position-and-size.css0
-rwxr-xr-x[-rw-r--r--]js/panels/properties/sections/position-and-size.reel/position-and-size.html0
-rwxr-xr-x[-rw-r--r--]js/panels/properties/sections/position-and-size.reel/position-and-size.js0
-rwxr-xr-x[-rw-r--r--]js/panels/properties/sections/three-d-view.reel/three-d-view.html0
-rwxr-xr-x[-rw-r--r--]js/panels/properties/sections/three-d-view.reel/three-d-view.js35
99 files changed, 1016 insertions, 158 deletions
diff --git a/js/panels/CSSPanel/CSSPanel.js b/js/panels/CSSPanel/CSSPanel.js
index cf8880a3..cf8880a3 100644..100755
--- a/js/panels/CSSPanel/CSSPanel.js
+++ b/js/panels/CSSPanel/CSSPanel.js
diff --git a/js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.css b/js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.css
index 27d19e58..1b3c9184 100644..100755
--- a/js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.css
+++ b/js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.css
@@ -10,6 +10,11 @@
10 -webkit-box-orient: vertical; 10 -webkit-box-orient: vertical;
11 height:100%; 11 height:100%;
12} 12}
13.css_panel .resizer {
14 background-color: #333;
15 cursor: row-resize;
16 height: 1px;
17}
13.nj-section-header { 18.nj-section-header {
14 background-color: #333; 19 background-color: #333;
15 border-top: 1px solid #3D3D3D; 20 border-top: 1px solid #3D3D3D;
@@ -37,7 +42,6 @@
37 -webkit-box-flex: 0; 42 -webkit-box-flex: 0;
38 background-color: #474747; 43 background-color: #474747;
39 color: #FFF; 44 color: #FFF;
40 max-height: 68px;
41 overflow-y: scroll; 45 overflow-y: scroll;
42} 46}
43#nj-section-styles { 47#nj-section-styles {
diff --git a/js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.html b/js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.html
index 5d6273b6..db630934 100644..100755
--- a/js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.html
+++ b/js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.html
@@ -10,6 +10,16 @@
10 <link rel="stylesheet" href="CSSPanelBase.css" type="text/css"> 10 <link rel="stylesheet" href="CSSPanelBase.css" type="text/css">
11 <script type="text/montage-serialization"> 11 <script type="text/montage-serialization">
12 { 12 {
13 "resizer1": {
14 "module": "js/panels/Resizer",
15 "name": "Resizer",
16 "properties": {
17 "element": {"#": "subPanelResizer"},
18 "panel": {"#": "nj-section-stylesheets"},
19 "isVertical": true