From 54b7a578a261abc1438b024d273e753fc5746c13 Mon Sep 17 00:00:00 2001 From: Giulio Gratta Date: Tue, 4 Nov 2014 13:03:36 -0800 Subject: [PATCH] Remove extra prerequisites style and add classes --- .../sass/multicourse/_course_about.scss | 18 +++---------- lms/templates/courseware/course_about.html | 25 ++++++++++--------- 2 files changed, 17 insertions(+), 26 deletions(-) diff --git a/lms/static/sass/multicourse/_course_about.scss b/lms/static/sass/multicourse/_course_about.scss index 5e85f09387..24e04bdb75 100644 --- a/lms/static/sass/multicourse/_course_about.scss +++ b/lms/static/sass/multicourse/_course_about.scss @@ -532,31 +532,21 @@ .important-dates { list-style: none; margin: 0px; - padding: 0 ($baseline/2); + padding: 0px; - li { + .important-dates-item { @include clearfix; border-bottom: 1px dotted $border-color-2; margin-bottom: $baseline; padding-bottom: ($baseline/2); - &.prerequisites { - border: 1px solid $border-color-2; - margin: 0 -($baseline/2) 0; - padding: ($baseline/2); - - p { - margin-right: ($baseline/2); - } - } - &:hover, &:focus { .icon { opacity: 1.0; } } - p { + .important-dates-item-title { color: $lighter-base-font-color; float: left; font-family: $sans-serif; @@ -569,7 +559,7 @@ opacity: .6; } - span { + .important-dates-item-text { float: right; font-weight: 700; } diff --git a/lms/templates/courseware/course_about.html b/lms/templates/courseware/course_about.html index 0859f2247b..af267f2284 100644 --- a/lms/templates/courseware/course_about.html +++ b/lms/templates/courseware/course_about.html @@ -285,33 +285,34 @@
    -
  1. ${_("Course Number")}

    ${course.display_number_with_default | h}
  2. +
  3. ${_("Course Number")}

    ${course.display_number_with_default | h}
  4. % if not course.start_date_is_still_default: -
  5. ${_("Classes Start")}

    ${course.start_datetime_text()}
  6. +
  7. ${_("Classes Start")}

    ${course.start_datetime_text()}
  8. % endif ## We plan to ditch end_date (which is not stored in course metadata), ## but for backwards compatibility, show about/end_date blob if it exists. % if get_course_about_section(course, "end_date") or course.end: -
  9. +
  10. -

    ${_("Classes End")}

    - % if get_course_about_section(course, "end_date"): - ${get_course_about_section(course, "end_date")} - % else: - ${course.end_datetime_text()} - % endif +

    ${_("Classes End")}

    + + % if get_course_about_section(course, "end_date"): + ${get_course_about_section(course, "end_date")} + % else: + ${course.end_datetime_text()} + % endif
  11. % endif % if get_course_about_section(course, "effort"): -
  12. ${_("Estimated Effort")}

    ${get_course_about_section(course, "effort")}
  13. +
  14. ${_("Estimated Effort")}

    ${get_course_about_section(course, "effort")}
  15. % endif - ##
  16. ${_('Course Length')}

    ${_('{number} weeks').format(number=15)}
  17. + ##
  18. ${_('Course Length')}

    ${_('{number} weeks').format(number=15)}
  19. % if get_course_about_section(course, "prerequisites"): -
  20. ${_("Prerequisites")}

    ${get_course_about_section(course, "prerequisites")}
  21. +
  22. ${_("Prerequisites")}

    ${get_course_about_section(course, "prerequisites")}
  23. % endif