Merge pull request #11565 from edx/clytwynec/ac-234

Remove hgroup usage

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 {

cms/templates/temp-course-landing.html

@@ -6,10 +6,10 @@
 <%block name="content">
 <div class="main-wrapper">
 	<article class="class-info">
-	<hgroup>
+	<div class="heading-group">
 		<h1>${_("Circuits and Electronics")}</h1>
 		<h2>${_("Massachusetts Institute of Technology")}</h2>
-	</hgroup>
+	</div>
 	<div class="log-in-form">
 		<form>
 			<div class="column">
@@ -37,4 +37,4 @@
 		</a>
 	</footer>
 </div>
-</%block>
\ No newline at end of file
+</%block>

common/static/css/vendor/normalize.css

@@ -15,7 +15,6 @@ figcaption,
 figure,
 footer,
 header,
-hgroup,
 main,
 nav,
 section,

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'
 

lms/static/sass/base/_reset.scss

 /* 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; }

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;

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;
         }
 

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);
@@ -86,7 +86,8 @@ $course-search-input-height: ($button-size);
           text-transform: none;
         }
 
-        h2 {
+        p {
+          @extend h2;
           margin-bottom: 0;
           text-transform: lowercase;
           font-style: italic;

lms/static/sass/shared/_course_object.scss

@@ -113,7 +113,7 @@
             }
           }
 
-          hgroup {
+          .heading-group {
             left: 0px;
             padding: 0px 10px;
             position: absolute;

lms/templates/courseware/course_about.html

@@ -109,12 +109,12 @@ from openedx.core.lib.courses import course_image_url
     <div class="intro-inner-wrapper">
       <div class="table">
       <section class="intro">
-        <hgroup>
+        <div class="heading-group">
           <h1>
             ${course.display_name_with_default_escaped}
             <a href="#">${course.display_org_with_default | h}</a>
           </h1>
-        </hgroup>
+        </div>
 
         <div class="main-cta">
         %if user.is_authenticated() and registered:

lms/templates/index.html

@@ -9,16 +9,16 @@ from django.core.urlresolvers import reverse
   <header>
     <div class="outer-wrapper">
       <div class="title">
-        <hgroup>
+        <div class="heading-group">
           % if homepage_overlay_html:
             ${homepage_overlay_html}
           % else:
               ## Translators: 'Open edX' is a brand, please keep this untranslated. See http://openedx.org for more information.
               <h1>${_("Welcome to Open edX!")}</h1>
               ## Translators: 'Open edX' is a brand, please keep this untranslated. See http://openedx.org for more information.
-              <h2>${_("It works! This is the default homepage for this Open edX instance.")}</h2>
+              <p>${_("It works! This is the default homepage for this Open edX instance.")}</p>
           % endif
-        </hgroup>
+        </div>
         % if settings.FEATURES.get('ENABLE_COURSE_DISCOVERY'):
           <div class="course-search">
             <form method="get" action="/courses">

themes/stanford-style/lms/templates/index.html

@@ -7,14 +7,14 @@ from django.utils.translation import ugettext as _
   <header>
     <div class="outer-wrapper">
       <div class="title">
-        <hgroup>
+        <div class="heading-group">
           % if homepage_overlay_html:
             ${homepage_overlay_html}
           % else:
             <h1>${_("Free courses from <strong>{university_name}</strong>").format(university_name="Stanford")}</h1>
-            <h2>${_("For anyone, anywhere, anytime")}</h2>
+            <p>${_("For anyone, anywhere, anytime")}</p>
           % endif
-        </hgroup>
+        </div>
         % if settings.FEATURES.get('ENABLE_COURSE_DISCOVERY'):
           <div class="course-search">
             <form method="get" action="/courses">