Commit 731ca112 by Kyle Fiedler

Added some fixes to bugs in the updates, refactored the cream color to a sass…

Added some fixes to bugs in the updates, refactored the cream color to a sass variable and highlighted latest update
parent d3c4c2ee
...@@ -12,15 +12,22 @@ div.info-wrapper { ...@@ -12,15 +12,22 @@ div.info-wrapper {
margin-bottom: lh(); margin-bottom: lh();
} }
ol { > ol {
list-style: none; list-style: none;
li { > li {
padding-bottom: lh(.5); padding-bottom: lh(.5);
margin-bottom: lh(.5); margin-bottom: lh(.5);
@extend .clearfix; @extend .clearfix;
border-bottom: 1px solid #e3e3e3; border-bottom: 1px solid #e3e3e3;
&:first-child {
padding: lh(.5);
margin-left: (-(lh(.5)));
background: $cream;
border-bottom: 1px solid darken($cream, 10%);
}
h2 { h2 {
float: left; float: left;
width: flex-grid(2, 9); width: flex-grid(2, 9);
......
...@@ -166,8 +166,8 @@ h1.top-header { ...@@ -166,8 +166,8 @@ h1.top-header {
.topbar { .topbar {
@extend .clearfix; @extend .clearfix;
background: #F6EFD4; background: $cream;
border-bottom: 1px solid darken(#F6EFD4, 10%); border-bottom: 1px solid darken($cream, 10%);
@include box-shadow(inset 0 1px 0 #fff, inset 1px 0 0 #fff); @include box-shadow(inset 0 1px 0 #fff, inset 1px 0 0 #fff);
font-size: 12px; font-size: 12px;
margin: (-$body-line-height) (-$body-line-height) $body-line-height; margin: (-$body-line-height) (-$body-line-height) $body-line-height;
...@@ -180,17 +180,17 @@ h1.top-header { ...@@ -180,17 +180,17 @@ h1.top-header {
} }
a { a {
color: darken(#F6EFD4, 80%); color: darken($cream, 80%);
&:hover { &:hover {
color: darken(#F6EFD4, 60%); color: darken($cream, 60%);
text-decoration: none; text-decoration: none;
} }
&.block-link { &.block-link {
background: darken(#F6EFD4, 5%); background: darken($cream, 5%);
border-left: 1px solid darken(#f6efd4, 20%); border-left: 1px solid darken($cream, 20%);
@include box-shadow(inset 1px 0 0 lighten(#f6efd4, 5%)); @include box-shadow(inset 1px 0 0 lighten($cream, 5%));
display: block; display: block;
text-transform: uppercase; text-transform: uppercase;
......
...@@ -26,6 +26,7 @@ $fg-min-width: 810px; ...@@ -26,6 +26,7 @@ $fg-min-width: 810px;
$light-gray: #ddd; $light-gray: #ddd;
$dark-gray: #333; $dark-gray: #333;
$mit-red: #993333; $mit-red: #993333;
$cream: #F6EFD4;
$text-color: $dark-gray; $text-color: $dark-gray;
$border-color: $light-gray; $border-color: $light-gray;
...@@ -19,7 +19,7 @@ nav.sequence-nav { ...@@ -19,7 +19,7 @@ nav.sequence-nav {
background-repeat: no-repeat; background-repeat: no-repeat;
&:hover { &:hover {
background-color: lighten(#F6EFD4, 3%); background-color: lighten($cream, 3%);
} }
} }
...@@ -29,13 +29,12 @@ nav.sequence-nav { ...@@ -29,13 +29,12 @@ nav.sequence-nav {
@include box-shadow(inset 0 0 3px darken(#dccda2, 10%)); @include box-shadow(inset 0 0 3px darken(#dccda2, 10%));
&:hover { &:hover {
background-color: #F6EFD4; background-color: $cream;
background-position: center center; background-position: center center;
} }
} }
.active { .active {
// @include box-shadow(inset -1px 0 0 darken(#F6EFD4, 20%), inset 1px 0 0 darken(#F6EFD4, 20%));
@include box-shadow(0 1px 0 #fff); @include box-shadow(0 1px 0 #fff);
background-color: #fff; background-color: #fff;
background-repeat: no-repeat; background-repeat: no-repeat;
...@@ -50,7 +49,7 @@ nav.sequence-nav { ...@@ -50,7 +49,7 @@ nav.sequence-nav {
@include box-shadow(1px 0 0 #fff); @include box-shadow(1px 0 0 #fff);
background-position: center center; background-position: center center;
border: none; border: none;
border-right: 1px solid darken(#F6EFD4, 10%); border-right: 1px solid darken($cream, 10%);
cursor: pointer; cursor: pointer;
padding: 15px 4px 14px; padding: 15px 4px 14px;
width: 28px; width: 28px;
...@@ -166,11 +165,8 @@ nav.sequence-nav { ...@@ -166,11 +165,8 @@ nav.sequence-nav {
&.prev, &.next { &.prev, &.next {
a { a {
// color: darken(#F6EFD4, 80%);
// letter-spacing: 1px;
// text-transform: uppercase;
@include box-shadow(inset 1px 0 0 lighten(#f6efd4, 5%)); @include box-shadow(inset 1px 0 0 lighten(#f6efd4, 5%));
background-color: darken(#F6EFD4, 5%); background-color: darken($cream, 5%);
background-position: center center; background-position: center center;
background-repeat: no-repeat; background-repeat: no-repeat;
border-left: 1px solid darken(#f6efd4, 20%); border-left: 1px solid darken(#f6efd4, 20%);
...@@ -182,7 +178,7 @@ nav.sequence-nav { ...@@ -182,7 +178,7 @@ nav.sequence-nav {
&:hover { &:hover {
text-decoration: none; text-decoration: none;
color: darken(#F6EFD4, 60%); color: darken($cream, 60%);
text-decoration: none; text-decoration: none;
background-color: none; background-color: none;
} }
...@@ -230,7 +226,7 @@ section.course-content { ...@@ -230,7 +226,7 @@ section.course-content {
margin: lh() auto 0; margin: lh() auto 0;
overflow: hidden; overflow: hidden;
width: 106px; width: 106px;
background-color: darken(#F6EFD4, 5%); background-color: darken($cream, 5%);
@include box-shadow(inset 0 0 0 1px lighten(#f6efd4, 5%)); @include box-shadow(inset 0 0 0 1px lighten(#f6efd4, 5%));
li { li {
...@@ -249,15 +245,15 @@ section.course-content { ...@@ -249,15 +245,15 @@ section.course-content {
&:hover { &:hover {
text-decoration: none; text-decoration: none;
color: darken(#F6EFD4, 60%); color: darken($cream, 60%);
text-decoration: none; text-decoration: none;
opacity: .5; opacity: .5;
background-color: darken(#F6EFD4, 10%); background-color: darken($cream, 10%);
} }
&.disabled { &.disabled {
opacity: .4; opacity: .4;
background-color: lighten(#F6EFD4, 10%); background-color: lighten($cream, 10%);
} }
} }
} }
......
...@@ -153,12 +153,6 @@ div.answer-actions { ...@@ -153,12 +153,6 @@ div.answer-actions {
&.question-delete { &.question-delete {
// color: $mit-red; // color: $mit-red;
} }
&.question-edit, &.permant-link {
// color: darken(#F6EFD4, 45%);;
}
} }
} }
...@@ -70,7 +70,7 @@ body.user-profile-page { ...@@ -70,7 +70,7 @@ body.user-profile-page {
margin-bottom: 30px; margin-bottom: 30px;
li { li {
background-color: lighten(#F6EFD4, 3%); background-color: lighten($cream, 3%);
background-position: 10px center; background-position: 10px center;
background-repeat: no-repeat; background-repeat: no-repeat;
@include border-radius(4px); @include border-radius(4px);
......
...@@ -19,8 +19,8 @@ div.question-header { ...@@ -19,8 +19,8 @@ div.question-header {
&.post-vote { &.post-vote {
@include border-radius(4px); @include border-radius(4px);
background-color: lighten(#F6EFD4, 5%); background-color: lighten($cream, 5%);
border: 1px solid darken( #F6EFD4,10% ); border: 1px solid darken( $cream, 10% );
@include box-shadow(inset 0 1px 0px #fff); @include box-shadow(inset 0 1px 0px #fff);
} }
...@@ -79,7 +79,6 @@ div.question-header { ...@@ -79,7 +79,6 @@ div.question-header {
width: flex-grid(4,8); width: flex-grid(4,8);
a { a {
// color: darken(#F6EFD4, 50%);
&.question-delete { &.question-delete {
color: $mit-red; color: $mit-red;
...@@ -134,7 +133,7 @@ div.question-header { ...@@ -134,7 +133,7 @@ div.question-header {
&.revision { &.revision {
text-align: center; text-align: center;
background:lighten(#F6EFD4, 7%); background:lighten($cream, 7%);
a { a {
color: black; color: black;
......
...@@ -25,7 +25,7 @@ div.wiki-wrapper { ...@@ -25,7 +25,7 @@ div.wiki-wrapper {
p { p {
float: left; float: left;
margin-bottom: 0; margin-bottom: 0;
color: darken(#F6EFD4, 55%); color: darken($cream, 55%);
line-height: 46px; line-height: 46px;
padding-left: lh(); padding-left: lh();
} }
...@@ -39,14 +39,14 @@ div.wiki-wrapper { ...@@ -39,14 +39,14 @@ div.wiki-wrapper {
input[type="button"] { input[type="button"] {
@extend .block-link; @extend .block-link;
background-color: darken(#F6EFD4, 5%); background-color: darken($cream, 5%);
background-position: 12px center; background-position: 12px center;
background-repeat: no-repeat; background-repeat: no-repeat;
border: 0; border: 0;
border-left: 1px solid darken(#f6efd4, 20%); border-left: 1px solid darken(#f6efd4, 20%);
@include border-radius(0); @include border-radius(0);
@include box-shadow(inset 1px 0 0 lighten(#f6efd4, 5%)); @include box-shadow(inset 1px 0 0 lighten(#f6efd4, 5%));
color: darken(#F6EFD4, 80%); color: darken($cream, 80%);
display: block; display: block;
font-weight: normal; font-weight: normal;
font-size: 12px; font-size: 12px;
......
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