aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline/Layer.reel/scss
diff options
context:
space:
mode:
authorValerio Virgillito2012-06-20 21:56:18 -0700
committerValerio Virgillito2012-06-20 21:56:18 -0700
commitc8fc6d15e1570e89243abe527cd149e354f7e11f (patch)
treef648fa7842f3dc6011da08aaab0bedb445d43b58 /js/panels/Timeline/Layer.reel/scss
parent392a559e90357d48c910a07617261483b2b45476 (diff)
parent58bca4771ab1e043cd5c11239c1936a022080096 (diff)
downloadninja-c8fc6d15e1570e89243abe527cd149e354f7e11f.tar.gz
Merge pull request #316 from imix23ways/Timeline-merge-candidate
Timeline merge candidate
Diffstat (limited to 'js/panels/Timeline/Layer.reel/scss')
-rw-r--r--js/panels/Timeline/Layer.reel/scss/Layer.scss14
1 files changed, 9 insertions, 5 deletions
diff --git a/js/panels/Timeline/Layer.reel/scss/Layer.scss b/js/panels/Timeline/Layer.reel/scss/Layer.scss
index 8e5e50db..5220d0f1 100644
--- a/js/panels/Timeline/Layer.reel/scss/Layer.scss
+++ b/js/panels/Timeline/Layer.reel/scss/Layer.scss
@@ -74,7 +74,8 @@
74 74
75/******************************************/ 75/******************************************/
76 76
77.container-layer { 77.container-layer,
78.container-layer.selected {
78 background-color: $color-panel-bg; 79 background-color: $color-panel-bg;
79 color: $color-panel-text; 80 color: $color-panel-text;
80 font-size: 12px; 81 font-size: 12px;
@@ -108,7 +109,7 @@
108 109
109 110
110.layerSelected .label-layer { 111.layerSelected .label-layer {
111 background-color: $color-panel-hilite-bg; 112 background-color: $color-menu-hilite-bg;
112 color: $color-panel-hilite-text; 113 color: $color-panel-hilite-text;
113} 114}
114.content-layer { 115.content-layer {
@@ -196,6 +197,9 @@
196 top: 3px; 197 top: 3px;
197 right: 31px; 198 right: 31px;
198} 199}
200.timeline-track .collapsible-content {
201 position: relative;
202}
199.collapsible-content .layout-table { 203.collapsible-content .layout-table {
200 width: 99.9%; 204 width: 99.9%;
201} 205}
@@ -270,10 +274,10 @@
270.content-style .item-template { 274.content-style .item-template {
271 display: none; 275 display: none;
272} 276}
277.style-row {
278 height: 20px;
279}
273.content-style .layout-row.selected .layout-cell { 280.content-style .layout-row.selected .layout-cell {
274 background-color: $color-panel-hilite-bg; 281 background-color: $color-panel-hilite-bg;
275 color: $color-panel-hilite-text; 282 color: $color-panel-hilite-text;
276} 283}
277.style-row {
278 height: 20px;
279}