From 712b97115d66260c8ed6442c8015f2e186c06e32 Mon Sep 17 00:00:00 2001 From: Kyle Fiedler Date: Mon, 30 Jan 2012 12:09:23 -0500 Subject: [PATCH] Fixed topbar bug in discussion --- sass/_base-extends.scss | 20 +++++++++++++------- sass/_courseware.scss | 5 +++++ sass/_textbook.scss | 4 ++++ sass/_wiki.scss | 4 ++++ 4 files changed, 26 insertions(+), 7 deletions(-) diff --git a/sass/_base-extends.scss b/sass/_base-extends.scss index 1ed3c8b530..de1f917fca 100644 --- a/sass/_base-extends.scss +++ b/sass/_base-extends.scss @@ -109,18 +109,24 @@ @extend .clearfix; a { - @include box-shadow(inset 1px 0 0 lighten(#f6efd4, 5%)); - background: darken(#F6EFD4, 5%); - border-left: 1px solid darken(#f6efd4, 20%); color: darken(#F6EFD4, 80%); - padding: lh(.75); - text-transform: uppercase; - display: block; &:hover { color: darken(#F6EFD4, 60%); text-decoration: none; - background: none; + } + + &.block-link { + @include box-shadow(inset 1px 0 0 lighten(#f6efd4, 5%)); + background: darken(#F6EFD4, 5%); + border-left: 1px solid darken(#f6efd4, 20%); + padding: lh(.75); + text-transform: uppercase; + display: block; + + &:hover { + background: none; + } } } } diff --git a/sass/_courseware.scss b/sass/_courseware.scss index 2860fc798f..3c59e6e0c8 100644 --- a/sass/_courseware.scss +++ b/sass/_courseware.scss @@ -65,6 +65,7 @@ div.course-wrapper { text-decoration: none; margin-bottom: lh(.5); display: block; + color: #000; &:hover { color: #666; @@ -111,6 +112,10 @@ div.course-wrapper { margin-bottom: $body-line-height; @extend .topbar; + a { + @extend .block-link; + } + li { border: none; cursor: pointer; diff --git a/sass/_textbook.scss b/sass/_textbook.scss index 7bc5a67f7c..2212367a02 100644 --- a/sass/_textbook.scss +++ b/sass/_textbook.scss @@ -46,6 +46,10 @@ div.book-wrapper { @extend .topbar; @extend .clearfix; + a { + @extend .block-link; + } + ul { @extend .clearfix; diff --git a/sass/_wiki.scss b/sass/_wiki.scss index a558e373dc..a3c6c95e3c 100644 --- a/sass/_wiki.scss +++ b/sass/_wiki.scss @@ -78,6 +78,10 @@ div.wiki-wrapper { header { @extend .topbar; + a { + @extend .block-link; + } + p { float: left; padding: 15px;