aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline/TimelinePanel.reel/scss
diff options
context:
space:
mode:
authorJonathan Duran2012-07-20 08:30:24 -0700
committerJonathan Duran2012-07-20 08:30:24 -0700
commit936fbd6d76d35e3f9574983682c266de6dce55f7 (patch)
treeedfbd366df9d7e7514425561a817fc2c67f398d9 /js/panels/Timeline/TimelinePanel.reel/scss
parent7b7f4157dfd1d3ad2b4a266c92594da56a619254 (diff)
parent9053e2037821a5c8405fabb74db9635deacfe8d5 (diff)
downloadninja-936fbd6d76d35e3f9574983682c266de6dce55f7.tar.gz
Merge branch 'refs/heads/NINJA-master' into TimelineUber
Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html js/panels/Timeline/TimelinePanel.reel/css/TimelinePanel.css Signed-off-by: Jonathan Duran <jduran@motorola.com>
Diffstat (limited to 'js/panels/Timeline/TimelinePanel.reel/scss')
-rw-r--r--js/panels/Timeline/TimelinePanel.reel/scss/TimelinePanel.scss26
1 files changed, 18 insertions, 8 deletions
diff --git a/js/panels/Timeline/TimelinePanel.reel/scss/TimelinePanel.scss b/js/panels/Timeline/TimelinePanel.reel/scss/TimelinePanel.scss
index b07c50b2..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');