aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline/Span.reel/scss
diff options
context:
space:
mode:
authorJon Reid2012-06-14 14:30:16 -0700
committerJon Reid2012-06-14 14:30:16 -0700
commit0bb16b6a7aa392b9e26eb9787542da9a274c4960 (patch)
tree72cf5f580f32c5f21f573c7812a3a387917ab01e /js/panels/Timeline/Span.reel/scss
parent0d080d97141cd08855e14a63fa3fee062663cd7d (diff)
parent53bb51a38edc6fe7cc80c43d34027590a22a1d32 (diff)
downloadninja-0bb16b6a7aa392b9e26eb9787542da9a274c4960.tar.gz
Merge branch 'new-easing-menu' into timeline-local
Diffstat (limited to 'js/panels/Timeline/Span.reel/scss')
-rw-r--r--js/panels/Timeline/Span.reel/scss/Span.scss84
1 files changed, 24 insertions, 60 deletions
diff --git a/js/panels/Timeline/Span.reel/scss/Span.scss b/js/panels/Timeline/Span.reel/scss/Span.scss
index b3aff4d2..31781f87 100644
--- a/js/panels/Timeline/Span.reel/scss/Span.scss
+++ b/js/panels/Timeline/Span.reel/scss/Span.scss
@@ -35,67 +35,31 @@
35 opacity: 0.4; 35 opacity: 0.4;
36} 36}
37 37
38/* 38.container-easing-choice {
39 * Easing picker 39 position: absolute;
40 */ 40 top: 2px;
41 41 right: 8px;
42.container-easing { 42 font-size: 10px;
43 position: absolute; 43 line-height: 8px;
44 top: 2px; 44 border: 1px solid $color-menu-border;
45 right: 8px; 45 color: $color-menu-text;
46 font-size: 10px; 46 background-color: $color-menu-bg;
47 line-height: 8px;
48 border: 1px solid $color-menu-border;
49 color: $color-menu-text;
50 background-color: $color-menu-bg;
51}
52.container-easing,
53.container-easing .easing-choice,
54.container-easing .easing-choices {
55 width: 70px;
56 white-space: nowrap;
57}
58.container-easing,
59.container-easing .easing-choice {
60 height: 10px;
61} 47}
62.container-easing .easing-choice { 48.container-easing-choice,
63 position: absolute; 49.container-easing-choice .easing-choice,
64 top: 0px; 50.container-easing-choices .easing-choices {
65 left: 3px; 51 font-size: 10px;
66 width: 67px; 52 width: 70px;
67 cursor: pointer; 53 white-space: nowrap;
68} 54}
69.container-easing .easing-choices { 55.container-easing-choice,
70 position: absolute; 56.container-easing-choice .easing-choice {
71 display: none; 57 height: 10px;
72 bottom: -1px;
73 left: -1px;
74 z-index: 100;
75 height: auto;
76 border: 1px solid $color-menu-border;
77 color: $color-menu-text;
78 background-color: $color-menu-bg;
79 overflow: hidden;
80 list-style-type: none;
81 margin: 0px;
82 padding: 0px;
83}
84.container-easing .easing-choices li {
85 list-style-type: none;
86 margin: 0px;
87 padding: 0px;
88 padding-top: 2px;
89 padding-bottom: 2px;
90 padding-left: 3px;
91 cursor: pointer;
92}
93
94.container-easing .easing-choices li:hover,
95.container-easing .easing-choices li.easing-selected {
96 color: $color-menu-hilite-text;
97 background-color: $color-menu-hilite-bg;
98} 58}
99.container-easing .easing-choices li.easing-selected { 59.container-easing-choice .easing-choice {
100 cursor: default; 60 position: absolute;
61 top: 0px;
62 left: 3px;
63 width: 67px;
64 cursor: pointer;
101} 65}