Commit b08a8f7e by Chris Rodriguez

Style simplification to sync up styles

parent d98354d0
...@@ -10,7 +10,6 @@ html, body { ...@@ -10,7 +10,6 @@ html, body {
font-size: 1em; font-size: 1em;
font-style: normal; font-style: normal;
line-height: 1em; line-height: 1em;
//-webkit-font-smoothing: antialiased;
} }
html{ html{
...@@ -33,7 +32,6 @@ h1 { ...@@ -33,7 +32,6 @@ h1 {
letter-spacing: 1px; letter-spacing: 1px;
margin-bottom: ($baseline*1.5); margin-bottom: ($baseline*1.5);
text-align: center; text-align: center;
//text-transform: uppercase;
} }
h2 { h2 {
...@@ -50,14 +48,13 @@ p + h2, ul + h2, ol + h2 { ...@@ -50,14 +48,13 @@ p + h2, ul + h2, ol + h2 {
} }
p { p {
color: $base-font-color; color: inherit;
font: normal 1em/1.6em $serif;
margin: 0; margin: 0;
} }
span { span {
font: normal 1em/1.6em $sans-serif; font: inherit;
color: $base-font-color; color: inherit;
} }
/* Fix for CodeMirror: prevent top-level span from affecting deeply-embedded span in CodeMirror */ /* Fix for CodeMirror: prevent top-level span from affecting deeply-embedded span in CodeMirror */
...@@ -79,9 +76,10 @@ p + p, ul + p, ol + p { ...@@ -79,9 +76,10 @@ p + p, ul + p, ol + p {
} }
p { p {
a:link, a:visited { a, a:visited {
color: $link-color; color: $link-color;
font: normal 1em/1em $serif; font: inherit;
font-weight: inherit;
text-decoration: none; text-decoration: none;
@include transition(all 0.1s linear 0s); @include transition(all 0.1s linear 0s);
...@@ -92,9 +90,9 @@ p { ...@@ -92,9 +90,9 @@ p {
} }
} }
a:link, a:visited { a, a:visited {
color: $link-color; color: $link-color;
font: normal 1em/1em $sans-serif; font: inherit;
text-decoration: none; text-decoration: none;
@include transition(all 0.1s linear 0s); @include transition(all 0.1s linear 0s);
...@@ -109,14 +107,6 @@ a:link, a:visited { ...@@ -109,14 +107,6 @@ a:link, a:visited {
} }
} }
a:focus {
/**
* Add general focus styling here
* for example:
* outline: 3px groove $black;
**/
}
.content-wrapper { .content-wrapper {
width: flex-grid(12); width: flex-grid(12);
margin: 0 auto; margin: 0 auto;
......
...@@ -43,7 +43,7 @@ body { ...@@ -43,7 +43,7 @@ body {
//background-image: $course-bg-image; //background-image: $course-bg-image;
} }
body, h1, h2, h3, h4, h5, h6, p, p a:link, p a:visited, a, label { body, h1, h2, h3, h4, h5, h6, p, label {
@include text-align(left); @include text-align(left);
font-family: $sans-serif; font-family: $sans-serif;
} }
...@@ -52,6 +52,10 @@ table { ...@@ -52,6 +52,10 @@ table {
table-layout: fixed; table-layout: fixed;
} }
.xblock table {
table-layout: auto
}
a { a {
&:hover, &:focus { &:hover, &:focus {
color: $pink; color: $pink;
......
...@@ -105,11 +105,6 @@ div.course-wrapper { ...@@ -105,11 +105,6 @@ div.course-wrapper {
p { p {
margin-bottom: lh(); margin-bottom: lh();
&:empty {
display: none;
margin-bottom: 0;
}
} }
.sequential-status-message { .sequential-status-message {
......
...@@ -72,6 +72,11 @@ $learn-more-horizontal-position: calc(50% - 100px); // calculate the left positi ...@@ -72,6 +72,11 @@ $learn-more-horizontal-position: calc(50% - 100px); // calculate the left positi
.course-info { .course-info {
height: $course-info-height; height: $course-info-height;
font-family: $sans-serif;
h2 {
font-family: $sans-serif;
}
.course-organization, .course-code, .course-date { .course-organization, .course-code, .course-date {
@extend %t-icon6; @extend %t-icon6;
......
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