diff options
author | Ananya Sen | 2012-06-21 11:07:11 -0700 |
---|---|---|
committer | Ananya Sen | 2012-06-21 11:07:11 -0700 |
commit | 6915d6607f2d768f363baed84287f6593925ae1e (patch) | |
tree | 306738165c11fab764a27c3e76d93c2e4d86f297 /js/panels/Timeline/TimelinePanel.reel/css/TimelinePanel.css | |
parent | 8db9e73ca68c006769af3997034959f6b7008add (diff) | |
parent | c8fc6d15e1570e89243abe527cd149e354f7e11f (diff) | |
download | ninja-6915d6607f2d768f363baed84287f6593925ae1e.tar.gz |
Merge branch 'refs/heads/ninja-internal-master' into cut-copy-paste
Diffstat (limited to 'js/panels/Timeline/TimelinePanel.reel/css/TimelinePanel.css')
-rw-r--r-- | js/panels/Timeline/TimelinePanel.reel/css/TimelinePanel.css | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/js/panels/Timeline/TimelinePanel.reel/css/TimelinePanel.css b/js/panels/Timeline/TimelinePanel.reel/css/TimelinePanel.css index 29bf8d38..7f61074e 100644 --- a/js/panels/Timeline/TimelinePanel.reel/css/TimelinePanel.css +++ b/js/panels/Timeline/TimelinePanel.reel/css/TimelinePanel.css | |||
@@ -14,7 +14,7 @@ | |||
14 | .rightinside { height: 100%; width: 100%; display: -webkit-box; -webkit-box-orient: vertical; position: absolute; } | 14 | .rightinside { height: 100%; width: 100%; display: -webkit-box; -webkit-box-orient: vertical; position: absolute; } |
15 | 15 | ||
16 | /* line 50, ../scss/TimelinePanel.scss */ | 16 | /* line 50, ../scss/TimelinePanel.scss */ |
17 | .tl_leftpane { min-width: 200px; max-width: 500px; position: relative; overflow: hidden; -webkit-box-flex: 0; } | 17 | .tl_leftpane { min-width: 210px; max-width: 500px; position: relative; overflow: hidden; -webkit-box-flex: 0; } |
18 | 18 | ||
19 | /* line 57, ../scss/TimelinePanel.scss */ | 19 | /* line 57, ../scss/TimelinePanel.scss */ |
20 | .tl_rightpane { width: 100%; position: relative; -webkit-box-flex: 1; } | 20 | .tl_rightpane { width: 100%; position: relative; -webkit-box-flex: 1; } |
@@ -104,35 +104,35 @@ | |||
104 | .timeline-dnd-helper { -webkit-transform: scale(0.9, 0.9); } | 104 | .timeline-dnd-helper { -webkit-transform: scale(0.9, 0.9); } |
105 | 105 | ||
106 | /* line 307, ../scss/TimelinePanel.scss */ | 106 | /* line 307, ../scss/TimelinePanel.scss */ |
107 | .tl_slider { width: 65px; height: 5px; background: none; float: left; margin-left: 5%; } | 107 | .tl_slider { width: 65px; height: 5px; background: none; float: left; margin-left: 5%; visibility: hidden; } |
108 | 108 | ||
109 | /* Configuration menu */ | 109 | /* Configuration menu */ |
110 | /* line 316, ../scss/TimelinePanel.scss */ | 110 | /* line 317, ../scss/TimelinePanel.scss */ |
111 | .layer-master { position: relative; } | 111 | .layer-master { position: relative; } |
112 | 112 | ||
113 | /* line 319, ../scss/TimelinePanel.scss */ | 113 | /* line 320, ../scss/TimelinePanel.scss */ |
114 | .tl-configbutton { position: absolute; top: 0px; right: 2px; width: 20px; height: 20px; background-image: url(../images/icon-gear.png); background-repeat: no-repeat; cursor: pointer; z-index: 100; background-position: 100% 0px; } | 114 | .tl-configbutton { position: absolute; top: 0px; right: 2px; width: 20px; height: 20px; background-image: url(../images/icon-gear.png); background-repeat: no-repeat; cursor: pointer; z-index: 100; background-position: 100% 0px; } |
115 | 115 | ||
116 | /* line 331, ../scss/TimelinePanel.scss */ | 116 | /* line 332, ../scss/TimelinePanel.scss */ |
117 | .tl-configbutton:hover { width: 180px; } | 117 | .tl-configbutton:hover { width: 180px; } |
118 | 118 | ||
119 | /* line 335, ../scss/TimelinePanel.scss */ | 119 | /* line 336, ../scss/TimelinePanel.scss */ |
120 | .tl-configbutton .tl-dropdown { position: absolute; border: 1px solid black; top: 16px; right: 2px; width: 180px; padding-bottom: 7px; background-color: #474747; box-shadow: 2px 2px 2px rgba(0, 0, 0, 0.5); display: none; } | 120 | .tl-configbutton .tl-dropdown { position: absolute; border: 1px solid black; top: 16px; right: 2px; width: 180px; padding-bottom: 7px; background-color: #474747; box-shadow: 2px 2px 2px rgba(0, 0, 0, 0.5); display: none; } |
121 | 121 | ||
122 | /* line 346, ../scss/TimelinePanel.scss */ | 122 | /* line 347, ../scss/TimelinePanel.scss */ |
123 | .tl-configbutton.checked .tl-dropdown { display: block; } | 123 | .tl-configbutton.checked .tl-dropdown { display: block; } |
124 | 124 | ||
125 | /* line 350, ../scss/TimelinePanel.scss */ | 125 | /* line 351, ../scss/TimelinePanel.scss */ |
126 | .tl-configbutton .checkable { padding-left: 20px; height: 20px; line-height: 20px; margin-top: 3px; } | 126 | .tl-configbutton .checkable { padding-left: 20px; height: 20px; line-height: 20px; margin-top: 3px; } |
127 | 127 | ||
128 | /* line 356, ../scss/TimelinePanel.scss */ | 128 | /* line 357, ../scss/TimelinePanel.scss */ |
129 | .tl-configbutton .checkable:hover { background-color: #b2b2b2; color: #242424; text-shadow: none; } | 129 | .tl-configbutton .checkable:hover { background-color: #b2b2b2; color: #242424; text-shadow: none; } |
130 | 130 | ||
131 | /* line 361, ../scss/TimelinePanel.scss */ | 131 | /* line 362, ../scss/TimelinePanel.scss */ |
132 | .tl-configbutton .checkable.checked { background-image: url(../images/icon-checkmark.png); background-repeat: no-repeat; background-position: 6px 4px; } | 132 | .tl-configbutton .checkable.checked { background-image: url(../images/icon-checkmark.png); background-repeat: no-repeat; background-position: 6px 4px; } |
133 | 133 | ||
134 | /* line 367, ../scss/TimelinePanel.scss */ | 134 | /* line 368, ../scss/TimelinePanel.scss */ |
135 | .tl-configbutton .nj-divider { margin-top: 7px; } | 135 | .tl-configbutton .nj-divider { margin-top: 7px; } |
136 | 136 | ||
137 | /* line 371, ../scss/TimelinePanel.scss */ | 137 | /* line 372, ../scss/TimelinePanel.scss */ |
138 | .layer-hidden { display: none; } | 138 | .layer-hidden { display: none; } |