Changeset 354 for Dev/branches/rest-dojo-ui/client/rft/css

Timestamp:

07/09/12 19:24:56 (13 years ago)

Author:

tjcschipper

Message:

• Made change to _Page.js to destroy the page's child widgets on page leave. This was causing widgets with identical names (such as "btnSave") to make regsitry throw a duplicate widget error.
• survey.js/html now sorts loaded questions into categories and topics and creates or adds them to the proper TabPane/Selectors?. TODO: Allow for spaces in category titles.
• Added "addQuestion()" method to Selector.js, to internalize question visualization logic.
• Included surveyAdvanced page in run.js
• Changes index to use proper button format, still need to figure out a way to bind content.goTo to the onclick field (since there is no index.js script being run!)
• Various css tweaks.

Location:

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

Files:

• layout.css (modified) (3 diffs)
• main.css (modified) (1 diff)

Dev/branches/rest-dojo-ui/client/rft/css/layout.css

@@ -281 +281 @@
     /* Nothing yet, put preview window styling options here after we've decided on a format to follow! */
 }
-
 .claro .dijitAccordionContainer {
     /* No styling for now, use this for margins and other layout-related business. This class does not affect the look of the AccordionContainer currently! */
@@ -339 +338 @@
 }
 
-
-/* THIS IS AN EXPERIMENT !
- * This will allow to set one top colour, then all the "objectBgColor" or "objectHlColor" objects below it will inherit that colour, and apply it to the relevant CSS property.
- * Not applying these classes to an object will make it bypass the background settings.
-*/ 
-
-.claro div.blue.objectBgColor,
-.claro .blue .objectBgColor {
-    background-color: #0072bc;
-}
-.claro div.lblue.objectBgColor,
-.claro .lblue .objectBgColor {
+/* Experimental background colour inheritance */
+.claro div.blue.inheritBgColor,
+.claro .blue .inheritBgColor,
+.claro.blue .inheritBgColor {
+    background-color: #0072bc;
+}
+.claro div.green.inheritBgColor,
+.claro .green .inheritBgColor,
+.claro.green .inheritBgColor {
+    background-color: #3aa605;
+}
+.claro div.orange.inheritBgColor,
+.claro .orange .inheritBgColor,
+.claro.orange .inheritBgColor {
+    background-color: #ff5b12;
+}
+.claro div.purple.inheritBgColor,
+.claro .purple .inheritBgColor,
+.claro.purple .inheritBgColor {
+    background-color: #6529b7;
+}
+.claro div.red.inheritBgColor,
+.claro .red .inheritBgColor,
+.claro.red .inheritBgColor {
+    background-color: #8c0310;
+}
+.claro div.trans.inheritBgColor,
+.claro .trans .inheritBgColor,
+.claro.trans .inheritBgColor {
+    background-color: transparent;
+}
+.claro div.blue.inheritBgColor.light,
+.claro .blue .inheritBgColor.light,
+.claro.blue .inheritBgColor.light {
     background-color: #0794d1;
 }
-.claro div.orange.objectBgColor,
-.claro .orange .objectBgColor {
-    background-color: #ff5b12;
-}
-.claro div.lorange.objectBgColor,
-.claro .lorange .objectBgColor {
+.claro div.green.inheritBgColor.light,
+.claro .green .inheritBgColor.light,
+.claro.green .inheritBgColor.light {
+    background-color: #79ca0a;
+}
+.claro div.orange.inheritBgColor.light,
+.claro .orange .inheritBgColor.light,
+.claro.orange .inheritBgColor.light {
     background-color: #ff9140;
 }
-.claro div.green.objectBgColor,
-.claro .green .objectBgColor {
-    background-color: #3aa605;
-}
-.claro div.lgreen.objectBgColor,
-.claro .lgreen .objectBgColor {
-    background-color: #79ca0a;
-}
-.claro div.purple.objectBgColor,
-.claro .purple .objectBgColor {
-    background-color: #6529b7;
-}
-.claro div.lpurple.objectBgColor,
-.claro .lpurple .objectBgColor {
+.claro div.purple.inheritBgColor.light,
+.claro .purple .inheritBgColor.light,
+.claro.purple .inheritBgColor.light {
     background-color: #993dec;
 }
-.claro div.red.objectBgColor,
-.claro .red .objectBgColor {
-    background-color: #8c0310;
-}
-.claro div.lred.objectBgColor,
-.claro .lred .objectBgColor {
+.claro div.red.inheritBgColor.light,
+.claro .red .inheritBgColor.light,
+.claro.red .inheritBgColor.light {
     background-color: #bd0013;
 }
-/* TODO: Apply these classes to display elements that need to inherit the interface's object colour!
-    Remove/disable other references to these colours from files like rftButtons, rftLineWithButtons, etc to make sure it works properly.
-    Put these settings in a separate "colours.css" file to separate the concern of styling these objects from other layout-oriented properties.
-    When we add things like highlightColours, borders, etc, the list could become quite long, especially if more colours are added to the colour scheme in time.
- */
-
-
-
-
-
- /* Dropdown menu on MenuBar*/
+
+/*TODO: Apply these classes to display elements that need to inherit the interface's object colour!
+Remove/disable other references to these colours from files like rftButtons, rftLineWithButtons, etc to make sure it works properly.
+Put these settings in a separate "colours.css" file to separate the concern of styling these objects from other layout-oriented properties.
+When we add things like highlightColours, borders, etc, the list could become quite long, especially if more colours are added to the colour scheme in time.
+
+
+Dropdown menu on MenuBar*/
 .claro .dijitMenuPopup {
 
 }
 .claro .dijitMenuPopup .dijitMenu {
-border: none;
-background-color: #333333;
-background-image: none;
-color: #999999;   
+    border: none;
+    background-color: #333333;
+    background-image: none;
+    color: #999999;   
 }
 .claro .dijitMenuPopup .dijitMenu .dijitMenuItem {
@@ -445 +451 @@
     background-image: url('images/icons/rftIcons16b.png');
 }
+
+
+
+
+/* Alignment */
+.claro .floatRight {
+    float: right;
+    margin: 0;
+    padding: 0;
+}

Dev/branches/rest-dojo-ui/client/rft/css/main.css

@@ -10 +10 @@
 @import url('rftObjectBox.css');
 @import url('sessionEditor.css');
+@import url('surveyEditor.css');