From d82cc563f47db4895652a077f30ccf3e811863f2 Mon Sep 17 00:00:00 2001 From: Kyle Fiedler Date: Mon, 12 Mar 2012 14:01:17 -0400 Subject: [PATCH 1/2] added some styles for inline-links --HG-- branch : kf-links --- sass/base/_base.scss | 7 ++++++- sass/base/_extends.scss | 5 +++++ sass/layout/_header.scss | 5 +++-- 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/sass/base/_base.scss b/sass/base/_base.scss index fd3f7774f7..e78d387b50 100644 --- a/sass/base/_base.scss +++ b/sass/base/_base.scss @@ -61,8 +61,13 @@ a { text-decoration:none; } + p &, li > &, .inline { + border-bottom: 1px solid #bbb; + font-style: italic; + } + &:hover, &:focus { - text-decoration:underline; + color: #000; } } diff --git a/sass/base/_extends.scss b/sass/base/_extends.scss index d55fe62f96..c022e4e941 100644 --- a/sass/base/_extends.scss +++ b/sass/base/_extends.scss @@ -79,6 +79,11 @@ h1.top-header { text-transform: none; } + a { + font-style: normal; + border: none; + } + .bottom-border { @include box-shadow(0 1px 0 #eee); border-bottom: 1px solid #d3d3d3; diff --git a/sass/layout/_header.scss b/sass/layout/_header.scss index 9851339ac4..1d88eac639 100644 --- a/sass/layout/_header.scss +++ b/sass/layout/_header.scss @@ -52,7 +52,7 @@ div.header-wrapper { a { color: #fff; - text-decoration: none; + border: none; &:hover { color: rgba(#fff, .7); @@ -104,7 +104,8 @@ div.header-wrapper { display: block; font-weight: bold; padding: 10px lh() 8px; - text-decoration: none; + border: none; + font-style: normal; @media screen and (max-width: 1020px) { padding: 10px lh(.7) 8px; From 856a284c00a1596af02ac4c03705440f5e3ba564 Mon Sep 17 00:00:00 2001 From: Kyle Fiedler Date: Mon, 12 Mar 2012 17:04:49 -0400 Subject: [PATCH 2/2] Fix bugs with link styles --HG-- branch : kf-links --- sass/base/_base.scss | 2 +- sass/base/_extends.scss | 1 + sass/courseware/_sequence-nav.scss | 17 +++++++++-------- sass/courseware/_video.scss | 1 + sass/discussion/_answers.scss | 1 + sass/discussion/_question-view.scss | 12 +++++++----- sass/discussion/_tags.scss | 2 ++ sass/layout/_footer.scss | 1 + 8 files changed, 23 insertions(+), 14 deletions(-) diff --git a/sass/base/_base.scss b/sass/base/_base.scss index e78d387b50..3f985ea666 100644 --- a/sass/base/_base.scss +++ b/sass/base/_base.scss @@ -61,7 +61,7 @@ a { text-decoration:none; } - p &, li > &, .inline { + p &, li > &, span > &, .inline { border-bottom: 1px solid #bbb; font-style: italic; } diff --git a/sass/base/_extends.scss b/sass/base/_extends.scss index c022e4e941..69bf69f7eb 100644 --- a/sass/base/_extends.scss +++ b/sass/base/_extends.scss @@ -186,6 +186,7 @@ h1.top-header { a { color: darken(#F6EFD4, 80%); + border-bottom: 0; &:hover { color: darken(#F6EFD4, 60%); diff --git a/sass/courseware/_sequence-nav.scss b/sass/courseware/_sequence-nav.scss index 155c3962b0..baf5108c96 100644 --- a/sass/courseware/_sequence-nav.scss +++ b/sass/courseware/_sequence-nav.scss @@ -224,14 +224,14 @@ section.course-content { ul { @extend .clearfix; + background-color: darken(#F6EFD4, 5%); border: 1px solid darken(#f6efd4, 20%); border-bottom: 0; @include border-radius(3px 3px 0 0); + @include box-shadow(inset 0 0 0 1px lighten(#f6efd4, 5%)); margin: lh() auto 0; overflow: hidden; width: 106px; - background-color: darken(#F6EFD4, 5%); - @include box-shadow(inset 0 0 0 1px lighten(#f6efd4, 5%)); li { float: left; @@ -242,22 +242,23 @@ section.course-content { a { background-position: center center; background-repeat: no-repeat; + border-bottom: none; + display: block; padding: lh(.75) 4px; text-indent: -9999px; width: 45px; - display: block; &:hover { - text-decoration: none; - color: darken(#F6EFD4, 60%); - text-decoration: none; - opacity: .5; background-color: darken(#F6EFD4, 10%); + color: darken(#F6EFD4, 60%); + opacity: .5; + text-decoration: none; + text-decoration: none; } &.disabled { - opacity: .4; background-color: lighten(#F6EFD4, 10%); + opacity: .4; } } } diff --git a/sass/courseware/_video.scss b/sass/courseware/_video.scss index 4402e968ad..1e93c026ee 100644 --- a/sass/courseware/_video.scss +++ b/sass/courseware/_video.scss @@ -95,6 +95,7 @@ section.course-content { a { @include box-shadow(1px 0 0 #555); + border-bottom: none; border-right: 1px solid #000; display: block; cursor: pointer; diff --git a/sass/discussion/_answers.scss b/sass/discussion/_answers.scss index e677f90b3e..b69d60017f 100644 --- a/sass/discussion/_answers.scss +++ b/sass/discussion/_answers.scss @@ -125,6 +125,7 @@ div.paginator { a { color: #555; text-decoration: none; + border-bottom: none; } } } diff --git a/sass/discussion/_question-view.scss b/sass/discussion/_question-view.scss index 99f8ccce9c..cd0061c674 100644 --- a/sass/discussion/_question-view.scss +++ b/sass/discussion/_question-view.scss @@ -64,7 +64,6 @@ div.question-header { overflow: hidden; padding: 5px 0 10px; - div.tag-list { display: inline-block; float:left; @@ -80,6 +79,7 @@ div.question-header { a { // color: darken(#F6EFD4, 50%); + border-bottom: none; &.question-delete { color: $mit-red; @@ -121,6 +121,11 @@ div.question-header { width: 20%; border-left: 1px dashed #ddd; + a { + border-bottom: none; + font-style: normal; + } + div.post-update-info { @include box-sizing(border-box); padding: 10px; @@ -139,10 +144,6 @@ div.question-header { } } - a { - color:$mit-red ; - } - div.change-date { font-size: 12px; margin-bottom: 2px; @@ -326,6 +327,7 @@ div.question-header { div.controls { border-top: 1px solid #efefef; text-align: right; + a { display: inline-block; font-size: 12px; diff --git a/sass/discussion/_tags.scss b/sass/discussion/_tags.scss index d8ea2e6c09..72c4e9ffc4 100644 --- a/sass/discussion/_tags.scss +++ b/sass/discussion/_tags.scss @@ -51,6 +51,8 @@ ul.tags { a { color: #555; text-decoration: none; + border-bottom: none; + font-style: normal; } } } diff --git a/sass/layout/_footer.scss b/sass/layout/_footer.scss index eb4786dd83..1669946a60 100644 --- a/sass/layout/_footer.scss +++ b/sass/layout/_footer.scss @@ -72,6 +72,7 @@ footer { height: 29px; width: 28px; text-indent: -9999px; + border-bottom: 0; &:hover { opacity: .8;