From 1433f2bdf2e5b8c5c18fed5e9c17fd983ab3606d Mon Sep 17 00:00:00 2001 From: Eric Guzman Date: Fri, 2 Mar 2012 10:55:51 -0800 Subject: CSS Panel - Updating components, created toolbar components, and small changes to styles controller --- .../css-panel/rule-components/css-style-rule.reel/css-style-rule.css | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 js/panels/css-panel/rule-components/css-style-rule.reel/css-style-rule.css (limited to 'js/panels/css-panel/rule-components/css-style-rule.reel/css-style-rule.css') 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 new file mode 100644 index 00000000..0441c1cf --- /dev/null +++ b/js/panels/css-panel/rule-components/css-style-rule.reel/css-style-rule.css @@ -0,0 +1,5 @@ +/* + This file contains proprietary software owned by Motorola Mobility, Inc.
+ No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.
+ (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. +
*/ \ No newline at end of file -- cgit v1.2.3 From a43de0b808db09ed76a94bf43ca0108bedeb2e62 Mon Sep 17 00:00:00 2001 From: Eric Guzman Date: Mon, 12 Mar 2012 15:25:53 -0700 Subject: CSS Panel Update - Style Rule update --- .../rule-components/css-style-rule.reel/css-style-rule.css | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'js/panels/css-panel/rule-components/css-style-rule.reel/css-style-rule.css') 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 0441c1cf..9306955c 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 @@ -2,4 +2,15 @@ This file contains proprietary software owned by Motorola Mobility, Inc.
No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.
(c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. - */ \ No newline at end of file + */ +.css-style-rule-item { + position: relative; +} +.style-rule-heading { + /*background-color: #333;*/ +} +.style-sheet-name { + position: absolute; + right: 0; + +} \ No newline at end of file -- cgit v1.2.3 From 40e03e102c14a343efee1bdcf32d0d244e3f8344 Mon Sep 17 00:00:00 2001 From: Eric Guzman Date: Tue, 13 Mar 2012 15:52:33 -0700 Subject: CSS Panel - Style updates for collapsing branches --- .../rule-components/css-style-rule.reel/css-style-rule.css | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'js/panels/css-panel/rule-components/css-style-rule.reel/css-style-rule.css') 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 9306955c..deb71d31 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 @@ -7,10 +7,16 @@ position: relative; } .style-rule-heading { - /*background-color: #333;*/ + background-color: #f3f3f3; + border: 1px #e7e7e7; + border-style: solid none; + box-shadow: inset 0 0 1px #FFF; + padding: 4px; } .style-sheet-name { + color: #333; position: absolute; - right: 0; - + right: 8px; + text-decoration: none; + font-family: "Droid Sans", sans-serif; } \ No newline at end of file -- cgit v1.2.3 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 --- .../rule-components/css-style-rule.reel/css-style-rule.css | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'js/panels/css-panel/rule-components/css-style-rule.reel/css-style-rule.css') 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; -- cgit v1.2.3 From 0a4672001ac5122c512087779e57dc07de4ec1b7 Mon Sep 17 00:00:00 2001 From: Eric Guzman Date: Thu, 12 Apr 2012 11:31:39 -0700 Subject: CSS Style Rule - Make selector editable --- .../css-style-rule.reel/css-style-rule.css | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'js/panels/css-panel/rule-components/css-style-rule.reel/css-style-rule.css') 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 3ec8901a..6918e695 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 @@ -25,4 +25,25 @@ right: 8px; text-decoration: none; font-family: "Droid Sans", sans-serif; +} +.css-style-rule-item .nj-css-selector { + position: relative; + border: 1px solid rgba(0,0,0,0); +} +.css-style-rule-item .nj-css-selector.editable { + border: 1px solid #999; + border-radius: 3px; + box-shadow: 1px 1px 1px #CCC; + color: #333; + display: inline-block; + margin-right: 7px; + max-width: none; + overflow: visible; + -webkit-user-select: text; +} +.css-style-rule-item .nj-css-selector:after { + position: absolute; + + right: -10px; + } \ No newline at end of file -- cgit v1.2.3 From f1d4c48cd12d4c1a4a8b8d7ce648ea510607cb88 Mon Sep 17 00:00:00 2001 From: Eric Guzman Date: Tue, 24 Apr 2012 14:19:21 -0700 Subject: CSS Style Rule - Nudge sheet link a bit --- .../css-panel/rule-components/css-style-rule.reel/css-style-rule.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'js/panels/css-panel/rule-components/css-style-rule.reel/css-style-rule.css') 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 6918e695..7cde3fd8 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 @@ -21,10 +21,11 @@ } .style-sheet-name { color: #333; + font-family: "Droid Sans", sans-serif; + padding-top: 1px; position: absolute; right: 8px; text-decoration: none; - font-family: "Droid Sans", sans-serif; } .css-style-rule-item .nj-css-selector { position: relative; -- cgit v1.2.3 From 4332599afffae987a18bb197fcfdd09bc2e94d2b Mon Sep 17 00:00:00 2001 From: Eric Guzman Date: Mon, 30 Apr 2012 13:45:52 -0700 Subject: CSS Style Rule - Add code for changing selectors and showing unapplied rules --- .../css-style-rule.reel/css-style-rule.css | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'js/panels/css-panel/rule-components/css-style-rule.reel/css-style-rule.css') 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 7cde3fd8..03d43ebf 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 @@ -4,6 +4,7 @@ (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. */ .css-style-rule-item { + min-height: 69px; position: relative; } .css-style-rule-item:after { @@ -14,7 +15,9 @@ } .style-rule-heading { background-color: #f3f3f3; + /*background-color: #DDDDDD;*/ border: 1px #e7e7e7; + /*border: 1px #CCC;*/ border-style: solid none; box-shadow: inset 0 0 1px #FFF; padding: 4px; @@ -47,4 +50,20 @@ right: -10px; +} + +/* ------------------- + Unapplied Rule +------------------ */ +.unapplied-css-rule { + opacity: .8; + background-color: #f3f3f3; +} +.unapplied-css-rule .style-rule-heading { + background-repeat: no-repeat; + background-position: 6px 6px; + background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAoAAAALCAYAAABGbhwYAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyRpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw%2FeHBhY2tldCBiZWdpbj0i77u%2FIiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8%2BIDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMC1jMDYxIDY0LjE0MDk0OSwgMjAxMC8xMi8wNy0xMDo1NzowMSAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNS4xIE1hY2ludG9zaCIgeG1wTU06SW5zdGFuY2VJRD0ieG1wLmlpZDowMzYyMERFNTQwNzMxMUUxQTREQ0IxQTRGNEI2MTE3RiIgeG1wTU06RG9jdW1lbnRJRD0ieG1wLmRpZDowMzYyMERFNjQwNzMxMUUxQTREQ0IxQTRGNEI2MTE3RiI%2BIDx4bXBNTTpEZXJpdmVkRnJvbSBzdFJlZjppbnN0YW5jZUlEPSJ4bXAuaWlkOjAzNjIwREUzNDA3MzExRTFBNERDQjFBNEY0QjYxMTdGIiBzdFJlZjpkb2N1bWVudElEPSJ4bXAuZGlkOjAzNjIwREU0NDA3MzExRTFBNERDQjFBNEY0QjYxMTdGIi8%2BIDwvcmRmOkRlc2NyaXB0aW9uPiA8L3JkZjpSREY%2BIDwveDp4bXBtZXRhPiA8P3hwYWNrZXQgZW5kPSJyIj8%2Bc4fwegAAAWpJREFUeNo8kLtLA0EQxr%2B9l3lcDAaCBsEqEOysBFEQsRAsRVCEpBREsbIUSxtBrAxEewsrK8VHQIhK%2FoIUUVJIQFFjYi65XDZ36%2Bz5GFgWZr75fjPDhBD4C%2BucjWgaphjQdTgK%2FfPi5a%2FGpPDtjEVjERyqKlag%2FlY8gHPsfzSwPbQgbDyfIs6vURa3EKK8Jf6jmhUy51yiWDlBUDED2NF0JKGQS3IPVn4ATXqIL0EYJgwD42YQG4quE45EggOtCwbWrUM1Ej%2F0jkXDAYaOtOa6iIH2YSQOBugPj4KN3aFdnIThkprynoeUYjtwIRO0hCLxiU3wp12odgl0AXhUa3VQ0xoWCqEApiNhEpFzt7Tm%2F4Tzo9kGvtq4UjNzqJB1mswURvNoqayP57V7KcB7HfZnE8v%2BHYtZtmiGcBzqQ1TSZUPP85HVlo1MfCaX94WPpSO83qwO6wbWCTtBQocoD70eDgZncw3Z%2BC3AAFMzlxlnnpevAAAAAElFTkSuQmCC); +} +.unapplied-css-rule .nj-css-selector { + margin-left: 16px; } \ No newline at end of file -- cgit v1.2.3 From a237dfaad38bb9efac803db83a28099f6f74dde8 Mon Sep 17 00:00:00 2001 From: Eric Guzman Date: Mon, 21 May 2012 15:10:51 -0700 Subject: Remove Old CSS Panel --- .../css-style-rule.reel/css-style-rule.css | 32 +++++++++++++++++++--- 1 file changed, 28 insertions(+), 4 deletions(-) (limited to 'js/panels/css-panel/rule-components/css-style-rule.reel/css-style-rule.css') 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 03d43ebf..3e7252b5 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 @@ -30,13 +30,37 @@ right: 8px; text-decoration: none; } + +/* ------------------- + Selector Styles +------------------ */ + .css-style-rule-item .nj-css-selector { - position: relative; border: 1px solid rgba(0,0,0,0); + display: inline-block; + font-weight: bold; + padding: 0 2px; + position: relative; + outline: none; + +} +.nj-css-selector:after { + content: " {"; + font-weight: normal; +} +.nj-css-selector.nj-editable-focus { + position: relative; +} +.nj-css-rule-list .nj-css-selector.nj-editable-focus:after { + position: absolute; +} +.css-style-rule-item .nj-css-selector:focus { + box-shadow: none; } .css-style-rule-item .nj-css-selector.editable { + background-color: #FFF; border: 1px solid #999; - border-radius: 3px; + border-radius: 2px; box-shadow: 1px 1px 1px #CCC; color: #333; display: inline-block; @@ -56,8 +80,8 @@ Unapplied Rule ------------------ */ .unapplied-css-rule { - opacity: .8; - background-color: #f3f3f3; + /*opacity: .8;*/ + /*background-color: #f3f3f3;*/ } .unapplied-css-rule .style-rule-heading { background-repeat: no-repeat; -- cgit v1.2.3