Changeset 397


Ignore:
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
Files:
5 edited

Legend:

Unmodified
Added
Removed

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

    r396 r397  
    385385    -webkit-transition: all 0.2s;
    386386}
    387 
    388387.claro .blue .inheritBgColor {
    389388    background-color: #0072bc;
    … …  
    419418.claro .red.light .inheritBgColor,
    420419.claro .red .light.inheritBgColor {
    421    background-color: #bd0013;
    422    color: #ffffff;   
     420 background-color: #bd0013;
     421 color: #ffffff;   
    423422}
    424423.claro .purple .inheritBgColor {
    … …  
    439438    color: #ffffff;
    440439}
    441 .claro .trans .inheritBgColor {
     440.claro .trans .inheritBgColor,
     441.claro .trans.bg {
    442442    background: transparent;
    443443    color: #ffffff;
    … …  
    498498}
    499499
    500 /*Dropdown menu on MenuBar */
     500/*************************************/
     501/*  Dropdown menu on MenuBar
     502/*************************************/
    501503.claro .dijitMenuPopup {
    502504

  • Dev/branches/rest-dojo-ui/client/rft/css/rftButtons.css

    r396 r397  
    1 /*LargeButton*/
     1/****************************************************
     2/*  LargeButton
     3/***************************************************/
    24.claro .rftLargeButton,
    35.claro .rftLargeButton * {
    … …  
    137139    background-color: #993dec;
    138140}
     141.claro span.trans.bg.rftBlockButtonHover,
     142.claro .trans .inheritBgColor.rftBlockButtonHover {
     143    background-color: #ffffff;
     144}
     145.claro span.trans.bg.rftBlockButtonHover .dijitButtonNode,
     146.claro .trans .inheritBgColor.rftBlockButtonHover .dijitButtonNode {
     147    color: #000000;
     148}
    139149/*Light*/
    140150.claro span.blue.light.bg.rftBlockButtonHover .dijitButtonNode,
    … …  
    261271}
    262272
    263 /* MainMenuButton */
     273/****************************************************
     274/*  MainMenuButton
     275/***************************************************/
    264276.claro .dijitMenuBar .rftMainMenuButton {
    265277    border: none;
    … …  
    301313}
    302314
    303 /* IndexMenuButton */
     315/****************************************************
     316/*  IndexMenuButton
     317/***************************************************/
    304318.claro .rftIndexMenuButton {
    305319    display: block;

  • Dev/branches/rest-dojo-ui/client/rft/css/surveyEditor.css

    r395 r397  
    3939        border-color: #ff5b12;
    4040}
    41 
    4241.claro div.blue .surveyEditorPreviewItemContent {
    4342        border-color: #0794d1;
    4443}
    4544
    46 .claro div.orange .surveyEditorPreviewItem.dojoDndItemAnchor .inheritBgColor {
    47         background-color: #FF9140;
     45.claro div.blue.dojoDndItemAnchor .topBorder,
     46.claro .blue .dojoDndItemAnchor .topBorder {
     47        background-color: #0794d1;
    4848}
    49 .claro div.blue .surveyEditorPreviewItem.dojoDndItemAnchor .inheritBgColor {
    50         background-color: #0794D1;
     49.claro div.orange.dojoDndItemAnchor .topBorder,
     50.claro .orange .dojoDndItemAnchor .topBorder {
     51        background-color: #ff9140;
    5152}
    52 .claro div.green .surveyEditorPreviewItem.dojoDndItemAnchor .inheritBgColor {
    53         background-color: #79CA0A;
     53.claro div.green.dojoDndItemAnchor .topBorder,
     54.claro .green .dojoDndItemAnchor .topBorder {
     55        background-color: #79ca0a;
    5456}
    55 .claro div.red .surveyEditorPreviewItem.dojoDndItemAnchor .inheritBgColor {
    56         background-color: #BD0013;
     57.claro div.red.dojoDndItemAnchor .topBorder,
     58.claro .red .dojoDndItemAnchor .topBorder {
     59        background-color: #bd0013;
    5760}
    58 .claro div.purple .surveyEditorPreviewItem.dojoDndItemAnchor .inheritBgColor {
    59         background-color: #993DEC;
     61.claro div.purple.dojoDndItemAnchor .topBorder,
     62.claro .purple .dojoDndItemAnchor .topBorder {
     63        background-color: #993dec;
    6064}

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

    r395 r397  
    11<div>
    2         <div class="topBorder inheritBgColor dojoDndHandle">
     2        <div class="topBorder inheritBgColor bg dojoDndHandle">
    33                <span class="title" data-dojo-attach-point="titleNode">Default title</span>
    44                <span class="floatRight" data-dojo-attach-point="buttonsNode">
    5                         <button class="trans" data-dojo-type="dijit.form.Button" data-dojo-attach-point="editButtonNode" data-dojo-props="baseClass: 'rftBlockButton', iconClass: 'rftIcon rftIconEdit'">Edit</button>
    6                         <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>
    7                         <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>
     5                        <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>
     6                        <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>
     7                        <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>
    88                </span>
    99        </div>

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

    r395 r397  
    99                                        <div data-dojo-attach-point="listNode" class="rftLineListView"></div>
    1010                                        <div data-dojo-attach-point="categoriesBoxNode"></div>
    11                                         <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>
     11                                        <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>
    1212                                        <label>Topic:</label>
    1313                                        <div data-dojo-attach-point="topicBoxNode"></div>
Note: See TracChangeset for help on using the changeset viewer.