From 2ca267dc521847646f4dae1c0d5fb09f4e6d1652 Mon Sep 17 00:00:00 2001
From: Brian Talbot <btalbot@edx.org>
Date: Wed, 23 Jan 2013 12:50:10 -0500
Subject: [PATCH 1/4] studio - resolved bug with .header CSS inheritance and
 problem editor menu UI

---
 common/lib/xmodule/xmodule/css/problem/edit.scss | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/common/lib/xmodule/xmodule/css/problem/edit.scss b/common/lib/xmodule/xmodule/css/problem/edit.scss
index eec36d4109..d612ff6c8e 100644
--- a/common/lib/xmodule/xmodule/css/problem/edit.scss
+++ b/common/lib/xmodule/xmodule/css/problem/edit.scss
@@ -110,6 +110,8 @@
 .problem-editor-icon.header {
   width: 18px;
   background-position: -265px 0;
+  border: none;
+  padding: 0;
 }
 
 .problem-editor-icon.multiple-choice {

From 5fee7eeaec0a3f3bf641a0275c05d176f71153f6 Mon Sep 17 00:00:00 2001
From: Brian Talbot <btalbot@edx.org>
Date: Wed, 23 Jan 2013 12:58:20 -0500
Subject: [PATCH 2/4] studio - further resolved bug with .header CSS
 inheritance and problem editor menu UI

---
 cms/templates/widgets/problem-edit.html          | 4 ++--
 common/lib/xmodule/xmodule/css/problem/edit.scss | 4 +---
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/cms/templates/widgets/problem-edit.html b/cms/templates/widgets/problem-edit.html
index 74d35cd646..3427d631dc 100644
--- a/cms/templates/widgets/problem-edit.html
+++ b/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
diff --git a/common/lib/xmodule/xmodule/css/problem/edit.scss b/common/lib/xmodule/xmodule/css/problem/edit.scss
index d612ff6c8e..be5455e901 100644
--- a/common/lib/xmodule/xmodule/css/problem/edit.scss
+++ b/common/lib/xmodule/xmodule/css/problem/edit.scss
@@ -107,11 +107,9 @@
   background: url(../img/problem-editor-icons.png) no-repeat;
 }
 
-.problem-editor-icon.header {
+.problem-editor-icon.heading1 {
   width: 18px;
   background-position: -265px 0;
-  border: none;
-  padding: 0;
 }
 
 .problem-editor-icon.multiple-choice {

From 0e061ca726d6ed5207562b7757e7fc9b1ff0fcd9 Mon Sep 17 00:00:00 2001
From: Brian Talbot <btalbot@edx.org>
Date: Wed, 23 Jan 2013 13:02:33 -0500
Subject: [PATCH 3/4] studio - syncing cheatsheet language with new class name
 for heading 1

---
 cms/templates/widgets/problem-edit.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cms/templates/widgets/problem-edit.html b/cms/templates/widgets/problem-edit.html
index 3427d631dc..2053d3eb95 100644
--- a/cms/templates/widgets/problem-edit.html
+++ b/cms/templates/widgets/problem-edit.html
@@ -34,7 +34,7 @@
     <article class="simple-editor-cheatsheet">
         <div class="cheatsheet-wrapper">
             <div class="row">
-                <h6>Header</h6>
+                <h6>Heading 1</h6>
                 <div class="col sample header">
                     <img src="/static/img/header-example.png" />
                 </div>

From 25df02fedd3591e110ef89114f506b674293767f Mon Sep 17 00:00:00 2001
From: Brian Talbot <btalbot@edx.org>
Date: Wed, 23 Jan 2013 13:04:16 -0500
Subject: [PATCH 4/4] studio - syncing cheatsheet language with new class name
 for heading 1 again

---
 cms/templates/widgets/problem-edit.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cms/templates/widgets/problem-edit.html b/cms/templates/widgets/problem-edit.html
index 2053d3eb95..4ff9d299ab 100644
--- a/cms/templates/widgets/problem-edit.html
+++ b/cms/templates/widgets/problem-edit.html
@@ -35,7 +35,7 @@
         <div class="cheatsheet-wrapper">
             <div class="row">
                 <h6>Heading 1</h6>
-                <div class="col sample header">
+                <div class="col sample heading-1">
                     <img src="/static/img/header-example.png" />
                 </div>
                 <div class="col">