Changeset 13427

Show
Ignore:
Timestamp:
04/27/08 21:21:22 (7 months ago)
Author:
bill
Message:

Adjust size and vertical alignment of buttons and textbox-based widget to match each other and native controls. Actually, to really get them to match would need to add padding to the TextBox? based controls, which is difficult because it requires adjustments to the validation icon and drop down arrow (or multiple arrows, in the case of spinner), but this checkin gets things pretty close. Fixes #6572.

Location:
dijit/trunk
Files:
5 modified

Legend:

Unmodified
Added
Removed

  • dijit/trunk/tests/layout/doc0.html

    r9432 r13427  
    22This document has <a href="http://www.dojotoolkit.org/">a link</a>.<br /> 
    33(to check we're copying children around properly).<br /> 
    4 Also it's got a widget, a combo box:<br> 
     4Plus some widgets and native fields:<br /> 
     5<input value="native input"> 
    56<select dojoType="dijit.form.ComboBox"> 
    6         <option value="1">foo</option> 
    7         <option value="2">bar</option> 
    8         <option value="3">baz</option> 
     7        <option value="1">dijit</option> 
     8        <option value="2">form</option> 
     9        <option value="3">ComboBox</option> 
    910</select> 
    10 And a button too: 
    11 <button dojoType="dijit.form.Button">hello!</button> 
     11<button>native button</button> 
     12<button dojoType="dijit.form.Button">dijit.Button</button><br> 
     13 
    1214Here's some text that comes AFTER the button. 

  • dijit/trunk/themes/dijit.css

    r13425 r13427  
    3636        padding:0; 
    3737        vertical-align:middle; 
     38        #vertical-align: auto;  /* makes TextBox,Button line up w/native counterparts on IE6 */ 
    3839} 
    3940 
    … …  
    266267        border:1px solid gray; 
    267268        margin:0; 
    268         padding:.2em .2em .1em; 
    269269        line-height:normal; 
    270270        cursor:pointer; 
    271         vertical-align:middle;   
     271        vertical-align: middle; 
     272        #vertical-align: auto; 
    272273        text-align:center; 
    273274        white-space: nowrap; 
    … …  
    346347        #overflow: hidden; /* #6027, #6067 */ 
    347348        width: 15em;    /* need to set default size on outer node since inner nodes say <input style="width:100%"> and <td width=100%>.  user can override */ 
     349        vertical-align: middle; 
     350        #vertical-align: auto;   
    348351} 
    349352 
    … …  
    369372.dijitComboBox INPUT, 
    370373.dijitSpinner INPUT { 
    371         padding:0; 
    372374        border-left: solid black 1px;   /* TODO: for RTL mode should be border-right */ 
    373375        display:inline; 

  • dijit/trunk/themes/nihilo/form/Button.css

    r13359 r13427  
    1313        border-bottom:1px solid #dedede; 
    1414        border-right:1px solid #dedede; 
    15         padding: 0.2em; 
     15        padding: 0px 0.2em; 
    1616        background:#fff url("../images/buttonEnabled.png") repeat-x top left; 
    1717} 

  • dijit/trunk/themes/soria/form/Button.css

    r13359 r13427  
    1313        border-bottom:1px solid #657c9c; 
    1414        border-right:1px solid #657c9c; 
    15         padding: 0.2em; 
     15        padding: 0px 0.2em; 
    1616        background:#bcd5f0 url("../images/buttonEnabled.png") repeat-x top left; 
    1717} 

  • dijit/trunk/themes/tundra/form/Button.css

    r13359 r13427  
    1313        border-bottom:1px solid #9b9b9b; 
    1414        border-right:1px solid #9b9b9b; 
    15         padding: 0.2em; 
     15        padding: 0px 0.2em; 
    1616        background:#fff url("../images/buttonEnabled.png") repeat-x bottom left; 
    1717}