From 4afb01e3b8261ab5e9492bfc63ad17e44dfcb934 Mon Sep 17 00:00:00 2001 From: Eric Guzman Date: Fri, 16 Mar 2012 15:08:29 -0700 Subject: CSS Panel Updates - CSS tweaks and cleanup --- js/panels/collapse-composer.js | 3 -- .../css-style-rule.reel/css-style-rule.css | 6 +++ .../css-style-rule.reel/css-style-rule.html | 4 +- js/panels/css-panel/rule-list.reel/rule-list.css | 3 +- js/panels/css-panel/rule-list.reel/rule-list.html | 56 ---------------------- .../style-shorthand.reel/style-shorthand.css | 2 +- js/panels/css-panel/style.reel/style.css | 7 +++ .../styles-view-container.css | 14 ------ 8 files changed, 17 insertions(+), 78 deletions(-) (limited to 'js/panels') 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, { value: function() { if(this._doCollapse) { if (this._step === 0) { - console.log("step 0"); this.component.element.style.height = this._expandedHeight; this._step = 1; this.needsFrame = true; } else if (this._step === 1) { - console.log("step 1"); this.component.element.style.webkitTransition = 'height 0.14s cubic-bezier(.44,.19,0,.99)'; this._step = 2; this.needsFrame = true; } else { - console.log("step 2"); this.component.element.style.height = '0px'; this.collapsed = true; 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 @@ .css-style-rule-item { position: relative; } +.css-style-rule-item:after { + content: "}"; + padding: 0 0 0 4px; + position: relative; + top: -10px; +} .style-rule-heading { background-color: #f3f3f3; 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 -

+ \ 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 @@ } .rule-list li { list-style-type: none; - margin: 3px 6px; - position: relative; + margin: 0; } \ 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 } } -

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 @@ /*padding-left: 10px;*/ } .style-item { - padding-left: 10px; + padding-left: 20px; } .css-tree-branch .css-tree-branch { 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 @@ outline: none; padding: 0 2px; } +.css-property:after { + color: #333; + content: ":"; +} +.css-value:after { + content: ";"; +} .css-property { display: inline-block; 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 @@ .styles-view-toolbar-container .toolbar-container { border-top: 1px solid #5c5c5c; } - - -.styles-view-container .rule-list li { - border-top: 1px solid #CCC; - padding: 6px; -} -.styles-view-container .rule-list li:first-child { - padding-top: 0; - border-style: none; -} - -.styles-view-container .rule-list li:after { - content: "}"; -} \ No newline at end of file -- cgit v1.2.3