Changeset 397 for Dev/branches/rest-dojo-ui/client/rft/ui

Timestamp:

08/09/12 17:47:56 (13 years ago)

Author:

tjcschipper

Message:

• Fixed problem with QuestionEditorPreviewItem? colour inheriting not working, due to old CSS rules overwriting new colour system
• Added "trans" colour class for BlockButtons?.

  Also works on other elements, just won't do anything in particular since they are transparent by default. Would be best not to use it on anything that is already transparent by default, since it would break the colour inheritance chain unneccesarily. ("Div.orange.bg > div.trans.bg > div.inheritBgColor" would not show up orange. A possible workaround for this is to not be able to inherit "trans" colour. Whether this is needed is debatable.)
  

Location:

Dev/branches/rest-dojo-ui/client/rft/ui/templates

Files:

• QuestionEditorPreviewItem.html (modified) (1 diff)
• QuestionEditorToolkit.html (modified) (1 diff)

Dev/branches/rest-dojo-ui/client/rft/ui/templates/QuestionEditorPreviewItem.html

@@ -1 +1 @@
 <div>
-        <div class="topBorder inheritBgColor dojoDndHandle">
+        <div class="topBorder inheritBgColor bg dojoDndHandle">
                 <span class="title" data-dojo-attach-point="titleNode">Default title</span>
                 <span class="floatRight" data-dojo-attach-point="buttonsNode">
-                        <button class="trans" data-dojo-type="dijit.form.Button" data-dojo-attach-point="editButtonNode" data-dojo-props="baseClass: 'rftBlockButton', iconClass: 'rftIcon rftIconEdit'">Edit</button>
-                        <button class="trans" data-dojo-type="dijit.form.Button" data-dojo-attach-point="foldButtonNode" data-dojo-props="baseClass: 'rftBlockButton', showLabel: false, iconClass: 'rftIcon rftIconHalfArrowUp'">Fold</button>
-                        <button class="trans" data-dojo-type="dijit.form.Button" data-dojo-attach-point="removeButtonNode" data-dojo-props="baseClass: 'rftBlockButton', showLabel: false, iconClass: 'rftIcon rftIconDelete'">Remove</button>
+                        <button class="trans bg inheritBgColor" data-dojo-type="dijit.form.Button" data-dojo-attach-point="editButtonNode" data-dojo-props="baseClass: 'rftBlockButton', iconClass: 'rftIcon rftIconEdit'">Edit</button>
+                        <button class="trans bg inheritBgColor" data-dojo-type="dijit.form.Button" data-dojo-attach-point="foldButtonNode" data-dojo-props="baseClass: 'rftBlockButton', showLabel: false, iconClass: 'rftIcon rftIconHalfArrowUp'">Fold</button>
+                        <button class="trans bg inheritBgColor" data-dojo-type="dijit.form.Button" data-dojo-attach-point="removeButtonNode" data-dojo-props="baseClass: 'rftBlockButton', showLabel: false, iconClass: 'rftIcon rftIconDelete'">Remove</button>
                 </span>
         </div>

Dev/branches/rest-dojo-ui/client/rft/ui/templates/QuestionEditorToolkit.html

@@ -9 +9 @@
                                         <div data-dojo-attach-point="listNode" class="rftLineListView"></div> 
                                         <div data-dojo-attach-point="categoriesBoxNode"></div>
-                                        <button class="inheritBgColor light" data-dojo-type="dijit.form.Button" data-dojo-attach-event="onClick:onCategoryAdd" data-dojo-props="baseClass:'rftBlockButton', iconClass: 'rftIcon rftIconPlus'">Add</button><br>
+                                        <button class="inheritBgColor" data-dojo-type="dijit.form.Button" data-dojo-attach-event="onClick:onCategoryAdd" data-dojo-props="baseClass:'rftBlockButton', iconClass: 'rftIcon rftIconPlus'">Add</button><br>
                                         <label>Topic:</label>
                                         <div data-dojo-attach-point="topicBoxNode"></div>