diff options
author | Ananya Sen | 2012-07-09 16:52:49 -0700 |
---|---|---|
committer | Ananya Sen | 2012-07-09 16:52:49 -0700 |
commit | 2eb84584f44b8c774479d1af2ee1d810597474cf (patch) | |
tree | 64cb3e09a8daeb340261dd7f3869c73f7b90b643 /js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.html | |
parent | bf9dba001ec84243e2f12cd13b0c0ae020fba4a2 (diff) | |
parent | cee0deca695359ab468bd06d0e05ed3b2010b338 (diff) | |
download | ninja-2eb84584f44b8c774479d1af2ee1d810597474cf.tar.gz |
Merge branch 'refs/heads/ninja-internal-master' into codemirror-custom-theme-removal
Conflicts:
js/code-editor/codemirror-ninja/theme/lesser-dark-ninja.css
js/code-editor/codemirror-ninja/theme/xq-dark-ninja.css
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
Diffstat (limited to 'js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.html')
-rwxr-xr-x | js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.html | 81 |
1 files changed, 41 insertions, 40 deletions
diff --git a/js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.html b/js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.html index ed101f23..e49f4fdb 100755 --- a/js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.html +++ b/js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.html | |||
@@ -1,25 +1,26 @@ | |||
1 | <!DOCTYPE html> | 1 | <!doctype html> |
2 | <!-- <copyright> | 2 | <!-- <copyright> |
3 | Copyright (c) 2012, Motorola Mobility, Inc | 3 | Copyright (c) 2012, Motorola Mobility LLC. |
4 | All Rights Reserved. | 4 | All Rights Reserved. |
5 | BSD License. | ||
6 | 5 | ||
7 | Redistribution and use in source and binary forms, with or without | 6 | Redistribution and use in source and binary forms, with or without |
8 | modification, are permitted provided that the following conditions are met: | 7 | modification, are permitted provided that the following conditions are met: |
9 | 8 | ||
10 | - Redistributions of source code must retain the above copyright notice, | 9 | * Redistributions of source code must retain the above copyright notice, |
11 | this list of conditions and the following disclaimer. | 10 | this list of conditions and the following disclaimer. |
12 | - Redistributions in binary form must reproduce the above copyright | 11 | |
13 | notice, this list of conditions and the following disclaimer in the | 12 | * Redistributions in binary form must reproduce the above copyright notice, |
14 | documentation and/or other materials provided with the distribution. | 13 | this list of conditions and the following disclaimer in the documentation |
15 | - Neither the name of Motorola Mobility nor the names of its contributors | 14 | and/or other materials provided with the distribution. |
16 | may be used to endorse or promote products derived from this software | 15 | |
17 | without specific prior written permission. | 16 | * Neither the name of Motorola Mobility LLC nor the names of its |
17 | contributors may be used to endorse or promote products derived from this | ||
18 | software without specific prior written permission. | ||
18 | 19 | ||
19 | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" | 20 | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" |
20 | AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | 21 | AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE |
21 | IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | 22 | IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE |
22 | ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE | 23 | ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE |
23 | LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR | 24 | LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR |
24 | CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF | 25 | CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF |
25 | SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS | 26 | SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS |
@@ -30,8 +31,8 @@ POSSIBILITY OF SUCH DAMAGE. | |||
30 | </copyright> --> | 31 | </copyright> --> |
31 | <html lang="en"> | 32 | <html lang="en"> |
32 | <head> | 33 | <head> |
33 | <meta http-equiv="content-type" content="text/html; charset=utf-8" /> | 34 | <meta http-equiv="content-type" content="text/html; charset=utf-8" /> |
34 | <link rel="stylesheet" href="CSSPanelBase.css" type="text/css"> | 35 | <link rel="stylesheet" href="CSSPanelBase.css" type="text/css"> |
35 | <script type="text/montage-serialization"> | 36 | <script type="text/montage-serialization"> |
36 | { | 37 | { |
37 | "resizer1": { | 38 | "resizer1": { |
@@ -58,39 +59,39 @@ POSSIBILITY OF SUCH DAMAGE. | |||
58 | } | 59 | } |
59 | } | 60 | } |
60 | 61 | ||
61 | } | 62 | } |
62 | </script> | 63 | </script> |
63 | </head> | 64 | </head> |
64 | <body> | 65 | <body> |
65 | <div data-montage-id="css_panel" class="css_panel"> | 66 | <div data-montage-id="css_panel" class="css_panel"> |
66 | <!-- Stylesheet list subsection --> | 67 | <!-- Stylesheet list subsection --> |
67 | <h2 id="nj-css-sheets-header" class="nj-section-header"> | 68 | <h2 id="nj-css-sheets-header" class="nj-section-header"> |
68 | <div id="nj-css-sheets-arrow" class="panelDisclosureIcon"></div> | 69 | <div id="nj-css-sheets-arrow" class="panelDisclosureIcon"></div> |
69 | Stylesheets <span id="nj-current-doc-name"></span> | 70 | Stylesheets <span id="nj-current-doc-name"></span> |
70 | </h2> | 71 | </h2> |
71 | <div data-montage-id="nj-section-stylesheets" id="nj-section-stylesheets" class="nj-sub-panel"> | 72 | <div data-montage-id="nj-section-stylesheets" id="nj-section-stylesheets" class="nj-sub-panel"> |
72 | <ul id="nj-sheet-list"></ul> | 73 | <ul id="nj-sheet-list"></ul> |
74 | </div> | ||
75 | <div id="nj-css-stylesheet-toolbar" class="nj-css-toolbar"> | ||
76 | <a href="#" id="nj-css-add-stylesheet" title="Add Stylesheet">Add Rule</a> | ||
73 | </div> | 77 | </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> | 78 | <div data-montage-id="subPanelResizer" class="resizer"></div> |
78 | <!-- Style Rule list subsection --> | 79 | <!-- Style Rule list subsection --> |
79 | <h2 id="nj-css-styles-header" class="nj-section-header"> | 80 | <h2 id="nj-css-styles-header" class="nj-section-header"> |
80 | <div id="nj-css-styles-arrow" class="panelDisclosureIcon"></div> | 81 | <div id="nj-css-styles-arrow" class="panelDisclosureIcon"></div> |
81 | Styles <span id="nj-current-element-name"></span> | 82 | Styles <span id="nj-current-element-name"></span> |
82 | <span id="nj-status-heading" class="nj-css-panel-hide"> | 83 | <span id="nj-status-heading" class="nj-css-panel-hide"> |
83 | <span id="nj-num-items">0</span> elements selected | 84 | <span id="nj-num-items">0</span> elements selected |
84 | </span> | 85 | </span> |
85 | </h2> | 86 | </h2> |
86 | <div data-montage-id="nj-computed-sub-panel" id="nj-computed-sub-panel"></div> | 87 | <div data-montage-id="nj-computed-sub-panel" id="nj-computed-sub-panel"></div> |
87 | <div id="nj-section-styles" class="nj-sub-panel"> | 88 | <div id="nj-section-styles" class="nj-sub-panel"> |
88 | <!-- <ul id="nj-css-rule-list"></ul> --> | 89 | <!-- <ul id="nj-css-rule-list"></ul> --> |
90 | </div> | ||
91 | <div id="nj-css-styles-toolbar" class="nj-css-toolbar"> | ||
92 | <a href="#" id="nj-css-show-computed" title="Show Computed Styles">Computed</a> | ||
93 | <a href="#" id="nj-css-add-rule" title="Add Rule">Add Rule</a> | ||
89 | </div> | 94 | </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> | 95 | </div> |
95 | </body> | 96 | </body> |
96 | </html> | 97 | </html> |