aboutsummaryrefslogtreecommitdiff
path: root/js/panels
diff options
context:
space:
mode:
authorEric Guzman2012-03-16 15:08:29 -0700
committerEric Guzman2012-03-16 15:08:29 -0700
commit4afb01e3b8261ab5e9492bfc63ad17e44dfcb934 (patch)
treee34d41690924d9d35abdf1ffb56aedbf85f993dc /js/panels
parent5247614b90c5cb104166b22ae92b8f29bd1e306f (diff)
downloadninja-4afb01e3b8261ab5e9492bfc63ad17e44dfcb934.tar.gz
CSS Panel Updates - CSS tweaks and cleanup
Diffstat (limited to 'js/panels')
-rw-r--r--js/panels/collapse-composer.js3
-rw-r--r--js/panels/css-panel/rule-components/css-style-rule.reel/css-style-rule.css6
-rw-r--r--js/panels/css-panel/rule-components/css-style-rule.reel/css-style-rule.html4
-rw-r--r--js/panels/css-panel/rule-list.reel/rule-list.css3
-rw-r--r--js/panels/css-panel/rule-list.reel/rule-list.html56
-rw-r--r--js/panels/css-panel/style-shorthand.reel/style-shorthand.css2
-rw-r--r--js/panels/css-panel/style.reel/style.css7
-rw-r--r--js/panels/css-panel/styles-view-container.reel/styles-view-container.css14
8 files changed, 17 insertions, 78 deletions
diff --git a/js/panels/collapse-composer.js b/js/panels/collapse-composer.js
index d2f477ad..0bd916c8 100644
--- a/js/panels/collapse-composer.js
+++ b/js/panels/collapse-composer.js
@@ -87,17 +87,14 @@ exports.CollapseComposer = Montage.create(Composer, {
87 value: function() { 87 value: function() {
88 if(this._doCollapse) { 88 if(this._doCollapse) {
89 if (this._step === 0) { 89 if (this._step === 0) {
90 console.log("step 0");
91 this.component.element.style.height = this._expandedHeight; 90 this.component.element.style.height = this._expandedHeight;
92 this._step = 1; 91 this._step = 1;
93 this.needsFrame = true; 92 this.needsFrame = true;
94 } else if (this._step === 1) { 93 } else if (this._step === 1) {
95 console.log("step 1");
96 this.component.element.style.webkitTransition = 'height 0.14s cubic-bezier(.44,.19,0,.99)'; 94 this.component.element.style.webkitTransition = 'height 0.14s cubic-bezier(.44,.19,0,.99)';
97 this._step = 2; 95 this._step = 2;
98 this.needsFrame = true; 96 this.needsFrame = true;
99 } else { 97 } else {
100 console.log("step 2");
101 this.component.element.style.height = '0px'; 98 this.component.element.style.height = '0px';
102 this.collapsed = true; 99 this.collapsed = true;
103 this._doCollapse = false; 100 this._doCollapse = false;
diff --git a/js/panels/css-panel/rule-components/css-style-rule.reel/css-style-rule.css b/js/panels/css-panel/rule-components/css-style-rule.reel/css-style-rule.css
index deb71d31..3ec8901a 100644
--- a/js/panels/css-panel/rule-components/css-style-rule.reel/css-style-rule.css
+++ b/js/panels/css-panel/rule-components/css-style-rule.reel/css-style-rule.css
@@ -6,6 +6,12 @@
6.css-style-rule-item { 6.css-style-rule-item {
7 position: relative; 7 position: relative;
8} 8}
9.css-style-rule-item:after {
10 content: "}";
11 padding: 0 0 0 4px;
12 position: relative;
13 top: -10px;
14}
9.style-rule-heading { 15.style-rule-heading {
10 background-color: #f3f3f3; 16 background-color: #f3f3f3;
11 border: 1px #e7e7e7; 17 border: 1px #e7e7e7;
diff --git a/js/panels/css-panel/rule-components/css-style-rule.reel/css-style-rule.html b/js/panels/css-panel/rule-components/css-style-rule.reel/css-style-rule.html
index 2f5d69af..de64f81f 100644
--- a/js/panels/css-panel/rule-components/css-style-rule.reel/css-style-rule.html
+++ b/js/panels/css-panel/rule-components/css-style-rule.reel/css-style-rule.html
@@ -64,12 +64,12 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
64 </script> 64 </script>
65</head> 65</head>
66<body> 66<body>
67<div id="rule-item" class="css-style-rule-item"> 67<li id="rule-item" class="css-style-rule-item">
68 <div class="style-rule-heading"> 68 <div class="style-rule-heading">
69 <a href="#" id="style-sheet-name" class="style-sheet-name"></a> 69 <a href="#" id="style-sheet-name" class="style-sheet-name"></a>
70 <span id="rule-selector" class="nj-css-selector"></span> 70 <span id="rule-selector" class="nj-css-selector"></span>
71 </div> 71 </div>
72 <dl id="declaration-list"></dl> 72 <dl id="declaration-list"></dl>
73</div> 73</li>
74</body> 74</body>
75</html> \ No newline at end of file 75</html> \ No newline at end of file
diff --git a/js/panels/css-panel/rule-list.reel/rule-list.css b/js/panels/css-panel/rule-list.reel/rule-list.css
index e4a10657..0f744511 100644
--- a/js/panels/css-panel/rule-list.reel/rule-list.css
+++ b/js/panels/css-panel/rule-list.reel/rule-list.css
@@ -22,6 +22,5 @@
22} 22}
23.rule-list li { 23.rule-list li {
24 list-style-type: none; 24 list-style-type: none;
25 margin: 3px 6px; 25 margin: 0;
26 position: relative;
27} \ No newline at end of file 26} \ No newline at end of file
diff --git a/js/panels/css-panel/rule-list.reel/rule-list.html b/js/panels/css-panel/rule-list.reel/rule-list.html
index efede847..c11e488d 100644
--- a/js/panels/css-panel/rule-list.reel/rule-list.html
+++ b/js/panels/css-panel/rule-list.reel/rule-list.html
@@ -19,62 +19,6 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
19 } 19 }
20 } 20 }
21 </script> 21 </script>
22 <script type="text/json">
23 ,
24 "ruleListController": {
25 "module":"montage/ui/controller/array-controller",
26 "name": "ArrayController",
27 "bindings": {
28 "content" : {
29 "boundObject": {"@": "owner"},
30 "boundObjectPropertyPath": "contentController.ruleList",
31 "oneway": true
32 }
33 }
34 },
35 "ruleList": {
36 "module" : "montage/ui/repetition.reel",
37 "name": "Repetition",
38 "properties": {
39 "element": {"#": "rules-list"}
40 },
41 "bindings": {
42 "objects" : {
43 "boundObject": {"@": "owner"},
44 "boundObjectPropertyPath": "contentController.ruleList",
45 "oneway": true
46 }
47 }
48 },
49 "slot": {
50 "module" : "montage/ui/slot.reel",
51 "name" : "Slot",
52 "properties" : {
53 "element" : {"#" : "rule-item"}
54 },
55 "bindings": {
56 "rule" : {
57 "boundObject": {"@": "ruleList"},
58 "boundObjectPropertyPath": "objectAtCurrentIteration",
59 "oneway": true
60 }
61 }
62 },
63 "ruleContainer": {
64 "module": "js/panels/css-panel/rule-container.reel",
65 "name": "RuleContainer",
66 "properties": {
67 "element": {"#": "rule-item"}
68 },
69 "bindings": {
70 "rule" : {
71 "boundObject": {"@": "ruleList"},
72 "boundObjectPropertyPath": "objectAtCurrentIteration",
73 "oneway": true
74 }
75 }
76 }
77 </script>
78</head> 22</head>
79<body> 23<body>
80<ul id="rule-list" class="rule-list"></ul> 24<ul id="rule-list" class="rule-list"></ul>
diff --git a/js/panels/css-panel/style-shorthand.reel/style-shorthand.css b/js/panels/css-panel/style-shorthand.reel/style-shorthand.css
index d138dfef..52f5a3c1 100644
--- a/js/panels/css-panel/style-shorthand.reel/style-shorthand.css
+++ b/js/panels/css-panel/style-shorthand.reel/style-shorthand.css
@@ -8,7 +8,7 @@
8 /*padding-left: 10px;*/ 8 /*padding-left: 10px;*/
9} 9}
10.style-item { 10.style-item {
11 padding-left: 10px; 11 padding-left: 20px;
12} 12}
13.css-tree-branch .css-tree-branch { 13.css-tree-branch .css-tree-branch {
14 padding-left: 20px; 14 padding-left: 20px;
diff --git a/js/panels/css-panel/style.reel/style.css b/js/panels/css-panel/style.reel/style.css
index ebeefb91..4673ab69 100644
--- a/js/panels/css-panel/style.reel/style.css
+++ b/js/panels/css-panel/style.reel/style.css
@@ -17,6 +17,13 @@
17 outline: none; 17 outline: none;
18 padding: 0 2px; 18 padding: 0 2px;
19} 19}
20.css-property:after {
21 color: #333;
22 content: ":";
23}
24.css-value:after {
25 content: ";";
26}
20.css-property { 27.css-property {
21 display: inline-block; 28 display: inline-block;
22 color: rgb(200,0,0); 29 color: rgb(200,0,0);
diff --git a/js/panels/css-panel/styles-view-container.reel/styles-view-container.css b/js/panels/css-panel/styles-view-container.reel/styles-view-container.css
index ff0b0b25..0b1aa892 100644
--- a/js/panels/css-panel/styles-view-container.reel/styles-view-container.css
+++ b/js/panels/css-panel/styles-view-container.reel/styles-view-container.css
@@ -23,17 +23,3 @@
23.styles-view-toolbar-container .toolbar-container { 23.styles-view-toolbar-container .toolbar-container {
24 border-top: 1px solid #5c5c5c; 24 border-top: 1px solid #5c5c5c;
25} 25}
26
27
28.styles-view-container .rule-list li {
29 border-top: 1px solid #CCC;
30 padding: 6px;
31}
32.styles-view-container .rule-list li:first-child {
33 padding-top: 0;
34 border-style: none;
35}
36
37.styles-view-container .rule-list li:after {
38 content: "}";
39} \ No newline at end of file
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-22 13:46:27 +0000