aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline/PropertyTrack.reel
diff options
context:
space:
mode:
authorEric Guzman2012-02-29 16:13:19 -0800
committerEric Guzman2012-02-29 16:13:19 -0800
commit53bdb1e7773069c4cca59e88d6da91cd0f58c94a (patch)
tree44a2147fcbb43ea483f78a1e2e082919f9c81970 /js/panels/Timeline/PropertyTrack.reel
parentb2c60efb9c6f5dfa7b0fc5c2b9feebebc805ed97 (diff)
parentb09956e4a9a35c5588cc7cd1f01efb617cbe0884 (diff)
downloadninja-53bdb1e7773069c4cca59e88d6da91cd0f58c94a.tar.gz
Merge branch 'refs/heads/master' into CSSPanelUpdates
Conflicts: js/panels/PanelContainer/PanelContainer.reel/PanelContainer.js
Diffstat (limited to 'js/panels/Timeline/PropertyTrack.reel')
-rw-r--r--js/panels/Timeline/PropertyTrack.reel/css/PropertyTrack.css6
-rw-r--r--js/panels/Timeline/PropertyTrack.reel/images/gridline.jpgbin0 -> 724 bytes
-rw-r--r--js/panels/Timeline/PropertyTrack.reel/scss/PropertyTrack.scss1
3 files changed, 4 insertions, 3 deletions
diff --git a/js/panels/Timeline/PropertyTrack.reel/css/PropertyTrack.css b/js/panels/Timeline/PropertyTrack.reel/css/PropertyTrack.css
index 8e45305a..cb119a14 100644
--- a/js/panels/Timeline/PropertyTrack.reel/css/PropertyTrack.css
+++ b/js/panels/Timeline/PropertyTrack.reel/css/PropertyTrack.css
@@ -3,17 +3,17 @@
3 No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> 3 No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
4 (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. 4 (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved.
5 </copyright> */ 5 </copyright> */
6
7/* PropertyTrack.scss 6/* PropertyTrack.scss
8 * Main SCSS file for PropertyTrack component, compiled by SASS into the file css/PropertyTrack.css. 7 * Main SCSS file for PropertyTrack component, compiled by SASS into the file css/PropertyTrack.css.
9 */ 8 */
10/* line 13, ../scss/PropertyTrack.scss */ 9/* line 19, ../scss/PropertyTrack.scss */
11.content-main .collapsible-content .timeline-track { 10.content-main .collapsible-content .timeline-track {
12 height: 20px; 11 height: 20px;
13 border-bottom: 1px solid #505050; 12 border-bottom: 1px solid #505050;
13 background-image: url("../images/gridline.jpg");
14} 14}
15 15
16/* line 19, ../scss/PropertyTrack.scss */ 16/* line 26, ../scss/PropertyTrack.scss */
17.timeline-track .content-main { 17.timeline-track .content-main {
18 background-color: #474747; 18 background-color: #474747;
19} 19}
diff --git a/js/panels/Timeline/PropertyTrack.reel/images/gridline.jpg b/js/panels/Timeline/PropertyTrack.reel/images/gridline.jpg
new file mode 100644
index 00000000..9f451b0a
--- /dev/null
+++ b/js/panels/Timeline/PropertyTrack.reel/images/gridline.jpg
Binary files differ
diff --git a/js/panels/Timeline/PropertyTrack.reel/scss/PropertyTrack.scss b/js/panels/Timeline/PropertyTrack.reel/scss/PropertyTrack.scss
index 273e3d77..c7ae6f0c 100644
--- a/js/panels/Timeline/PropertyTrack.reel/scss/PropertyTrack.scss
+++ b/js/panels/Timeline/PropertyTrack.reel/scss/PropertyTrack.scss
@@ -19,6 +19,7 @@
19.content-main .collapsible-content .timeline-track { 19.content-main .collapsible-content .timeline-track {
20 height: 20px; 20 height: 20px;
21 border-bottom: 1px solid $color-menu-divider; 21 border-bottom: 1px solid $color-menu-divider;
22 background-image: url("../images/gridline.jpg");
22 } 23 }
23 24
24 25