diff options
author | Kruti Shah | 2012-07-20 11:38:57 -0700 |
---|---|---|
committer | Kruti Shah | 2012-07-20 11:38:57 -0700 |
commit | 4436c04c81e0f372b7e03416a2515630de8c72c6 (patch) | |
tree | edfbd366df9d7e7514425561a817fc2c67f398d9 /js/panels/Timeline/TimelinePanel.reel/scss | |
parent | 5741fbc0a2eb1a43017b76406056bc98cdf00297 (diff) | |
parent | 936fbd6d76d35e3f9574983682c266de6dce55f7 (diff) | |
download | ninja-4436c04c81e0f372b7e03416a2515630de8c72c6.tar.gz |
Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-kruti
Diffstat (limited to 'js/panels/Timeline/TimelinePanel.reel/scss')
-rw-r--r-- | js/panels/Timeline/TimelinePanel.reel/scss/TimelinePanel.scss | 28 |
1 files changed, 19 insertions, 9 deletions
diff --git a/js/panels/Timeline/TimelinePanel.reel/scss/TimelinePanel.scss b/js/panels/Timeline/TimelinePanel.reel/scss/TimelinePanel.scss index d2d813bb..cce01c90 100644 --- a/js/panels/Timeline/TimelinePanel.reel/scss/TimelinePanel.scss +++ b/js/panels/Timeline/TimelinePanel.reel/scss/TimelinePanel.scss | |||
@@ -148,20 +148,30 @@ POSSIBILITY OF SUCH DAMAGE. | |||
148 | padding-right: 5px; | 148 | padding-right: 5px; |
149 | } | 149 | } |
150 | .playbutton{ | 150 | .playbutton{ |
151 | background-image: url('../images/play.png'); | 151 | background: transparent url("../images/play.png") no-repeat; |
152 | background-repeat: no-repeat; | ||
153 | height: 18px; | 152 | height: 18px; |
154 | width: 18px; | 153 | width: 18px; |
155 | float: left; | 154 | float: left; |
156 | padding-right: 5px; | 155 | padding-right: 5px; |
156 | |||
157 | border: none; | ||
158 | margin: 0; | ||
159 | min-width: 0; | ||
160 | opacity: 0.8; | ||
161 | } | ||
162 | .playbutton:hover { | ||
163 | background-color: #474747; | ||
164 | opacity: 1; | ||
165 | } | ||
166 | .playbutton.active:hover { | ||
167 | background-color: #474747; | ||
168 | opacity: 1; | ||
169 | } | ||
170 | .playbutton:focus { | ||
171 | -webkit-box-shadow: none; | ||
157 | } | 172 | } |
158 | .pausebutton{ | 173 | .pausebutton{ |
159 | background-image: url('../images/pause.png'); | 174 | background-image: url("../images/pause.png"); |
160 | background-repeat: no-repeat; | ||
161 | height: 18px; | ||
162 | width: 18px; | ||
163 | float: left; | ||
164 | padding-right: 5px; | ||
165 | } | 175 | } |
166 | .forwardbutton{ | 176 | .forwardbutton{ |
167 | background-image: url('../images/play_next.png'); | 177 | background-image: url('../images/play_next.png'); |
@@ -295,7 +305,7 @@ POSSIBILITY OF SUCH DAMAGE. | |||
295 | top: 0; | 305 | top: 0; |
296 | left: 0; | 306 | left: 0; |
297 | position: absolute; | 307 | position: absolute; |
298 | z-index: 91; | 308 | z-index: 1; |
299 | opacity: 0.7; | 309 | opacity: 0.7; |
300 | } | 310 | } |
301 | .timebar{ | 311 | .timebar{ |