From d2808981cb84088ce7a3bdbfa91d08cb3d286a7e Mon Sep 17 00:00:00 2001 From: Tom Giannattasio Date: Wed, 22 Aug 2012 12:09:57 -0400 Subject: [PATCH 1/2] fixed wiki breadcrumb arrow bug --- lms/static/sass/course/wiki/_wiki.scss | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/lms/static/sass/course/wiki/_wiki.scss b/lms/static/sass/course/wiki/_wiki.scss index 1ddb52da56..e88d5e79af 100644 --- a/lms/static/sass/course/wiki/_wiki.scss +++ b/lms/static/sass/course/wiki/_wiki.scss @@ -38,22 +38,26 @@ section.wiki { float: left; margin-right: 10px; font-size: 0.9em; - line-height: 31px; a { - display: inline-block; - max-width: 200px; + float: left; + display: block; overflow: hidden; - height: 30px; + height: 30px; + line-height: 31px; + max-width: 200px; + height: 100%; text-overflow: ellipsis; white-space: nowrap; } &:after { content: '›'; - display: inline-block; + display: inline; margin-left: 10px; color: $base-font-color; + height: 30px; + line-height: 31px; } } } From 2c827c46f9fd1f2baee0d9408d34bd80533fdedb Mon Sep 17 00:00:00 2001 From: Tom Giannattasio Date: Wed, 22 Aug 2012 16:09:09 -0400 Subject: [PATCH 2/2] fixed firefox outline bugs --- common/lib/xmodule/xmodule/css/sequence/display.scss | 12 +++++++++++- common/lib/xmodule/xmodule/css/video/display.scss | 10 ++++++++++ lms/static/sass/course/base/_base.scss | 2 +- .../sass/course/layout/_courseware_header.scss | 11 ++++++++--- 4 files changed, 30 insertions(+), 5 deletions(-) diff --git a/common/lib/xmodule/xmodule/css/sequence/display.scss b/common/lib/xmodule/xmodule/css/sequence/display.scss index 90b1ff53a4..32b27d1e78 100644 --- a/common/lib/xmodule/xmodule/css/sequence/display.scss +++ b/common/lib/xmodule/xmodule/css/sequence/display.scss @@ -73,6 +73,11 @@ nav.sequence-nav { padding: 0; position: relative; @include transition(); + outline: 0; + + &:focus { + outline: 0; + } &:hover { background-color: #fff; @@ -211,7 +216,7 @@ nav.sequence-nav { ul { position: absolute; top: 0; - list-style: none; + list-style: none !important; height: 100%; right: 0; top: 0; @@ -238,6 +243,11 @@ nav.sequence-nav { width: 40px; text-indent: -9999px; @include transition(all, .2s, $ease-in-out-quad); + outline: 0; + + &:focus { + outline: 0; + } &:hover { opacity: .5; diff --git a/common/lib/xmodule/xmodule/css/video/display.scss b/common/lib/xmodule/xmodule/css/video/display.scss index fb78f46d77..504d5df8cf 100644 --- a/common/lib/xmodule/xmodule/css/video/display.scss +++ b/common/lib/xmodule/xmodule/css/video/display.scss @@ -101,6 +101,11 @@ div.video { @include transition(background-color, opacity); width: 14px; background: url('../images/vcr.png') 15px 15px no-repeat; + outline: 0; + + &:focus { + outline: 0; + } &:empty { height: 46px; @@ -171,6 +176,11 @@ div.video { @include transition(); -webkit-font-smoothing: antialiased; width: 116px; + outline: 0; + + &:focus { + outline: 0; + } h3 { color: #999; diff --git a/lms/static/sass/course/base/_base.scss b/lms/static/sass/course/base/_base.scss index e6bd70c338..1edb9aa7ba 100644 --- a/lms/static/sass/course/base/_base.scss +++ b/lms/static/sass/course/base/_base.scss @@ -1,7 +1,7 @@ body { min-width: 980px; min-height: 100%; - background: url(../images/bg-texture.png) #ddd; + background: url(../images/bg-texture.png) #d6d6d6; } body, h1, h2, h3, h4, h5, h6, p, p a:link, p a:visited, a, label { diff --git a/lms/static/sass/course/layout/_courseware_header.scss b/lms/static/sass/course/layout/_courseware_header.scss index 84ededfabb..aa5d07fc44 100644 --- a/lms/static/sass/course/layout/_courseware_header.scss +++ b/lms/static/sass/course/layout/_courseware_header.scss @@ -32,15 +32,20 @@ nav.course-material { font-size: 14px; font-weight: bold; text-decoration: none; + // text-shadow: 0 1px 0 rgba(0, 0, 0, .4); &:hover { color: #333; - background: rgba(255, 255, 255, .4); + background: rgba(255, 255, 255, .6); } &.active { - color: $blue; - background: rgba(255, 255, 255, .8); + // background: rgba(0, 0, 0, .2); + @include linear-gradient(top, rgba(0, 0, 0, .4), rgba(0, 0, 0, .25)); + background-color: transparent; + @include box-shadow(0 1px 0 rgba(255, 255, 255, .5), 0 1px 1px rgba(0, 0, 0, .3) inset); + color: #fff; + text-shadow: 0 1px 0 rgba(0, 0, 0, .4); } } }