diff options
author | Valerio Virgillito | 2012-02-16 11:41:21 -0800 |
---|---|---|
committer | Valerio Virgillito | 2012-02-16 11:41:21 -0800 |
commit | 81942bd52f0713c9ff5d479ebd12fce577f45e45 (patch) | |
tree | 4dfb7898b48f8db2155b7a8911724cbd76fdbc84 | |
parent | eaee73ccaf271f5c82fdf67b35c71510f308fb6e (diff) | |
parent | 220793c44a9ec4f20ab4c194ffa15587f95845e3 (diff) | |
download | ninja-81942bd52f0713c9ff5d479ebd12fce577f45e45.tar.gz |
Merge pull request #44 from ericguzman/CSSPanelUpdates
CSS Panel - Add Resizer to sub panels
-rwxr-xr-x | js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.css | 6 | ||||
-rwxr-xr-x | js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.html | 11 |
2 files changed, 16 insertions, 1 deletions
diff --git a/js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.css b/js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.css index 27d19e58..1b3c9184 100755 --- a/js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.css +++ b/js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.css | |||
@@ -10,6 +10,11 @@ | |||
10 | -webkit-box-orient: vertical; | 10 | -webkit-box-orient: vertical; |
11 | height:100%; | 11 | height:100%; |
12 | } | 12 | } |
13 | .css_panel .resizer { | ||
14 | background-color: #333; | ||
15 | cursor: row-resize; | ||
16 | height: 1px; | ||
17 | } | ||
13 | .nj-section-header { | 18 | .nj-section-header { |
14 | background-color: #333; | 19 | background-color: #333; |
15 | border-top: 1px solid #3D3D3D; | 20 | border-top: 1px solid #3D3D3D; |
@@ -37,7 +42,6 @@ | |||
37 | -webkit-box-flex: 0; | 42 | -webkit-box-flex: 0; |
38 | background-color: #474747; | 43 | background-color: #474747; |
39 | color: #FFF; | 44 | color: #FFF; |
40 | max-height: 68px; | ||
41 | overflow-y: scroll; | 45 | overflow-y: scroll; |
42 | } | 46 | } |
43 | #nj-section-styles { | 47 | #nj-section-styles { |
diff --git a/js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.html b/js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.html index 5d6273b6..db630934 100755 --- a/js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.html +++ b/js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.html | |||
@@ -10,6 +10,16 @@ | |||
10 | <link rel="stylesheet" href="CSSPanelBase.css" type="text/css"> | 10 | <link rel="stylesheet" href="CSSPanelBase.css" type="text/css"> |
11 | <script type="text/montage-serialization"> | 11 | <script type="text/montage-serialization"> |
12 | { | 12 | { |
13 | "resizer1": { | ||
14 | "module": "js/panels/Resizer", | ||
15 | "name": "Resizer", | ||
16 | "properties": { | ||
17 | "element": {"#": "subPanelResizer"}, | ||
18 | "panel": {"#": "nj-section-stylesheets"}, | ||
19 | "isVertical": true | ||
20 | } | ||
21 | }, | ||
22 | |||
13 | "ComputedStyleSubPanel1": { | 23 | "ComputedStyleSubPanel1": { |
14 | "module": "js/panels/CSSPanel/ComputedStyleSubPanel.reel", | 24 | "module": "js/panels/CSSPanel/ComputedStyleSubPanel.reel", |
15 | "name": "ComputedStyleSubPanel", | 25 | "name": "ComputedStyleSubPanel", |
@@ -43,6 +53,7 @@ | |||
43 | <div id="nj-css-stylesheet-toolbar" class="nj-css-toolbar"> | 53 | <div id="nj-css-stylesheet-toolbar" class="nj-css-toolbar"> |
44 | <a href="#" id="nj-css-add-stylesheet" title="Add Stylesheet">Add Rule</a> | 54 | <a href="#" id="nj-css-add-stylesheet" title="Add Stylesheet">Add Rule</a> |
45 | </div> | 55 | </div> |
56 | <div id="subPanelResizer" class="resizer"></div> | ||
46 | <!-- Style Rule list subsection --> | 57 | <!-- Style Rule list subsection --> |
47 | <h2 id="nj-css-styles-header" class="nj-section-header"> | 58 | <h2 id="nj-css-styles-header" class="nj-section-header"> |
48 | <div id="nj-css-styles-arrow" class="panelDisclosureIcon"></div> | 59 | <div id="nj-css-styles-arrow" class="panelDisclosureIcon"></div> |