Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
studio - resolved bug with .header CSS inheritance and problem editor
This commit is contained in:
Christina Roberts
2013-01-23 11:40:24 -08:00
parent 6a4c6ad4d8 25df02fedd
commit cd78b27b50
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
cms/templates/widgets/problem-edit.html
View File

@@ -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">

2
common/lib/xmodule/xmodule/css/problem/edit.scss
View File

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