Commit 48d39ee7 by Galen Frechette

fixes coursse about header to accept very long course names, fixes icons on course about sidebar

parent 7a332d7b
...@@ -34,7 +34,6 @@ ...@@ -34,7 +34,6 @@
@include box-sizing(border-box); @include box-sizing(border-box);
@include clearfix; @include clearfix;
float: left; float: left;
height: 180px;
padding: 20px 20px; padding: 20px 20px;
position: relative; position: relative;
width: flex-grid(8) + flex-gutter(); width: flex-grid(8) + flex-gutter();
...@@ -43,17 +42,31 @@ ...@@ -43,17 +42,31 @@
> hgroup { > hgroup {
border-bottom: 1px solid rgb(210,210,210); border-bottom: 1px solid rgb(210,210,210);
@include box-shadow(0 1px 0 0 rgba(255,255,255, 0.6)); @include box-shadow(0 1px 0 0 rgba(255,255,255, 0.6));
margin-bottom: 27px; margin-bottom: 20px;
padding-bottom: 20px; padding-bottom: 20px;
width: 100%; width: 100%;
h1 { h1 {
color: $base-font-color; color: $base-font-color;
font-weight: 700; font-weight: normal;
@include inline-block; @include inline-block;
margin: 0 10px 0 0; margin: 0;
letter-spacing: 0px; letter-spacing: 0px;
text-align: left;
text-shadow: 0 1px rgba(255,255,255, 0.6); text-shadow: 0 1px rgba(255,255,255, 0.6);
a {
color: $lighter-base-font-color;
font: italic 800 0.6em/1em $sans-serif;
letter-spacing: 0px;
margin-left: 15px;
text-shadow: 0 1px rgba(255,255,255, 0.6);
text-transform: none;
&:hover {
color: $blue;
}
}
} }
h2 { h2 {
...@@ -116,7 +129,6 @@ ...@@ -116,7 +129,6 @@
.media { .media {
background: transparent; background: transparent;
border-left: 1px solid rgb(100,100,100);
@include box-sizing(border-box); @include box-sizing(border-box);
display: block; display: block;
float: right; float: right;
...@@ -167,6 +179,7 @@ ...@@ -167,6 +179,7 @@
&:hover { &:hover {
cursor: pointer; cursor: pointer;
text-decoration: none;
.play-intro { .play-intro {
@include background-image(linear-gradient(-90deg, rgba(0,0,0, 0.75), rgba(0,0,0, 0.8))); @include background-image(linear-gradient(-90deg, rgba(0,0,0, 0.75), rgba(0,0,0, 0.8)));
...@@ -246,9 +259,18 @@ ...@@ -246,9 +259,18 @@
.teacher-image { .teacher-image {
background: rgb(255,255,255); background: rgb(255,255,255);
border: 1px solid rgb(200,200,200); border: 1px solid rgb(200,200,200);
height: 115px;
float: left; float: left;
margin: 0 15px 15px 0; margin: 0 15px 0px 0;
overflow: hidden;
padding: 1px; padding: 1px;
width: 115px;
img {
display: block;
min-height: 100%;
max-width: 100%;
}
} }
} }
} }
...@@ -397,21 +419,29 @@ ...@@ -397,21 +419,29 @@
@include transition(all, 0.15s, linear); @include transition(all, 0.15s, linear);
width: 19px; width: 19px;
&.start-icon { &.start {
@include background-image(url('../images/portal-icons/calendar-icon.png')); @include background-image(url('../images/portal-icons/calendar-icon.png'));
} }
&.final-icon { &.end {
@include background-image(url('../images/portal-icons/pencil-icon.png')); @include background-image(url('../images/portal-icons/calendar-icon.png'));
} }
&.length-icon { &.length {
@include background-image(url('../images/portal-icons/chart-icon.png')); @include background-image(url('../images/portal-icons/chart-icon.png'));
} }
&.number-icon { &.course-number {
@include background-image(url('../images/portal-icons/course-info-icon.png')); @include background-image(url('../images/portal-icons/course-info-icon.png'));
} }
&.effort {
@include background-image(url('../images/portal-icons/pencil-icon.png'));
}
&.prerequisites {
@include background-image(url('../images/portal-icons/prerec-icon.png'));
}
} }
span { span {
......
...@@ -106,6 +106,7 @@ ...@@ -106,6 +106,7 @@
&:hover { &:hover {
@include background-image(linear-gradient(-90deg, rgba(255,255,255, 1), rgba(255,255,255, 0.8))); @include background-image(linear-gradient(-90deg, rgba(255,255,255, 1), rgba(255,255,255, 0.8)));
text-decoration: none;
h2, .info-link { h2, .info-link {
color: $blue; color: $blue;
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
<div class="intro-inner-wrapper"> <div class="intro-inner-wrapper">
<section class="intro"> <section class="intro">
<hgroup> <hgroup>
<h1>${course.number}: ${get_course_about_section(course, "title")}</h1><h2><a href="${reverse('university_profile', args=[course.org])}">${get_course_about_section(course, "university")}</a></h2> <h1>${course.number}: ${get_course_about_section(course, "title")}<a href="${reverse('university_profile', args=[course.org])}">${get_course_about_section(course, "university")}</a></h1>
</hgroup> </hgroup>
<div class="main-cta"> <div class="main-cta">
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
<div class="hero"> <div class="hero">
<img src="${course_image_url(course)}" /> <img src="${course_image_url(course)}" />
</div> </div>
</a> </div>
% endif % endif
</div> </div>
</header> </header>
...@@ -81,23 +81,23 @@ ...@@ -81,23 +81,23 @@
</header> </header>
<ol class="important-dates"> <ol class="important-dates">
<li><div class="icon number-icon"></div><p>Course Number</p><span class="course-number">${course.number}</span></li> <li><div class="icon course-number"></div><p>Course Number</p><span class="course-number">${course.number}</span></li>
<li><div class="icon start-icon"></div><p>Classes Start</p><span class="start-date">${course.start_date_text}</span></li> <li><div class="icon start"></div><p>Classes Start</p><span class="start-date">${course.start_date_text}</span></li>
## End date should come from course.xml, but this is a quick hack ## End date should come from course.xml, but this is a quick hack
% if get_course_about_section(course, "end_date"): % if get_course_about_section(course, "end_date"):
<li><div class="icon final-icon"></div><p>Classes End</p><span class="final-date">${get_course_about_section(course, "end_date")}</span></li> <li><div class="icon end"></div><p>Classes End</p><span class="final-date">${get_course_about_section(course, "end_date")}</span></li>
% endif % endif
% if get_course_about_section(course, "effort"): % if get_course_about_section(course, "effort"):
<li><div class="icon"></div><p>Estimated Effort</p><span class="start-date">${get_course_about_section(course, "effort")}</span></li> <li><div class="icon effort"></div><p>Estimated Effort</p><span class="start-date">${get_course_about_section(course, "effort")}</span></li>
% endif % endif
##<li><div class="icon length"></div><p>Course Length</p><span class="course-length">15 weeks</span></li>
% if get_course_about_section(course, "prerequisites"): % if get_course_about_section(course, "prerequisites"):
<li><div class="icon"></div><p>Prerequisites</p><span class="start-date">${get_course_about_section(course, "prerequisites")}</span></li> <li><div class="icon prerequisites"></div><p>Prerequisites</p><span class="start-date">${get_course_about_section(course, "prerequisites")}</span></li>
% endif % endif
##<li><div class="icon length-icon"></div><p>Course Length</p><span class="course-length">15 weeks</span></li>
</ol> </ol>
</section> </section>
</section> </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