diff options
| author | Valerio Virgillito | 2012-07-09 14:35:44 -0700 |
|---|---|---|
| committer | Valerio Virgillito | 2012-07-09 14:35:44 -0700 |
| commit | 84b3327bd92faafab7954b5eb64c7abe24a3fe13 (patch) | |
| tree | 3f56cbed2f08c5a81ea79eaf0bcb9bd031d8a627 /js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.html | |
| parent | c0a42c56f768a873ba637f5b86d5f6a84d4a3312 (diff) | |
| parent | 40c6eb2c06b34f65a74d59ef9687251952858bab (diff) | |
| download | ninja-84b3327bd92faafab7954b5eb64c7abe24a3fe13.tar.gz | |
Merge branch 'normalize' of https://github.com/kriskowal/ninja-internal
Conflicts:
js/components/gradientpicker.reel/gradientpicker.js
js/components/tools-properties/text-properties.reel/text-properties.js
js/document/views/base.js
js/document/views/design.js
js/helper-classes/3D/StageLine.js
js/helper-classes/3D/draw-utils.js
js/lib/drawing/world.js
js/lib/geom/circle.js
js/lib/geom/line.js
js/lib/geom/rectangle.js
js/lib/geom/shape-primitive.js
js/lib/rdge/materials/bump-metal-material.js
js/lib/rdge/materials/flag-material.js
js/lib/rdge/materials/fly-material.js
js/lib/rdge/materials/julia-material.js
js/lib/rdge/materials/keleidoscope-material.js
js/lib/rdge/materials/mandel-material.js
js/lib/rdge/materials/material.js
js/lib/rdge/materials/plasma-material.js
js/lib/rdge/materials/pulse-material.js
js/lib/rdge/materials/radial-gradient-material.js
js/lib/rdge/materials/taper-material.js
js/lib/rdge/materials/twist-vert-material.js
js/lib/rdge/materials/water-material.js
js/panels/Materials/materials-library-panel.reel/materials-library-panel.html
js/panels/Materials/materials-library-panel.reel/materials-library-panel.js
js/panels/Materials/materials-popup.reel/materials-popup.html
js/panels/Materials/materials-popup.reel/materials-popup.js
js/tools/LineTool.js
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
Diffstat (limited to 'js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.html')
| -rwxr-xr-x | js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.html | 58 |
1 files changed, 29 insertions, 29 deletions
diff --git a/js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.html b/js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.html index ed101f23..1cd28842 100755 --- a/js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.html +++ b/js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.html | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | <!DOCTYPE html> | 1 | <!doctype html> |
| 2 | <!-- <copyright> | 2 | <!-- <copyright> |
| 3 | Copyright (c) 2012, Motorola Mobility, Inc | 3 | Copyright (c) 2012, Motorola Mobility, Inc |
| 4 | All Rights Reserved. | 4 | All Rights Reserved. |
| @@ -30,8 +30,8 @@ POSSIBILITY OF SUCH DAMAGE. | |||
| 30 | </copyright> --> | 30 | </copyright> --> |
| 31 | <html lang="en"> | 31 | <html lang="en"> |
| 32 | <head> | 32 | <head> |
| 33 | <meta http-equiv="content-type" content="text/html; charset=utf-8" /> | 33 | <meta http-equiv="content-type" content="text/html; charset=utf-8" /> |
| 34 | <link rel="stylesheet" href="CSSPanelBase.css" type="text/css"> | 34 | <link rel="stylesheet" href="CSSPanelBase.css" type="text/css"> |
| 35 | <script type="text/montage-serialization"> | 35 | <script type="text/montage-serialization"> |
| 36 | { | 36 | { |
| 37 | "resizer1": { | 37 | "resizer1": { |
| @@ -58,39 +58,39 @@ POSSIBILITY OF SUCH DAMAGE. | |||
| 58 | } | 58 | } |
| 59 | } | 59 | } |
| 60 | 60 | ||
| 61 | } | 61 | } |
| 62 | </script> | 62 | </script> |
| 63 | </head> | 63 | </head> |
| 64 | <body> | 64 | <body> |
| 65 | <div data-montage-id="css_panel" class="css_panel"> | 65 | <div data-montage-id="css_panel" class="css_panel"> |
| 66 | <!-- Stylesheet list subsection --> | 66 | <!-- Stylesheet list subsection --> |
| 67 | <h2 id="nj-css-sheets-header" class="nj-section-header"> | 67 | <h2 id="nj-css-sheets-header" class="nj-section-header"> |
| 68 | <div id="nj-css-sheets-arrow" class="panelDisclosureIcon"></div> | 68 | <div id="nj-css-sheets-arrow" class="panelDisclosureIcon"></div> |
| 69 | Stylesheets <span id="nj-current-doc-name"></span> | 69 | Stylesheets <span id="nj-current-doc-name"></span> |
| 70 | </h2> | 70 | </h2> |
| 71 | <div data-montage-id="nj-section-stylesheets" id="nj-section-stylesheets" class="nj-sub-panel"> | 71 | <div data-montage-id="nj-section-stylesheets" id="nj-section-stylesheets" class="nj-sub-panel"> |
| 72 | <ul id="nj-sheet-list"></ul> | 72 | <ul id="nj-sheet-list"></ul> |
| 73 | </div> | ||
| 74 | <div id="nj-css-stylesheet-toolbar" class="nj-css-toolbar"> | ||
| 75 | <a href="#" id="nj-css-add-stylesheet" title="Add Stylesheet">Add Rule</a> | ||
| 73 | </div> | 76 | </div> |
| 74 | <div id="nj-css-stylesheet-toolbar" class="nj-css-toolbar"> | ||
| 75 | <a href="#" id="nj-css-add-stylesheet" title="Add Stylesheet">Add Rule</a> | ||
| 76 | </div> | ||
| 77 | <div data-montage-id="subPanelResizer" class="resizer"></div> | 77 | <div data-montage-id="subPanelResizer" class="resizer"></div> |
| 78 | <!-- Style Rule list subsection --> | 78 | <!-- Style Rule list subsection --> |
| 79 | <h2 id="nj-css-styles-header" class="nj-section-header"> | 79 | <h2 id="nj-css-styles-header" class="nj-section-header"> |
| 80 | <div id="nj-css-styles-arrow" class="panelDisclosureIcon"></div> | 80 | <div id="nj-css-styles-arrow" class="panelDisclosureIcon"></div> |
| 81 | Styles <span id="nj-current-element-name"></span> | 81 | Styles <span id="nj-current-element-name"></span> |
| 82 | <span id="nj-status-heading" class="nj-css-panel-hide"> | 82 | <span id="nj-status-heading" class="nj-css-panel-hide"> |
| 83 | <span id="nj-num-items">0</span> elements selected | 83 | <span id="nj-num-items">0</span> elements selected |
| 84 | </span> | 84 | </span> |
| 85 | </h2> | 85 | </h2> |
| 86 | <div data-montage-id="nj-computed-sub-panel" id="nj-computed-sub-panel"></div> | 86 | <div data-montage-id="nj-computed-sub-panel" id="nj-computed-sub-panel"></div> |
| 87 | <div id="nj-section-styles" class="nj-sub-panel"> | 87 | <div id="nj-section-styles" class="nj-sub-panel"> |
| 88 | <!-- <ul id="nj-css-rule-list"></ul> --> | 88 | <!-- <ul id="nj-css-rule-list"></ul> --> |
| 89 | </div> | ||
| 90 | <div id="nj-css-styles-toolbar" class="nj-css-toolbar"> | ||
| 91 | <a href="#" id="nj-css-show-computed" title="Show Computed Styles">Computed</a> | ||
| 92 | <a href="#" id="nj-css-add-rule" title="Add Rule">Add Rule</a> | ||
| 89 | </div> | 93 | </div> |
| 90 | <div id="nj-css-styles-toolbar" class="nj-css-toolbar"> | ||
| 91 | <a href="#" id="nj-css-show-computed" title="Show Computed Styles">Computed</a> | ||
| 92 | <a href="#" id="nj-css-add-rule" title="Add Rule">Add Rule</a> | ||
| 93 | </div> | ||
| 94 | </div> | 94 | </div> |
| 95 | </body> | 95 | </body> |
| 96 | </html> | 96 | </html> |