diff --git a/lms/static/images/courses/video-thumb.jpg b/lms/static/images/courses/video-thumb.jpg new file mode 100644 index 0000000000..b27b8dc750 Binary files /dev/null and b/lms/static/images/courses/video-thumb.jpg differ diff --git a/lms/static/sass/_courses.scss b/lms/static/sass/_courses.scss index 6fef20ea22..7e5bd4ff38 100644 --- a/lms/static/sass/_courses.scss +++ b/lms/static/sass/_courses.scss @@ -22,13 +22,13 @@ width: flex-grid(12); > hgroup { + background: #FFF; background: rgba(255,255,255, 0.93); border: 1px solid rgb(100,100,100); @include box-shadow(0 4px 25px 0 rgba(0,0,0, 0.5)); padding: 20px 30px; position: relative; z-index: 2; - } &.main-search, &.university-search { diff --git a/lms/static/sass/_home.scss b/lms/static/sass/_home.scss index 0a03faa28d..4ef25f106c 100644 --- a/lms/static/sass/_home.scss +++ b/lms/static/sass/_home.scss @@ -24,6 +24,7 @@ } .title { + background: #FFF; background: rgba(255,255,255, 0.93); border: 1px solid rgb(100,100,100); @include box-shadow(0 4px 25px 0 rgba(0,0,0, 0.5)); @@ -189,6 +190,7 @@ } .media { + background: #FFF; background: rgba(255,255,255, 0.93); border: 1px solid rgb(100,100,100); @include box-sizing(border-box); @@ -226,6 +228,7 @@ width: 60px; &::after { + color: #fff; color: rgba(255,255,255, 0.8); content: "\25B6"; display: block; @@ -254,6 +257,7 @@ border-color: rgba(255,255,255, 0.9); &::after { + color: #fff; color: rgba(255,255,255, 1); } } diff --git a/lms/static/sass/ie.scss b/lms/static/sass/ie.scss new file mode 100644 index 0000000000..a160513d1a --- /dev/null +++ b/lms/static/sass/ie.scss @@ -0,0 +1,127 @@ +// These are all quick solutions for IE please rewrite +.highlighted-courses .courses .course header.course-preview, .find-courses .courses .course header.course-preview, +.home .highlighted-courses > h2, .home .highlighted-courses > section.outside-app h1, section.outside-app .home .highlighted-courses > h1, +header.global { + background: #FFF; +} + +.home > header .title .actions, +.home > header .title:hover .actions { + display: none; + height: auto; +} + +.home > header .title { + &:hover { + height: 120px; + + > hgroup { + h1 { + border-bottom: 0; + padding-bottom: 0; + } + + h2 { + opacity: 1; + } + } + + .actions { + opacity: 0; + } + } +} + +.last { + margin-right: 0 !important; +} + +.home .university-partners .partners a { + .name { + position: static; + } + + &:hover { + text-decoration: none; + + &::before { + opacity: 1; + } + + .name { + bottom: 0px; + } + + img { + top: 0px; + } + } + +} + + +.home .university-partners .partners { + width: 660px; + + li.partner { + float: left; + display: block; + padding: 0; + width: 220px; + overflow: hidden; + } +} + +.highlighted-courses .courses .course, .find-courses .courses .course { + .meta-info { + display: none; + } + + .inner-wrapper { + height: 100%; + overflow: visible; + position: relative; + } + + header.course-preview { + left: 0px; + position: relative; + top: 0px; + width: 100%; + z-index: 3; + height: auto; + + hgroup { + position: relative; + right: 0; + top: 0; + } + + } + // } + + .info { + height: auto; + position: static; + overflow: visible; + + .desc { + height: auto; + } + } + + &:hover { + background: rgb(245,245,245); + border-color: rgb(170,170,170); + @include box-shadow(0 1px 16px 0 rgba($blue, 0.4)); + + .info { + top: 0; + } + + .meta-info { + opacity: 0; + } + } +} + diff --git a/lms/static/sass/shared/_course_object.scss b/lms/static/sass/shared/_course_object.scss index a448155447..374caf4898 100644 --- a/lms/static/sass/shared/_course_object.scss +++ b/lms/static/sass/shared/_course_object.scss @@ -141,6 +141,7 @@ top: 0px; @include transition(all, 0.15s, linear); width: 100%; + overflow: hidden; .cover-image { height: 200px; @@ -174,7 +175,6 @@ padding: 0px 10px 10px 10px; width: 100%; - .university { border-right: 1px solid rgb(200,200,200); color: $lighter-base-font-color; diff --git a/lms/templates/courses.html b/lms/templates/courses.html index d7302565d9..25f3d27a08 100644 --- a/lms/templates/courses.html +++ b/lms/templates/courses.html @@ -28,7 +28,7 @@ <%include file="course.html" args="course=course" /> %endfor -
+
%for course in universities['BerkeleyX']: <%include file="course.html" args="course=course" /> %endfor diff --git a/lms/templates/index.html b/lms/templates/index.html index 062a6bbe3d..28ef2d3b25 100644 --- a/lms/templates/index.html +++ b/lms/templates/index.html @@ -66,7 +66,7 @@ -
  • +
  • @@ -88,7 +88,7 @@ <%include file="course.html" args="course=course" /> %endfor
  • -
    +
    %for course in universities['BerkeleyX']: <%include file="course.html" args="course=course" /> %endfor diff --git a/lms/templates/main.html b/lms/templates/main.html index 0fe68e4728..2c9e00081d 100644 --- a/lms/templates/main.html +++ b/lms/templates/main.html @@ -13,6 +13,9 @@ % if not settings.MITX_FEATURES['USE_DJANGO_PIPELINE']: + % endif @@ -64,10 +67,6 @@ <%include file="navigation.html" /> - -
    ${self.body()}