Skip to content

Commit

Permalink
FLUID-4596: Improving the styling of the scrubber handles in the high…
Browse files Browse the repository at this point in the history
… contrast themes.
  • Loading branch information
michelled committed Feb 29, 2012
1 parent da2e1ee commit a89fdab
Show file tree
Hide file tree
Showing 4 changed files with 29 additions and 10 deletions.
27 changes: 27 additions & 0 deletions css/VideoPlayer.css
Expand Up @@ -395,6 +395,33 @@ ul.fl-videoPlayer-transcripts-languageList li {
color: #FFFFFF;
}


/********************
* UIO theme styling
********************/

.fl-theme-uio-bw .fl-videoPlayer-video-controller-area,
.fl-theme-uio-by .fl-videoPlayer-video-controller-area {
border: 1px solid #fff; /* This will go away once we have the proper styling for the initial overlay */
}

.fl-theme-uio-wb .fl-videoPlayer-video-controller-area {
border: 1px solid white; /* This will go away once we have the proper styling for the initial overlay */
}

.fl-theme-uio-yb .fl-videoPlayer-video-controller-area {
border: 1px solid yellow; /* This will go away once we have the proper styling for the initial overlay */
}


.fl-theme-uio-bw .fl-videoPlayer-scrubber .ui-slider-handle,
.fl-theme-uio-wb .fl-videoPlayer-scrubber .ui-slider-handle,
.fl-theme-uio-by .fl-videoPlayer-scrubber .ui-slider-handle,
.fl-theme-uio-yb .fl-videoPlayer-scrubber .ui-slider-handle {
border-width: 1px;
}


/***********************************************************
* Styling overrides for the controls when using UIO themes
***********************************************************/
Expand Down
4 changes: 0 additions & 4 deletions demos/Mammals.html
Expand Up @@ -12,10 +12,6 @@
<link rel="stylesheet" type="text/css" href="../lib/infusion/components/uiOptions/css/fss/fss-theme-by-uio.css" />
<link rel="stylesheet" type="text/css" href="../lib/infusion/components/uiOptions/css/fss/fss-theme-yb-uio.css" />
<link rel="stylesheet" type="text/css" href="../lib/infusion/components/uiOptions/css/fss/fss-text-uio.css" />
<link rel="stylesheet" type="text/css" href="../lib/infusion/lib/jquery/ui/css/fl-theme-wb/wb.css" />
<link rel="stylesheet" type="text/css" href="../lib/infusion/lib/jquery/ui/css/fl-theme-bw/bw.css" />
<link rel="stylesheet" type="text/css" href="../lib/infusion/lib/jquery/ui/css/fl-theme-by/by.css" />
<link rel="stylesheet" type="text/css" href="../lib/infusion/lib/jquery/ui/css/fl-theme-yb/yb.css" />
<link rel="stylesheet" type="text/css" href="../lib/infusion/components/uiOptions/css/FatPanelUIOptions.css" />

<link type="text/css" href="../lib/jquery-ui/css/ui-lightness/jquery-ui-1.8.14.custom.css" rel="stylesheet" />
Expand Down
4 changes: 0 additions & 4 deletions demos/VideoPlayer.html
Expand Up @@ -10,10 +10,6 @@
<link rel="stylesheet" type="text/css" href="../lib/infusion/components/uiOptions/css/fss/fss-theme-by-uio.css" />
<link rel="stylesheet" type="text/css" href="../lib/infusion/components/uiOptions/css/fss/fss-theme-yb-uio.css" />
<link rel="stylesheet" type="text/css" href="../lib/infusion/components/uiOptions/css/fss/fss-text-uio.css" />
<link rel="stylesheet" type="text/css" href="../lib/infusion/lib/jquery/ui/css/fl-theme-wb/wb.css" />
<link rel="stylesheet" type="text/css" href="../lib/infusion/lib/jquery/ui/css/fl-theme-bw/bw.css" />
<link rel="stylesheet" type="text/css" href="../lib/infusion/lib/jquery/ui/css/fl-theme-by/by.css" />
<link rel="stylesheet" type="text/css" href="../lib/infusion/lib/jquery/ui/css/fl-theme-yb/yb.css" />
<link rel="stylesheet" type="text/css" href="../lib/infusion/components/uiOptions/css/FatPanelUIOptions.css" />

<link type="text/css" href="../lib/jquery-ui/css/ui-lightness/jquery-ui-1.8.14.custom.css" rel="stylesheet" />
Expand Down
4 changes: 2 additions & 2 deletions js/VideoPlayer.js
Expand Up @@ -347,7 +347,7 @@ https://github.com/fluid-project/infusion/raw/master/Infusion-LICENSE.txt
};

var hideControllers = function (that) {
//that.locate("controllers").delay(500).slideUp();
that.locate("controllers").delay(500).slideUp();
};

var bindVideoPlayerDOMEvents = function (that) {
Expand Down Expand Up @@ -531,7 +531,7 @@ https://github.com/fluid-project/infusion/raw/master/Infusion-LICENSE.txt
}
}

//that.locate("controllers").hide();
that.locate("controllers").hide();
that.events.onReady.fire(that);
});

Expand Down

0 comments on commit a89fdab

Please sign in to comment.