Commit e90103ab by Kyle Fiedler

Reset styles for profile page and some for the info page

parent ac960ab9
...@@ -92,7 +92,7 @@ div.info-wrapper { ...@@ -92,7 +92,7 @@ div.info-wrapper {
@include box-sizing(border-box); @include box-sizing(border-box);
padding: em(7) lh(.75); padding: em(7) lh(.75);
position: relative; position: relative;
font-size: $body-font-size; font-size: 1em;
&.expandable, &.expandable,
&.collapsable { &.collapsable {
...@@ -111,7 +111,6 @@ div.info-wrapper { ...@@ -111,7 +111,6 @@ div.info-wrapper {
border-bottom: 0; border-bottom: 0;
border-top: 1px solid $border-color; border-top: 1px solid $border-color;
@include box-shadow(inset 0 1px 0 #eee); @include box-shadow(inset 0 1px 0 #eee);
padding-left: lh(1.5);
font-size: 1em; font-size: 1em;
} }
} }
...@@ -149,14 +148,12 @@ div.info-wrapper { ...@@ -149,14 +148,12 @@ div.info-wrapper {
} }
p { p {
font: 1em $sans-serif;
letter-spacing: 0; letter-spacing: 0;
margin: 0; margin: 0;
text-transform: none; text-transform: none;
a { a {
padding-right: 8px; padding-right: 8px;
font-family: $sans-serif;
&:before { &:before {
color: #ccc; color: #ccc;
...@@ -175,14 +172,8 @@ div.info-wrapper { ...@@ -175,14 +172,8 @@ div.info-wrapper {
} }
a { a {
color: lighten($text-color, 10%);
@include inline-block(); @include inline-block();
text-decoration: none; line-height: lh();
@include transition();
&:hover {
color: $mit-red;
}
} }
} }
} }
......
...@@ -10,38 +10,26 @@ div.profile-wrapper { ...@@ -10,38 +10,26 @@ div.profile-wrapper {
header { header {
@extend .bottom-border; @extend .bottom-border;
margin: 0 ; margin: 0;
padding: lh(.5) lh(); padding: lh(.5);
h1 { h1 {
font-size: 18px;
margin: 0; margin: 0;
padding-right: 30px; padding-right: 30px;
} }
a {
color: #999;
font-size: 12px;
position: absolute;
right: lh(.5);
text-transform: uppercase;
top: 13px;
&:hover {
color: #555;
}
}
} }
ul { ul {
list-style: none; list-style: none;
padding: 0;
margin: 0;
li { li {
border-bottom: 1px solid #d3d3d3; border-bottom: 1px solid #d3d3d3;
@include box-shadow(0 1px 0 #eee); @include box-shadow(0 1px 0 #eee);
color: lighten($text-color, 10%); color: lighten($text-color, 10%);
display: block; display: block;
padding: 7px lh(); padding: lh(.5) 0 lh(.5) lh(.5);
position: relative; position: relative;
text-decoration: none; text-decoration: none;
@include transition(); @include transition();
...@@ -144,11 +132,14 @@ div.profile-wrapper { ...@@ -144,11 +132,14 @@ div.profile-wrapper {
@extend .content; @extend .content;
header { header {
@extend h1.top-header;
@extend .clearfix; @extend .clearfix;
@extend h1.top-header;
margin-bottom: lh();
h1 { h1 {
float: left; float: left;
font-size: 1em;
font-weight: 100;
margin: 0; margin: 0;
} }
} }
...@@ -162,6 +153,7 @@ div.profile-wrapper { ...@@ -162,6 +153,7 @@ div.profile-wrapper {
border-top: 1px solid #e3e3e3; border-top: 1px solid #e3e3e3;
list-style: none; list-style: none;
margin-top: lh(); margin-top: lh();
padding-left: 0;
> li { > li {
@extend .clearfix; @extend .clearfix;
...@@ -178,9 +170,11 @@ div.profile-wrapper { ...@@ -178,9 +170,11 @@ div.profile-wrapper {
border-right: 1px dashed #ddd; border-right: 1px dashed #ddd;
@include box-sizing(border-box); @include box-sizing(border-box);
display: table-cell; display: table-cell;
letter-spacing: 0;
margin: 0; margin: 0;
padding: 0; padding: 0;
padding-right: flex-gutter(9); padding-right: flex-gutter(9);
text-transform: none;
width: flex-grid(2, 9); width: flex-grid(2, 9);
} }
...@@ -203,13 +197,37 @@ div.profile-wrapper { ...@@ -203,13 +197,37 @@ div.profile-wrapper {
h3 { h3 {
color: #666; color: #666;
span {
color: #999;
font-size: em(14);
font-weight: 100;
}
}
p {
color: #999;
font-size: em(14);
}
section.scores {
margin: lh(.5) 0;
h3 {
font-size: em(14);
@include inline-block;
} }
ol { ol {
list-style: none; list-style: none;
margin: 0;
padding: 0;
@include inline-block;
li { li {
display: inline-block; @include inline-block;
font-size: em(14);
font-weight: normal;
padding-right: 1em; padding-right: 1em;
} }
} }
...@@ -218,4 +236,5 @@ div.profile-wrapper { ...@@ -218,4 +236,5 @@ div.profile-wrapper {
} }
} }
} }
}
} }
body { body, h1, h2, h3, h4, h5, h6, p, p a:link, p a:visited, a {
font-family: $sans-serif;
}
h1, h2, h3, h4, h5, h6 {
font-family: $sans-serif; font-family: $sans-serif;
} }
......
h1.top-header { h1.top-header {
border-bottom: 1px solid #e3e3e3; border-bottom: 1px solid #e3e3e3;
text-align: left; text-align: left;
font-size: 24px; font-size: em(24);
font-weight: 100; font-weight: 100;
padding-bottom: lh(); padding-bottom: lh();
} }
......
...@@ -139,19 +139,27 @@ $(function() { ...@@ -139,19 +139,27 @@ $(function() {
%> %>
<h3><a href="${reverse('courseware_section', kwargs={'course_id' : course.id, 'chapter' : chapter['url_name'], 'section' : section['url_name']})}"> <h3><a href="${reverse('courseware_section', kwargs={'course_id' : course.id, 'chapter' : chapter['url_name'], 'section' : section['url_name']})}">
${ section['display_name'] }</a> ${"({0:.3n}/{1:.3n}) {2}".format( float(earned), float(total), percentageString )}</h3> ${ section['display_name'] }</a><span> ${"({0:.3n}/{1:.3n}) {2}".format( float(earned), float(total), percentageString )}</span></h3>
<p>
${section['format']} ${section['format']}
%if 'due' in section and section['due']!="": %if 'due' in section and section['due']!="":
<em>
due ${section['due']} due ${section['due']}
</em>
%endif %endif
</p>
%if len(section['scores']) > 0: %if len(section['scores']) > 0:
<ol class="scores"> <section class="scores">
${ "Problem Scores: " if section['graded'] else "Practice Scores: "} <h3> ${ "Problem Scores: " if section['graded'] else "Practice Scores: "} </h3>
<ol>
%for score in section['scores']: %for score in section['scores']:
<li class="score">${"{0:.3n}/{1:.3n}".format(float(score.earned),float(score.possible))}</li> <li>${"{0:.3n}/{1:.3n}".format(float(score.earned),float(score.possible))}</li>
%endfor %endfor
</ol> </ol>
</section>
%endif %endif
</li> <!--End section--> </li> <!--End section-->
......
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