diff options
author | John Mayhew | 2012-07-09 17:28:24 -0700 |
---|---|---|
committer | John Mayhew | 2012-07-09 17:28:24 -0700 |
commit | 770bcb52422742ff741a88a75ecefbeb90bc9247 (patch) | |
tree | 64cb3e09a8daeb340261dd7f3869c73f7b90b643 /js/panels/CSSPanel | |
parent | 8c5ecaf90062f9e030386f338bdc19fd62b826c8 (diff) | |
parent | 2b2b5fbb4b6a786daa4e9d4ee9eba9ac78924842 (diff) | |
download | ninja-770bcb52422742ff741a88a75ecefbeb90bc9247.tar.gz |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal
Conflicts:
manifest.json
Diffstat (limited to 'js/panels/CSSPanel')
10 files changed, 536 insertions, 526 deletions
diff --git a/js/panels/CSSPanel/CSSPanel.js b/js/panels/CSSPanel/CSSPanel.js index 0788b2c0..a07b489d 100755 --- a/js/panels/CSSPanel/CSSPanel.js +++ b/js/panels/CSSPanel/CSSPanel.js | |||
@@ -1,24 +1,25 @@ | |||
1 | /* <copyright> | 1 | /* <copyright> |
2 | Copyright (c) 2012, Motorola Mobility, Inc | 2 | Copyright (c) 2012, Motorola Mobility LLC. |
3 | All Rights Reserved. | 3 | All Rights Reserved. |
4 | BSD License. | ||
5 | 4 | ||
6 | Redistribution and use in source and binary forms, with or without | 5 | Redistribution and use in source and binary forms, with or without |
7 | modification, are permitted provided that the following conditions are met: | 6 | modification, are permitted provided that the following conditions are met: |
8 | 7 | ||
9 | - Redistributions of source code must retain the above copyright notice, | 8 | * Redistributions of source code must retain the above copyright notice, |
10 | this list of conditions and the following disclaimer. | 9 | this list of conditions and the following disclaimer. |
11 | - Redistributions in binary form must reproduce the above copyright | 10 | |
12 | notice, this list of conditions and the following disclaimer in the | 11 | * Redistributions in binary form must reproduce the above copyright notice, |
13 | documentation and/or other materials provided with the distribution. | 12 | this list of conditions and the following disclaimer in the documentation |
14 | - Neither the name of Motorola Mobility nor the names of its contributors | 13 | and/or other materials provided with the distribution. |
15 | may be used to endorse or promote products derived from this software | 14 | |
16 | without specific prior written permission. | 15 | * Neither the name of Motorola Mobility LLC nor the names of its |
16 | contributors may be used to endorse or promote products derived from this | ||
17 | software without specific prior written permission. | ||
17 | 18 | ||
18 | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" | 19 | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" |
19 | AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | 20 | AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE |
20 | IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | 21 | IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE |
21 | ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE | 22 | ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE |
22 | LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR | 23 | LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR |
23 | CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF | 24 | CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF |
24 | SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS | 25 | SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS |
@@ -29,7 +30,7 @@ POSSIBILITY OF SUCH DAMAGE. | |||
29 | </copyright> */ | 30 | </copyright> */ |
30 | 31 | ||
31 | var Montage = require("montage/core/core").Montage, | 32 | var Montage = require("montage/core/core").Montage, |
32 | PanelBase = require("js/panels/PanelBase").PanelBase; | 33 | PanelBase = require("js/panels/PanelBase").PanelBase; |
33 | 34 | ||
34 | var CSSPanelBase = require("js/panels/CSSPanel/CSSPanelBase.reel").CSSPanelBase; | 35 | var CSSPanelBase = require("js/panels/CSSPanel/CSSPanelBase.reel").CSSPanelBase; |
35 | 36 | ||
@@ -74,4 +75,4 @@ exports.CSSPanel = Montage.create(PanelBase, { | |||
74 | value: null, | 75 | value: null, |
75 | writable:true | 76 | writable:true |
76 | } | 77 | } |
77 | }); | 78 | }); |
diff --git a/js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.css b/js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.css index f70cb8cb..3e232378 100755 --- a/js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.css +++ b/js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.css | |||
@@ -1,24 +1,25 @@ | |||
1 | /* <copyright> | 1 | /* <copyright> |
2 | Copyright (c) 2012, Motorola Mobility, Inc | 2 | Copyright (c) 2012, Motorola Mobility LLC. |
3 | All Rights Reserved. | 3 | All Rights Reserved. |
4 | BSD License. | ||
5 | 4 | ||
6 | Redistribution and use in source and binary forms, with or without | 5 | Redistribution and use in source and binary forms, with or without |
7 | modification, are permitted provided that the following conditions are met: | 6 | modification, are permitted provided that the following conditions are met: |
8 | 7 | ||
9 | - Redistributions of source code must retain the above copyright notice, | 8 | * Redistributions of source code must retain the above copyright notice, |
10 | this list of conditions and the following disclaimer. | 9 | this list of conditions and the following disclaimer. |
11 | - Redistributions in binary form must reproduce the above copyright | 10 | |
12 | notice, this list of conditions and the following disclaimer in the | 11 | * Redistributions in binary form must reproduce the above copyright notice, |
13 | documentation and/or other materials provided with the distribution. | 12 | this list of conditions and the following disclaimer in the documentation |
14 | - Neither the name of Motorola Mobility nor the names of its contributors | 13 | and/or other materials provided with the distribution. |
15 | may be used to endorse or promote products derived from this software | 14 | |
16 | without specific prior written permission. | 15 | * Neither the name of Motorola Mobility LLC nor the names of its |
16 | contributors may be used to endorse or promote products derived from this | ||
17 | software without specific prior written permission. | ||
17 | 18 | ||
18 | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" | 19 | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" |
19 | AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | 20 | AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE |
20 | IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | 21 | IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE |
21 | ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE | 22 | ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE |
22 | LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR | 23 | LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR |
23 | CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF | 24 | CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF |
24 | SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS | 25 | SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS |
@@ -29,9 +30,9 @@ POSSIBILITY OF SUCH DAMAGE. | |||
29 | </copyright> */ | 30 | </copyright> */ |
30 | 31 | ||
31 | .css_panel { | 32 | .css_panel { |
32 | background-color: #FFF; | 33 | background-color: #FFF; |
33 | display: -webkit-box; | 34 | display: -webkit-box; |
34 | -webkit-box-orient: vertical; | 35 | -webkit-box-orient: vertical; |
35 | height:100%; | 36 | height:100%; |
36 | } | 37 | } |
37 | .css_panel .resizer { | 38 | .css_panel .resizer { |
@@ -40,18 +41,18 @@ POSSIBILITY OF SUCH DAMAGE. | |||
40 | height: 1px; | 41 | height: 1px; |
41 | } | 42 | } |
42 | .nj-section-header { | 43 | .nj-section-header { |
43 | background-color: #333; | 44 | background-color: #333; |
44 | border-top: 1px solid #3D3D3D; | 45 | border-top: 1px solid #3D3D3D; |
45 | color: #FFF; | 46 | color: #FFF; |
46 | cursor: default; | 47 | cursor: default; |
47 | font-size: 12px; | 48 | font-size: 12px; |
48 | font-weight: normal; | 49 | font-weight: normal; |
49 | height: 16px; | 50 | height: 16px; |
50 | margin: 0; | 51 | margin: 0; |
51 | padding: 4px 0 2px 10px; | 52 | padding: 4px 0 2px 10px; |
52 | vertical-align: top; | 53 | vertical-align: top; |
53 | -webkit-box-flex: 0; | 54 | -webkit-box-flex: 0; |
54 | -webkit-user-select: none; | 55 | -webkit-user-select: none; |
55 | } | 56 | } |
56 | #nj-status-heading { | 57 | #nj-status-heading { |
57 | color: #CCC; | 58 | color: #CCC; |
@@ -75,11 +76,11 @@ POSSIBILITY OF SUCH DAMAGE. | |||
75 | -webkit-box-orient: vertical; | 76 | -webkit-box-orient: vertical; |
76 | } | 77 | } |
77 | .nj-sub-panel { | 78 | .nj-sub-panel { |
78 | color: #333; | 79 | color: #333; |
79 | padding: 0; | 80 | padding: 0; |
80 | overflow: hidden; | 81 | overflow: hidden; |
81 | opacity: 1; | 82 | opacity: 1; |
82 | -webkit-box-flex: 1; | 83 | -webkit-box-flex: 1; |
83 | } | 84 | } |
84 | .nj-sub-panel.closed { | 85 | .nj-sub-panel.closed { |
85 | opacity: 0; | 86 | opacity: 0; |
@@ -92,9 +93,9 @@ POSSIBILITY OF SUCH DAMAGE. | |||
92 | -webkit-transform: rotate(-90deg); | 93 | -webkit-transform: rotate(-90deg); |
93 | } | 94 | } |
94 | .nj-sub-panel ul { | 95 | .nj-sub-panel ul { |
95 | list-style-type: none; | 96 | list-style-type: none; |
96 | margin: 4px 0 5px; | 97 | margin: 4px 0 5px; |
97 | padding: 0; | 98 | padding: 0; |
98 | } | 99 | } |
99 | /* ---------------------------------------- | 100 | /* ---------------------------------------- |
100 | CSS Stylesheet List | 101 | CSS Stylesheet List |
@@ -171,16 +172,16 @@ POSSIBILITY OF SUCH DAMAGE. | |||
171 | -webkit-box-flex: 1; | 172 | -webkit-box-flex: 1; |
172 | } | 173 | } |
173 | .nj-css-rule-list li { | 174 | .nj-css-rule-list li { |
174 | border-top: 1px solid #CCC; | 175 | border-top: 1px solid #CCC; |
175 | padding: 6px; | 176 | padding: 6px; |
176 | } | 177 | } |
177 | .nj-css-rule-list li:first-child { | 178 | .nj-css-rule-list li:first-child { |
178 | padding-top: 0; | 179 | padding-top: 0; |
179 | border-style: none; | 180 | border-style: none; |
180 | } | 181 | } |
181 | 182 | ||
182 | .nj-css-rule-list li:after { | 183 | .nj-css-rule-list li:after { |
183 | content: "}"; | 184 | content: "}"; |
184 | } | 185 | } |
185 | .nj-css-rule-list li.nj-css-rule-unapplied { | 186 | .nj-css-rule-list li.nj-css-rule-unapplied { |
186 | background-color: #F4F4F4; | 187 |