Ignore:
Timestamp:
05/30/12 16:39:27 (13 years ago)
Author:
tjcschipper
Message:
  • Removed rft/ui/*Button classes, since they are not actually needed. All buttons use standard dijit.form.Button again.

(baseClass: 'rft*Button', color: 'lowercase *, iconClass: 'rftIcon rftIcon*')

  • Changed CSS color classes to be shorter and more organized. No more highlightRed, now just red.
  • Moved extra .css files from client/dojotoolkit/dijit/themes/gamelab folder to client/rft/css folder, so they are actually included. Same for icons. Gamelab theme now contains only original Claro theme with renamed base class. Part of an effort to make the gamelab style work with standard inclusions of Dojo toolkit. (Override instead of change!)
  • Changed rft/ui/LineWithActionsWidgetThijs.js to use the new Button format.
  • Changed rft/ui/LineWithActionsWidgetThijs.js and rft/ui/SelectorThijs.js to use a new way to add Actions to the LineWithActions?. Instead of {"action": function(){}}, you now pass {"action": {callback: function(){}, properties: {props}}}.

The properties object is used as a mixin during creation of the Buttons, so you can directly set properties on the resulting buttons here. Most important one: action.properties.blockButton (boolean), that determines whether the Button should be a blockButton or inlineButton.

Location:
Dev/branches/rest-dojo-ui/client/rft/css
Files:
12 added
1 edited

Legend:

Unmodified
Added
Removed

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

    r319 r335  
    1 *:focus {
    2     outline: none;
    3 }
     1@import url('layout.css');
     2@import url('general.css');
    43
    5 html,body {
    6     width: 100%;
    7     height: 100%;
    8     font-size: .813em;
    9     background-color: #333333;
    10 }
    11 
    12 .gamelab {
    13     font-family: 'Segoe UI', Verdana, Arial, Helvetica, sans-serif;
    14     color: #ffffff;
    15 }
    16 
    17 /* Headings */
    18 .gamelab h1 {
    19     font-size: 3em;
    20     margin-bottom: 0.727em;
    21     font-weight: normal !important;
    22 }
    23 .gamelab h2 {
    24     font-size: 1.375em;
    25     line-height: 1.5em;
    26     margin-top: 1em;
    27     margin-bottom: 0.60em;
    28     font-weight: normal;
    29 }
    30 .gamelab h3,
    31 .gamelab h4,
    32 .gamelab h5,
    33 .gamelab h6 {
    34     font-size: 1.125em;
    35     font-weight: normal;
    36 }
    37 
    38 .mainLogo {
    39     float: left;
    40     height: 50px;
    41     font-size: 50px;
    42     width: auto;
    43     -webkit-margin: 5px 20px 5px 20px !important;
    44     padding: 0 !important;
    45     line-height: 50px;
    46     color: #999999;
    47 }
    48 
    49 .gamelab .dijitMenuBar.mainMenu {
    50     width: auto;
    51     float: right;
    52     margin: 10px 50px 10px 20px;
    53 }
    54 
    55 .breadcrumbs {
    56     float: left;
    57     clear: left;
    58     width: 100%;
    59     text-align: center;
    60 }
    61 
    62 .breadcrumb {
    63     color: #999999;
    64     font-size: 13px;
    65 }
    66 
    67 .breadcrumbCurrent {
    68     color: #ffffff;
    69     font-size: 14px;
    70 }
    71 
    72 .menuItem {
    73     margin: 0px 5px 0px 5px;
    74 }
    75 
    76 .content {
    77     width: 100%;
    78     display: block;
    79     clear: both;
    80     background-color: #555555;
    81 }
    82 
    83 .loginLabel {
    84     float: left;
    85     clear: left;
    86     width: 100px;
    87 }
    88 
    89 .loginInput {
    90     float: left;
    91     clear: right;
    92     width: 150px;
    93 }
    94 
    95 .rftMultipleChoiceWidget {
    96     display: table;
    97 }
    98 
    99 .rftMultipleChoiceWidget .row {
    100     display: table-row;
    101 }
    102 
    103 .rftMultipleChoiceWidget .rowBox {
    104     display: table-cell;
    105 }
    106 
    107 .rftMultipleChoiceWidget .rowText {
    108     display: table-cell;
    109     width: 100px;
    110 }
    111 
    112 .rftMultipleChoiceWidget .rowBtn {
    113     display: table-cell;
    114     width: 30px;
    115 }
    116 
    117 /* Basic layout */
    118 .gamelab .header {
    119     background-color: #333333;
    120     height: 80px;
    121     font-size: 16px;
    122 }
    123 
    124 .title {
    125     height: 24px;
    126     padding: 4px 0;
    127     margin: 4px;
    128 }
    129 
    130 .title .titleIcon {
    131     float: left;
    132     width: 32px;
    133     height: 32px;
    134     clear: none;
    135     margin-right: 8px;
    136     margin-top: -4px;
    137     margin-bottom: -4px;
    138 }
    139 
    140 .title .titleText {
    141     float: left;
    142     line-height: 24px;
    143     font-size: 24px;
    144     margin: 0;
    145 }
    146 
    147 .verticalTabList {
    148     width: 190px;
    149 }
     4@import url('rftButtons.css');
     5@import url('rftIcons.css');
     6@import url('rftSelector.css');
Note: See TracChangeset for help on using the changeset viewer.