Ignore:
Timestamp:
06/04/12 18:09:33 (13 years ago)
Author:
tjcschipper
Message:
  • Switched away from using custom themes, this allows us to use the default Claro theme off of a CDN, then override the needed properties using our own, much smaller stylesheets. Retains graceful degradation of dijit style.
  • Made rftLineWithActions also work outside of the context of an rftSelector.css
  • Fixed some general layout issues
  • Redid the tabs styling
File:
1 edited

Legend:

Unmodified
Added
Removed

  • Dev/branches/rest-dojo-ui/client/mockup.html

    r338 r339  
    4848            });
    4949        </script>
    50 
    5150    </head>
    52     <body class="dijitReset gamelab">
     51    <body class="dijitReset claro">
    5352        <div class="page" data-dojo-type="dijit.layout.ContentPane" data-dojo-props="region:'center'">
     53            <!-- Top menu bar -->
    5454            <div class="topbar" data-dojo-type="dijit.layout.ContentPane" data-dojo-props="region:'top'">
    5555                <h1>ResearchTool</h1>
    56                 <!-- And now the menu! -->
    5756                <div data-dojo-type="dijit.MenuBar">
    5857                    <div data-dojo-type="dijit.MenuBarItem" class="rftMainMenuButton">Sessions</div>
    … …  
    6766                </div>
    6867            </div>
    69 
     68            <!-- Main content window -->
    7069            <div class="content" data-dojo-type="dijit.layout.ContentPane" data-dojo-props="region:'center'">
    7170                <div data-dojo-type="dijit.layout.BorderContainer" data-dojo-props="region:'center'" style="height: 500px;">
    … …  
    8079                            Presets
    8180                        </div>
    82                         <div data-dojo-type="dijit.layout.TabContainer" data-dojo-props="tabPosition:'left-h',region:'center'">
     81                        <div data-dojo-type="dijit.layout.TabContainer" class="blue" data-dojo-props="tabPosition:'left-h',region:'center'">
    8382                            <div data-dojo-type="dijit.layout.ContentPane" title="Category One">
    8483                                <div data-dojo-type="rft.ui.SelectorThijs" data-dojo-props="Title:'Subcat one'"></div>
    … …  
    110109                        </div>
    111110                    </div>
     111                    <!-- "Shopping cart" -->
    112112                    <div data-dojo-type="dijit.layout.BorderContainer" data-dojo-props="region:'right'" style="width: 300px">
    113113                        <div data-dojo-type="rft.ui.List" data-dojo-props="region:'center'">
    114                             <div data-dojo-type="rft.ui.LineWithActionsWidgetThijs" data-dojo-props="title:'Question one', actions: {'Cancel':{callback: function(){}, properties: {blockButton: false, class:'black'}}}"></div>
    115                             <div data-dojo-type="rft.ui.LineWithActionsWidgetThijs" data-dojo-props="title:'Question two', actions: {'Cancel':{callback: function(){}, properties: {blockButton: false, class:'black'}}}"></div>
     114                            <!-- These would have to be dynamically generated instead of declared here! -->
     115                            <div data-dojo-type="rft.ui.LineWithActionsWidgetThijs" data-dojo-props="title:'Question one', actions: {'Cancel':{callback: function(){}, properties: {blockButton: false, modifiers:'white'}}}"></div>
     116                            <div data-dojo-type="rft.ui.LineWithActionsWidgetThijs" data-dojo-props="title:'Question two', actions: {'Cancel':{callback: function(){}, properties: {blockButton: false, modifiers:'white'}}}"></div>
    116117                        </div>
    117118                    </div>
Note: See TracChangeset for help on using the changeset viewer.