aboutsummaryrefslogtreecommitdiff
path: root/js/panels/CSSPanel
diff options
context:
space:
mode:
authorValerio Virgillito2012-07-09 14:35:44 -0700
committerValerio Virgillito2012-07-09 14:35:44 -0700
commit84b3327bd92faafab7954b5eb64c7abe24a3fe13 (patch)
tree3f56cbed2f08c5a81ea79eaf0bcb9bd031d8a627 /js/panels/CSSPanel
parentc0a42c56f768a873ba637f5b86d5f6a84d4a3312 (diff)
parent40c6eb2c06b34f65a74d59ef9687251952858bab (diff)
downloadninja-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')
-rwxr-xr-xjs/panels/CSSPanel/CSSPanel.js4
-rwxr-xr-xjs/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.css114
-rwxr-xr-xjs/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.html58
-rwxr-xr-xjs/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.js558
-rwxr-xr-xjs/panels/CSSPanel/ComputedStyleSubPanel.reel/ComputedStyleSubPanel.html46
-rwxr-xr-xjs/panels/CSSPanel/ComputedStyleSubPanel.reel/ComputedStyleSubPanel.js30
-rwxr-xr-xjs/panels/CSSPanel/css-shorthand-map.js22
7 files changed, 416 insertions, 416 deletions
diff --git a/js/panels/CSSPanel/CSSPanel.js b/js/panels/CSSPanel/CSSPanel.js
index 0788b2c0..6d4d0bdb 100755
--- a/js/panels/CSSPanel/CSSPanel.js
+++ b/js/panels/CSSPanel/CSSPanel.js
@@ -29,7 +29,7 @@ POSSIBILITY OF SUCH DAMAGE.
29</copyright> */ 29</copyright> */
30 30
31var Montage = require("montage/core/core").Montage, 31var Montage = require("montage/core/core").Montage,
32 PanelBase = require("js/panels/PanelBase").PanelBase; 32 PanelBase = require("js/panels/PanelBase").PanelBase;
33 33
34var CSSPanelBase = require("js/panels/CSSPanel/CSSPanelBase.reel").CSSPanelBase; 34var CSSPanelBase = require("js/panels/CSSPanel/CSSPanelBase.reel").CSSPanelBase;
35 35
@@ -74,4 +74,4 @@ exports.CSSPanel = Montage.create(PanelBase, {
74 value: null, 74 value: null,
75 writable:true 75 writable:true
76 } 76 }
77}); 77});
diff --git a/js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.css b/js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.css
index f70cb8cb..65f7bf79 100755
--- a/js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.css
+++ b/js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.css
@@ -29,9 +29,9 @@ POSSIBILITY OF SUCH DAMAGE.
29</copyright> */ 29</copyright> */
30 30
31.css_panel { 31.css_panel {
32 background-color: #FFF; 32 background-color: #FFF;
33 display: -webkit-box; 33 display: -webkit-box;
34 -webkit-box-orient: vertical; 34 -webkit-box-orient: vertical;
35 height:100%; 35 height:100%;
36} 36}
37.css_panel .resizer { 37.css_panel .resizer {
@@ -40,18 +40,18 @@ POSSIBILITY OF SUCH DAMAGE.
40 height: 1px; 40 height: 1px;
41} 41}
42.nj-section-header { 42.nj-section-header {
43 background-color: #333; 43 background-color: #333;
44 border-top: 1px solid #3D3D3D; 44 border-top: 1px solid #3D3D3D;
45 color: #FFF; 45 color: #FFF;
46 cursor: default; 46 cursor: default;
47 font-size: 12px; 47 font-size: 12px;
48 font-weight: normal; 48 font-weight: normal;
49 height: 16px; 49 height: 16px;
50 margin: 0; 50 margin: 0;
51 padding: 4px 0 2px 10px; 51 padding: 4px 0 2px 10px;
52 vertical-align: top; 52 vertical-align: top;
53 -webkit-box-flex: 0; 53 -webkit-box-flex: 0;
54 -webkit-user-select: none; 54 -webkit-user-select: none;
55} 55}
56#nj-status-heading { 56#nj-status-heading {
57 color: #CCC; 57 color: #CCC;
@@ -75,11 +75,11 @@ POSSIBILITY OF SUCH DAMAGE.
75 -webkit-box-orient: vertical; 75 -webkit-box-orient: vertical;
76} 76}
77.nj-sub-panel { 77.nj-sub-panel {
78 color: #333; 78 color: #333;
79 padding: 0; 79 padding: 0;
80 overflow: hidden; 80 overflow: hidden;
81 opacity: 1; 81 opacity: 1;
82 -webkit-box-flex: 1; 82 -webkit-box-flex: 1;
83} 83}
84.nj-sub-panel.closed { 84.nj-sub-panel.closed {
85 opacity: 0; 85 opacity: 0;
@@ -92,9 +92,9 @@ POSSIBILITY OF SUCH DAMAGE.
92 -webkit-transform: rotate(-90deg); 92 -webkit-transform: rotate(-90deg);
93} 93}
94.nj-sub-panel ul { 94.nj-sub-panel ul {
95 list-style-type: none; 95 list-style-type: none;
96 margin: 4px 0 5px; 96 margin: 4px 0 5px;
97 padding: 0; 97 padding: 0;
98} 98}
99/* ---------------------------------------- 99/* ----------------------------------------
100 CSS Stylesheet List 100 CSS Stylesheet List
@@ -171,16 +171,16 @@ POSSIBILITY OF SUCH DAMAGE.
171 -webkit-box-flex: 1; 171 -webkit-box-flex: 1;
172} 172}
173.nj-css-rule-list li { 173.nj-css-rule-list li {
174 border-top: 1px solid #CCC; 174 border-top: 1px solid #CCC;
175 padding: 6px; 175 padding: 6px;
176} 176}
177.nj-css-rule-list li:first-child { 177.nj-css-rule-list li:first-child {
178 padding-top: 0; 178 padding-top: 0;
179 border-style: none; 179 border-style: none;
180} 180}
181 181
182.nj-css-rule-list li:after { 182.nj-css-rule-list li:after {
183 content: "}"; 183 content: "}";
184} 184}
185.nj-css-rule-list li.nj-css-rule-unapplied { 185.nj-css-rule-list li.nj-css-rule-unapplied {
186 background-color: #F4F4F4; 186 background-color: #F4F4F4;
@@ -202,8 +202,8 @@ POSSIBILITY OF SUCH DAMAGE.
202 CSS Style List 202 CSS Style List
203---------------------------------------- */ 203---------------------------------------- */
204.nj-css-style-list { 204.nj-css-style-list {
205 padding: 0; 205 padding: 0;
206 margin: 0; 206 margin: 0;
207} 207}
208.nj-css-style-list > div { 208.nj-css-style-list > div {
209 overflow: hidden; 209 overflow: hidden;
@@ -212,21 +212,21 @@ POSSIBILITY OF SUCH DAMAGE.
212 white-space: nowrap; 212 white-space: nowrap;
213} 213}
214.nj-css-style-list dt, .nj-css-style-list dd { 214.nj-css-style-list dt, .nj-css-style-list dd {
215 border: 1px solid rgba(0,0,0,0); 215 border: 1px solid rgba(0,0,0,0);
216 border-radius: 2px; 216 border-radius: 2px;
217 margin: 0; 217 margin: 0;
218 outline: none; 218 outline: none;
219 padding: 0 2px; 219 padding: 0 2px;
220} 220}
221.nj-css-style-list dt { 221.nj-css-style-list dt {
222 display: inline-block; 222 display: inline-block;
223 color: rgb(200,0,0); 223 color: rgb(200,0,0);
224 max-width: 68%; 224 max-width: 68%;
225 overflow: hidden; 225 overflow: hidden;
226 text-overflow: ellipsis; 226 text-overflow: ellipsis;
227} 227}
228.nj-css-style-list dd { 228.nj-css-style-list dd {
229 display: inline; 229 display: inline;
230} 230}
231 231
232/* ---------------------------------------- 232/* ----------------------------------------
@@ -234,13 +234,13 @@ POSSIBILITY OF SUCH DAMAGE.
234---------------------------------------- */ 234---------------------------------------- */
235.nj-css-selector { 235.nj-css-selector {
236 display: inline-block; 236 display: inline-block;
237 font-weight: bold; 237 font-weight: bold;
238 padding: 0 2px; 238 padding: 0 2px;
239 outline: none; 239 outline: none;
240} 240}
241.nj-css-selector:after { 241.nj-css-selector:after {
242 content: " {"; 242 content: " {";
243 font-weight: normal; 243 font-weight: normal;
244} 244}
245.nj-css-selector.nj-editable-focus { 245.nj-css-selector.nj-editable-focus {
246 position: relative; 246 position: relative;
@@ -251,21 +251,21 @@ POSSIBILITY OF SUCH DAMAGE.
251 251
252 252
253#nj-section-styles dt:after { 253#nj-section-styles dt:after {
254 color: #333; 254 color: #333;
255 content: ":"; 255 content: ":";
256} 256}
257#nj-section-styles dd:after { 257#nj-section-styles dd:after {
258 content: ";"; 258 content: ";";
259} 259}
260.nj-sheet-link { 260.nj-sheet-link {