Commit 3da8b813 by Kyle Fiedler

Added minor ui changes

parent e09310e9
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
${init} ${init}
$(".sequence-nav li a").hover(function(){ $(".sequence-nav li a").hover(function(){
$(this).siblings().toggle(); $(this).siblings().toggleClass("shown");
}); });
}); });
</script> </script>
......
...@@ -74,7 +74,7 @@ h1.top-header { ...@@ -74,7 +74,7 @@ h1.top-header {
h1, h2 { h1, h2 {
font-size: 18px; font-size: 18px;
font-weight: 800; font-weight: bold;
letter-spacing: 0; letter-spacing: 0;
text-transform: none; text-transform: none;
} }
......
...@@ -54,6 +54,7 @@ nav.sequence-nav { ...@@ -54,6 +54,7 @@ nav.sequence-nav {
padding: 15px 4px 14px; padding: 15px 4px 14px;
width: 28px; width: 28px;
height: 17px; height: 17px;
@include transition(all, .4s, $ease-in-out-quad);
// @media screen and (max-width: 800px) { // @media screen and (max-width: 800px) {
// padding: 12px 8px; // padding: 12px 8px;
...@@ -118,16 +119,24 @@ nav.sequence-nav { ...@@ -118,16 +119,24 @@ nav.sequence-nav {
} }
p { p {
position: absolute; // display: none;
display: none; // visibility: hidden;
background: #333; background: #333;
color: #fff;
line-height: lh();
margin: 0px 0 0 -5px;
opacity: 0;
padding: 6px; padding: 6px;
position: absolute;
text-shadow: 0 -1px 0 #000;
@include transition(all, .6s, $ease-in-out-quart);
white-space: pre-wrap; white-space: pre-wrap;
z-index: 99; z-index: 99;
margin: 4px 0 0 -5px;
text-shadow: 0 -1px 0 #000; &.shown {
color: #fff; opacity: 1;
line-height: lh(); margin-top: 4px;
}
&:empty { &:empty {
background: none; background: none;
...@@ -146,7 +155,6 @@ nav.sequence-nav { ...@@ -146,7 +155,6 @@ nav.sequence-nav {
top: -5px; top: -5px;
left: 18px; left: 18px;
@include transform(rotate(45deg)); @include transform(rotate(45deg));
@include transition();
width: 10px; width: 10px;
} }
} }
...@@ -215,15 +223,23 @@ nav.sequence-nav { ...@@ -215,15 +223,23 @@ nav.sequence-nav {
section.course-content { section.course-content {
position: relative;
div#seq_content {
margin-bottom: 60px;
}
nav.sequence-bottom { nav.sequence-bottom {
margin-bottom: -(lh()); position: absolute;
bottom: 0;
right: 50%;
margin-right: -53px;
ul { ul {
@extend .clearfix; @extend .clearfix;
border: 1px solid darken(#f6efd4, 20%); border: 1px solid darken(#f6efd4, 20%);
border-bottom: 0; border-bottom: 0;
@include border-radius(3px 3px 0 0); @include border-radius(3px 3px 0 0);
margin: lh() auto 0;
overflow: hidden; overflow: hidden;
width: 106px; width: 106px;
background-color: darken($cream, 5%); background-color: darken($cream, 5%);
...@@ -242,6 +258,7 @@ section.course-content { ...@@ -242,6 +258,7 @@ section.course-content {
text-indent: -9999px; text-indent: -9999px;
width: 45px; width: 45px;
display: block; display: block;
@include transition(all, .4s, $ease-in-out-quad);
&:hover { &:hover {
text-decoration: none; text-decoration: none;
......
...@@ -34,16 +34,37 @@ section.course-index { ...@@ -34,16 +34,37 @@ section.course-index {
ul.ui-accordion-content { ul.ui-accordion-content {
@include border-radius(0); @include border-radius(0);
@include box-shadow( inset -1px 0 0 #e6e6e6); @include box-shadow( inset -1px 0 0 #e6e6e6);
background: #d6d6d6; background: #dadada;
border: none; border: none;
border-bottom: 1px solid #c3c3c3; border-bottom: 1px solid #c3c3c3;
font-size: 12px; font-size: 12px;
margin: 0; margin: 0;
overflow: hidden; // overflow: visible;
li { li {
position: relative;
&.active { &.active {
font-weight: bold; font-weight: bold;
p.subtitle {
font-weight: normal;
}
// &:after {
// content: " ";
// width: 16px;
// height: 16px;
// position: absolute;
// right: -35px;
// top: 7px;
// display: block;
// background-color: #dadada;
// border-top: 1px solid #c3c3c3;
// border-right: 1px solid #c3c3c3;
// z-index: 99;
// @include transform(rotate(45deg));
// }
} }
a { a {
......
...@@ -141,20 +141,13 @@ section.course-content { ...@@ -141,20 +141,13 @@ section.course-content {
line-height: 46px; //height of play pause buttons line-height: 46px; //height of play pause buttons
margin-right: 0; margin-right: 0;
-webkit-font-smoothing: antialiased; -webkit-font-smoothing: antialiased;
opacity: .7;
@include transition();
h3 { h3 {
@include inline-block(); @include inline-block();
padding: 0 lh(.5);
a { font-weight: normal;
color: #fff;
padding: 0 lh(.5);
@include inline-block();
&:hover {
text-decoration: none;
// background-color: #444;
}
}
} }
// fix for now // fix for now
...@@ -164,13 +157,23 @@ section.course-content { ...@@ -164,13 +157,23 @@ section.course-content {
li { li {
cursor: pointer; cursor: pointer;
color: #fff;
@include inline-block(); @include inline-block();
&.active { &.active {
font-weight: bold; font-weight: bold;
} }
&:hover {
color: #aaa;
}
} }
} }
&:hover {
opacity: 1;
background-color: #444;
}
} }
a.hide-subtitles { a.hide-subtitles {
...@@ -184,6 +187,7 @@ section.course-content { ...@@ -184,6 +187,7 @@ section.course-content {
font-weight: 800; font-weight: 800;
background: url('/static/images/cc.png') 16px center no-repeat; background: url('/static/images/cc.png') 16px center no-repeat;
-webkit-font-smoothing: antialiased; -webkit-font-smoothing: antialiased;
@include transition();
&:hover { &:hover {
color: #fff; color: #fff;
......
...@@ -28,11 +28,11 @@ ...@@ -28,11 +28,11 @@
<div class="secondary-controls"> <div class="secondary-controls">
<div class="speeds"> <div class="speeds">
<h3><a href="#">Speed</a></h3> <h3>Speed</h3>
<ol id="video_speeds"></ol> <ol id="video_speeds"></ol>
</div> </div>
<a href="#" class="hide-subtitles">on</a> <a href="#" class="hide-subtitles">turn off</a>
</div> </div>
</section> </section>
</section> </section>
...@@ -66,7 +66,7 @@ ...@@ -66,7 +66,7 @@
$('div.video-subtitles').toggleClass('closed'); $('div.video-subtitles').toggleClass('closed');
var link_text = $('.hide-subtitles').text(); var link_text = $('.hide-subtitles').text();
$(this).text((link_text == 'on') ? 'off' : 'on'); $(this).text((link_text == 'turn off') ? 'turn on' : 'turn off');
return false; return false;
}); });
}); });
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment