Merge pull request #1334 from MITx/bug/btalbot/cms-problemmenu

studio - resolved bug with .header CSS inheritance and problem editor

cms/templates/widgets/problem-edit.html

@@ -4,8 +4,8 @@
         %if markdown != '' or data == '<problem>\n</problem>\n':
         <div class="editor-bar">
             <ul class="format-buttons">
-                <li><a href="#" class="header-button" data-tooltip="Header"><span
-                        class="problem-editor-icon header"></span></a></li>
+                <li><a href="#" class="header-button" data-tooltip="Heading 1"><span
+                        class="problem-editor-icon heading1"></span></a></li>
                 <li><a href="#" class="multiple-choice-button" data-tooltip="Multiple Choice"><span
                         class="problem-editor-icon multiple-choice"></span></a></li>
                 <li><a href="#" class="checks-button" data-tooltip="Check Multiple"><span
@@ -34,8 +34,8 @@
     <article class="simple-editor-cheatsheet">
         <div class="cheatsheet-wrapper">
             <div class="row">
-                <h6>Header</h6>
-                <div class="col sample header">
+                <h6>Heading 1</h6>
+                <div class="col sample heading-1">
                     <img src="/static/img/header-example.png" />
                 </div>
                 <div class="col">

common/lib/xmodule/xmodule/css/problem/edit.scss

@@ -107,7 +107,7 @@
   background: url(../img/problem-editor-icons.png) no-repeat;
 }
 
-.problem-editor-icon.header {
+.problem-editor-icon.heading1 {
   width: 18px;
   background-position: -265px 0;
 }