diff options
| author | Jonathan Duran | 2012-05-11 14:13:07 -0700 |
|---|---|---|
| committer | Jonathan Duran | 2012-05-11 14:13:07 -0700 |
| commit | 1e2138fc7d0007b0ad3cb4807dc1c9101190f2f2 (patch) | |
| tree | 2563aa7694c3caaf813ca71ef3250b2a76ee0041 /js/panels | |
| parent | 32257ac142f872d3c1f6c07504bae77ae884ed93 (diff) | |
| parent | 6fcaa4e923a19672b5860b4c6f67d836680e7e99 (diff) | |
| download | ninja-1e2138fc7d0007b0ad3cb4807dc1c9101190f2f2.tar.gz | |
Merge branch 'refs/heads/TimelineUber' into TimelineProps
Diffstat (limited to 'js/panels')
35 files changed, 412 insertions, 340 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/CSSPanel/ComputedStyleSubPanel.reel/ComputedStyleSubPanel.html b/js/panels/CSSPanel/ComputedStyleSubPanel.reel/ComputedStyleSubPanel.html index 53c243a8..25196bc6 100755 --- a/js/panels/CSSPanel/ComputedStyleSubPanel.reel/ComputedStyleSubPanel.html +++ b/js/panels/CSSPanel/ComputedStyleSubPanel.reel/ComputedStyleSubPanel.html | |||
| @@ -26,10 +26,10 @@ | |||
| 26 | 26 | ||
| 27 | </head> | 27 | </head> |
| 28 | <body id="computestylesubpanel" onload=""> | 28 | <body id="computestylesubpanel" onload=""> |
| 29 | <div id="nj-css-panel-computed" class="nj-css-panel-hide"> | 29 | <div data-montage-id="nj-css-panel-computed" class="nj-css-panel-hide"> |
| 30 | <div id="nj-css-filter-panel"> | 30 | <div id="nj-css-filter-panel"> |
| 31 | <input id="nj-css-filter" class="nj-skinned" type="search"> | 31 | <input data-montage-id="nj-css-filter" class="nj-skinned" type="search"> |
| 32 | <select id="nj-css-group-select" class="nj-skinned"> | 32 | <select data-montage-id="nj-css-group-select" class="nj-skinned"> |
| 33 | <option value="all">All</option> | 33 | <option value="all">All</option> |
| 34 | <option value="summary" selected>Summary</option> | 34 | <option value="summary" selected>Summary</option> |
| 35 | <option value="background">Background</option> | 35 | <option value="background">Background</option> |
| @@ -40,7 +40,7 @@ | |||
| 40 | </select> | 40 | </select> |
| 41 | </div> | 41 | </div> |
| 42 | <div class="nj-sub-panel"> | 42 | <div class="nj-sub-panel"> |
| 43 | <dl id="nj-css-computed-list" class="nj-css-style-list"></dl> | 43 | <dl data-montage-id="nj-css-computed-list" class="nj-css-style-list"></dl> |
| 44 | </div> | 44 | </div> |
| 45 | </div> | 45 | </div> |
| 46 | </body> | 46 | </body> |
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..b5d7a869 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 | |||
| @@ -50,7 +50,7 @@ | |||
| 50 | "prototype": "js/panels/Materials/materials-popup.reel" | 50 | "prototype": "js/panels/Materials/materials-popup.reel" |
| 51 | }, | 51 | }, |
| 52 | "materialsController" : { | 52 | "materialsController" : { |
| 53 | "prototype": "js/controllers/tree-controller", | ||