Skip to content

Commit

Permalink
Merge remote-tracking branch 'colinbdclark/FLUID-4596' into demo
Browse files Browse the repository at this point in the history
* colinbdclark/FLUID-4596:
  FLUID-4596: More small CSS tweaks:  * Removed unncessary z-indices from the volume slider and controls area  * Pushed the scrubber directly against the control buttons  * Corrected borders for the scrubber
  • Loading branch information
michelled committed Feb 24, 2012
2 parents a97663e + 99f24e5 commit d278669
Showing 1 changed file with 15 additions and 4 deletions.
19 changes: 15 additions & 4 deletions css/VideoPlayer.css
Expand Up @@ -34,11 +34,10 @@
position : absolute;
padding : 3px 5px;
}

.fl-videoPlayer-controller {
width:100%;
background-color: rgba(242, 242, 242, 0.75);
position: absolute;
z-index: 1;
bottom: 0;
}

Expand All @@ -53,6 +52,12 @@
background-color: rgba(153, 153, 153, 0.75);
}

.fl-videoPlayer-controller-buttons {
background-color: rgba(242, 242, 242, 0.75);
width: 100%;
height: 2.05em;
}

.fl-videoPlayer-controller-buttons * {
display: inline;
}
Expand Down Expand Up @@ -106,7 +111,6 @@ a.fl-videoPlayer-button-wrapper {

.fl-videoPlayer-volumeControl {
display: none;
z-index: 101;
position: absolute;
bottom: 23px;
right: 15px;
Expand Down Expand Up @@ -197,7 +201,7 @@ ul.fl-videoPlayer-transcripts-languageList .fl-videoPlayer-transcript-selected {
}

.fl-videoPlayer-transcripts-close-button {
background: #ffffff url('../images/close-black.png') no-repeat center center;
background: #fff url('../images/close-black.png') no-repeat center center;
}

/*
Expand All @@ -206,6 +210,7 @@ ul.fl-videoPlayer-transcripts-languageList .fl-videoPlayer-transcript-selected {
.fl-videoPlayer-scrubberContainer {
width: 100%;
text-align: center;
margin-bottom: -0.4em;
}
.fl-videoPlayer-scrubberContainer * {
margin: auto;
Expand All @@ -216,6 +221,12 @@ ul.fl-videoPlayer-transcripts-languageList .fl-videoPlayer-transcript-selected {
width: 100%;
}

.fl-videoPlayer-scrubber.ui-widget-content {
background: rgba(204, 204, 204, 0.6);
border-width: 0;
border-top: 1px solid #fff;
}

.fl-videoPlayer-scrubber .ui-slider-handle {
display: none;
}
Expand Down

0 comments on commit d278669

Please sign in to comment.