Changeset c0f52b82 in vaadin


Ignore:
Timestamp:
03/16/12 14:42:18 (14 months ago)
Author:
Leif Åstrand <leif@…>
Branches:
master, 7.0, f8c4f9916526a6ffae4b5fc67b601cd36ca064be
Children:
aaf1ea22c
Parents:
ce24fb4f
git-author:
Leif Åstrand <leif@…> (03/16/12 14:41:17)
git-committer:
Leif Åstrand <leif@…> (03/16/12 14:42:18)
Message:

Only prevent margin collapse if embedded

Files:
3 edited

Legend:

Unmodified
Added
Removed

  • WebContent/VAADIN/themes/base/common/common.css

    r9347946b rc0f52b82  
    3333        /* avoid scrollbars with margins in root layout */ 
    3434        outline: none; 
     35        position: relative; 
     36} 
     37/* Prevent margin collapse */ 
     38.v-view.v-view-embedded { 
    3539        margin-top: -1px; 
    3640        border-top: 1px solid transparent; 
    37         position: relative; 
    38         box-sizing: border-box; 
    39         -moz-box-sizing: border-box; 
    4041} 
    4142/** 

  • src/com/vaadin/terminal/gwt/client/ui/RootConnector.java

    r0446f083 rc0f52b82  
    6464                styles += style + " "; 
    6565            } 
     66        } 
     67        if (!client.getConfiguration().isStandalone()) { 
     68            styles += getWidget().getStylePrimaryName() + "-embedded"; 
    6669        } 
    6770        getWidget().setStyleName(styles.trim()); 

  • tests/testbench/com/vaadin/tests/components/embedded/EmbeddedClickListenerRelativeCoordinates.html

    rc4b62e47 rc0f52b82  
    1818</tr> 
    1919<tr> 
    20         <td>waitForVaadin</td> 
    21         <td></td> 
    22         <td></td> 
    23 </tr> 
    24 <tr> 
    2520        <td>mouseClick</td> 
    2621        <td>vaadin=runcomvaadintestscomponentsembeddedEmbeddedClickListenerRelativeCoordinates::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VEmbedded[0]/domChild[0]</td> 
    … …  
    2823</tr> 
    2924<tr> 
    30         <td>waitForVaadin</td> 
    31         <td></td> 
    32         <td></td> 
    33 </tr> 
    34 <tr> 
    35         <td>screenCapture</td> 
    36         <td></td> 
    37         <td>click-41-22</td> 
    38 </tr> 
    39 <!-- Should really be 41,22 but due to v-view border-top it is not always... <tr> 
    4025        <td>assertText</td> 
    4126        <td>vaadin=runcomvaadintestscomponentsembeddedEmbeddedClickListenerRelativeCoordinates::Root/VNotification[0]/HTML[0]/domChild[0]</td> 
    4227        <td>41, 22</td> 
    43 </tr>--> 
     28</tr> 
    4429<tr> 
    4530        <td>mouseClick</td> 
    … …  
    4833</tr> 
    4934<tr> 
    50         <td>waitForVaadin</td> 
    51         <td></td> 
     35        <td>waitForElementNotPresent</td> 
     36        <td>vaadin=runcomvaadintestscomponentsembeddedEmbeddedClickListenerRelativeCoordinates::Root/VNotification[0]/HTML[0]/domChild[0]</td> 
    5237        <td></td> 
    5338</tr> 
    … …  
    5843</tr> 
    5944<tr> 
    60         <td>waitForVaadin</td> 
    61         <td></td> 
    62         <td></td> 
    63 </tr> 
    64 <!-- Should really be 0,0 but due to v-view border-top it is not always... <tr> 
    6545        <td>assertText</td> 
    6646        <td>vaadin=runcomvaadintestscomponentsembeddedEmbeddedClickListenerRelativeCoordinates::Root/VNotification[0]/HTML[0]/domChild[0]</td> 
    6747        <td>0, 0</td> 
    68 </tr>--> 
    69 <tr> 
    70         <td>screenCapture</td> 
    71         <td></td> 
    72         <td>click-0-0</td> 
    7348</tr> 
    7449</tbody></table> 
Note: See TracChangeset for help on using the changeset viewer.