diff --git a/cms/static/sass/_reset.scss b/cms/static/sass/_reset.scss index 041a038d1d..c2655017ec 100644 --- a/cms/static/sass/_reset.scss +++ b/cms/static/sass/_reset.scss @@ -21,7 +21,7 @@ dl, dt, dd, ol, ul, li, fieldset, form, label, legend, table, caption, tbody, tfoot, thead, tr, th, td, article, aside, canvas, details, figcaption, figure, -footer, header, hgroup, menu, nav, section, summary, +footer, header, menu, nav, section, summary, time, mark, audio, video { margin: 0; padding: 0; @@ -37,7 +37,7 @@ html,body { } article, aside, details, figcaption, figure, -footer, header, hgroup, menu, nav, section { +footer, header, menu, nav, section { display: block; } body { diff --git a/cms/templates/temp-course-landing.html b/cms/templates/temp-course-landing.html index 1bccc73fb9..5c9ed498fd 100644 --- a/cms/templates/temp-course-landing.html +++ b/cms/templates/temp-course-landing.html @@ -6,10 +6,10 @@ <%block name="content">
-
+

${_("Circuits and Electronics")}

${_("Massachusetts Institute of Technology")}

-
+
@@ -37,4 +37,4 @@
- \ No newline at end of file + diff --git a/common/static/css/vendor/normalize.css b/common/static/css/vendor/normalize.css index c9646a0f4f..31c71b03ec 100644 --- a/common/static/css/vendor/normalize.css +++ b/common/static/css/vendor/normalize.css @@ -15,7 +15,6 @@ figcaption, figure, footer, header, -hgroup, main, nav, section, diff --git a/common/test/acceptance/pages/lms/index.py b/common/test/acceptance/pages/lms/index.py index 431d540ef2..80a5a674de 100644 --- a/common/test/acceptance/pages/lms/index.py +++ b/common/test/acceptance/pages/lms/index.py @@ -5,7 +5,7 @@ LMS index (home) page. from bok_choy.page_object import PageObject from . import BASE_URL -BANNER_SELECTOR = 'section.home header div.outer-wrapper div.title hgroup h1' +BANNER_SELECTOR = 'section.home header div.outer-wrapper div.title .heading-group h1' INTRO_VIDEO_SELECTOR = 'div.play-intro' VIDEO_MODAL_SELECTOR = 'section#video-modal.modal.home-page-video-modal.video-modal' diff --git a/lms/static/sass/base/_reset.scss b/lms/static/sass/base/_reset.scss index d181013ef7..11a4fd1ff8 100644 --- a/lms/static/sass/base/_reset.scss +++ b/lms/static/sass/base/_reset.scss @@ -1,6 +1,6 @@ /* HTML5 Boilerplate */ -article, aside, details, figcaption, figure, footer, header, hgroup, nav, section { display: block; } +article, aside, details, figcaption, figure, footer, header, nav, section { display: block; } audio, canvas, video { display: inline-block; *display: inline; *zoom: 1; } audio:not([controls]) { display: none; } [hidden] { display: none; } diff --git a/lms/static/sass/multicourse/_course_about.scss b/lms/static/sass/multicourse/_course_about.scss index 419dadb2d2..c26c439b4d 100644 --- a/lms/static/sass/multicourse/_course_about.scss +++ b/lms/static/sass/multicourse/_course_about.scss @@ -43,7 +43,7 @@ width: flex-grid(8) + flex-gutter(); z-index: 2; - > hgroup { + > .heading-group { border-bottom: 1px solid $border-color-2; box-shadow: 0 1px 0 0 rgba(255,255,255, 0.6); margin-bottom: $baseline; diff --git a/lms/static/sass/multicourse/_courses.scss b/lms/static/sass/multicourse/_courses.scss index 57f47da9e0..e397704423 100644 --- a/lms/static/sass/multicourse/_courses.scss +++ b/lms/static/sass/multicourse/_courses.scss @@ -151,7 +151,7 @@ $facet-background-color: #007db8; text-align: center; width: flex-grid(12); - > hgroup { + > .heading-group { background: $white; background: $course-header-bg; border: 1px solid $border-color-3; @@ -164,7 +164,7 @@ $facet-background-color: #007db8; &.main-search, &.university-search { text-align: center; - hgroup { + .heading-group { display: inline-block; } diff --git a/lms/static/sass/multicourse/_home.scss b/lms/static/sass/multicourse/_home.scss index c0042b3348..f0d9090ec3 100644 --- a/lms/static/sass/multicourse/_home.scss +++ b/lms/static/sass/multicourse/_home.scss @@ -69,7 +69,7 @@ $course-search-input-height: ($button-size); @include shift(0); } - > hgroup { + > .heading-group { @include left(0); @include box-sizing(border-box); @include transition(all 0.2s linear 0s); diff --git a/lms/static/sass/shared/_course_object.scss b/lms/static/sass/shared/_course_object.scss index 16fb132a2b..18848679b6 100644 --- a/lms/static/sass/shared/_course_object.scss +++ b/lms/static/sass/shared/_course_object.scss @@ -113,7 +113,7 @@ } } - hgroup { + .heading-group { left: 0px; padding: 0px 10px; position: absolute; diff --git a/lms/templates/courseware/course_about.html b/lms/templates/courseware/course_about.html index 26fc56afd2..b202543c5f 100644 --- a/lms/templates/courseware/course_about.html +++ b/lms/templates/courseware/course_about.html @@ -108,12 +108,12 @@ from openedx.core.lib.courses import course_image_url
-
+

${course.display_name_with_default_escaped} ${course.display_org_with_default | h}

-
+
%if user.is_authenticated() and registered: diff --git a/lms/templates/index.html b/lms/templates/index.html index 209df5dd11..9122a7551d 100644 --- a/lms/templates/index.html +++ b/lms/templates/index.html @@ -9,7 +9,7 @@ from django.core.urlresolvers import reverse
-
+
% if homepage_overlay_html: ${homepage_overlay_html} % else: @@ -18,7 +18,7 @@ from django.core.urlresolvers import reverse ## Translators: 'Open edX' is a brand, please keep this untranslated. See http://openedx.org for more information.

${_("It works! This is the default homepage for this Open edX instance.")}

% endif -
+
% if settings.FEATURES.get('ENABLE_COURSE_DISCOVERY'):
diff --git a/themes/stanford-style/lms/templates/index.html b/themes/stanford-style/lms/templates/index.html index 4c92e2055b..9b7d67c154 100644 --- a/themes/stanford-style/lms/templates/index.html +++ b/themes/stanford-style/lms/templates/index.html @@ -7,14 +7,14 @@ from django.utils.translation import ugettext as _
-
+
% if homepage_overlay_html: ${homepage_overlay_html} % else:

${_("Free courses from {university_name}").format(university_name="Stanford")}

${_("For anyone, anywhere, anytime")}

% endif -
+
% if settings.FEATURES.get('ENABLE_COURSE_DISCOVERY'):