aboutsummaryrefslogtreecommitdiff
path: root/js
diff options
context:
space:
mode:
Diffstat (limited to 'js')
-rw-r--r--js/data/panels-data.js12
-rwxr-xr-xjs/panels/PanelContainer.reel/PanelContainer.html11
-rw-r--r--js/panels/css-panel/rule-components/css-style-rule.reel/css-style-rule.css32
3 files changed, 29 insertions, 26 deletions
diff --git a/js/data/panels-data.js b/js/data/panels-data.js
index 7ab40f11..ed346196 100644
--- a/js/data/panels-data.js
+++ b/js/data/panels-data.js
@@ -72,18 +72,6 @@ exports.PanelsData = Montage.create(Montage, {
72// }, 72// },
73 { 73 {
74 name: "CSS", 74 name: "CSS",
75 minHeight: 195,
76 height: 195,
77 maxHeight: null,
78 flexible: true,
79 scrollable: true,
80 collapsed: true,
81 open: true,
82 modulePath: "js/panels/CSSPanel/CSSPanelBase.reel",
83 moduleName: "CSSPanelBase"
84 },
85 {
86 name: "CSSPanel",
87 height: 200, 75 height: 200,
88 minHeight: 200, 76 minHeight: 200,
89 maxHeight: null, 77 maxHeight: null,
diff --git a/js/panels/PanelContainer.reel/PanelContainer.html b/js/panels/PanelContainer.reel/PanelContainer.html
index 2f8ea83f..1de88de3 100755
--- a/js/panels/PanelContainer.reel/PanelContainer.html
+++ b/js/panels/PanelContainer.reel/PanelContainer.html
@@ -62,13 +62,6 @@
62 } 62 }
63 }, 63 },
64 64
65 "panel_7": {
66 "prototype": "js/panels/Panel.reel",
67 "properties": {
68 "element": {"#": "panel_7"}
69 }
70 },
71
72 "owner": { 65 "owner": {
73 "prototype": "js/panels/PanelContainer.reel", 66 "prototype": "js/panels/PanelContainer.reel",
74 "properties": { 67 "properties": {
@@ -80,8 +73,7 @@
80 "panel_3": {"@": "panel_3"}, 73 "panel_3": {"@": "panel_3"},
81 "panel_4": {"@": "panel_4"}, 74 "panel_4": {"@": "panel_4"},
82 "panel_5": {"@": "panel_5"}, 75 "panel_5": {"@": "panel_5"},
83 "panel_6": {"@": "panel_6"}, 76 "panel_6": {"@": "panel_6"}
84 "panel_7": {"@": "panel_7"}
85 }, 77 },
86 "listeners": [ 78 "listeners": [
87 { 79 {
@@ -112,7 +104,6 @@
112 <article data-montage-id="panel_4"></article> 104 <article data-montage-id="panel_4"></article>
113 <article data-montage-id="panel_5"></article> 105 <article data-montage-id="panel_5"></article>
114 <article data-montage-id="panel_6"></article> 106 <article data-montage-id="panel_6"></article>
115 <article data-montage-id="panel_7"></article>
116 </article> 107 </article>
117 </section> 108 </section>
118</body> 109</body>
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 @@
30 right: 8px; 30 right: 8px;
31 text-decoration: none; 31 text-decoration: none;
32} 32}
33
34/* -------------------
35 Selector Styles
36------------------ */
37
33.css-style-rule-item .nj-css-selector { 38.css-style-rule-item .nj-css-selector {
34 position: relative;
35 border: 1px solid rgba(0,0,0,0); 39 border: 1px solid rgba(0,0,0,0);
40 display: inline-block;
41 font-weight: bold;
42 padding: 0 2px;
43 position: relative;
44 outline: none;
45
46}
47.nj-css-selector:after {
48 content: " {";
49 font-weight: normal;
50}
51.nj-css-selector.nj-editable-focus {
52 position: relative;
53}
54.nj-css-rule-list .nj-css-selector.nj-editable-focus:after {
55 position: absolute;
56}
57.css-style-rule-item .nj-css-selector:focus {
58 box-shadow: none;
36} 59}
37.css-style-rule-item .nj-css-selector.editable { 60.css-style-rule-item .nj-css-selector.editable {
61 background-color: #FFF;
38 border: 1px solid #999; 62 border: 1px solid #999;
39 border-radius: 3px; 63 border-radius: 2px;
40 box-shadow: 1px 1px 1px #CCC; 64 box-shadow: 1px 1px 1px #CCC;
41 color: #333; 65 color: #333;
42 display: inline-block; 66 display: inline-block;
@@ -56,8 +80,8 @@
56 Unapplied Rule 80 Unapplied Rule
57------------------ */ 81------------------ */
58.unapplied-css-rule { 82.unapplied-css-rule {
59 opacity: .8; 83 /*opacity: .8;*/
60 background-color: #f3f3f3; 84 /*background-color: #f3f3f3;*/
61} 85}
62.unapplied-css-rule .style-rule-heading { 86.unapplied-css-rule .style-rule-heading {
63 background-repeat: no-repeat; 87 background-repeat: no-repeat;