Project

General

Profile

« Previous | Next » 

Revision 240a4ed8

Added by Andreas Kohlbecker almost 7 years ago

ref #6759 using new icon style of switch

View differences:

pom.xml
8 8
  <name>Vaadin Web Application</name>
9 9
  <properties>
10 10
    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
11
    <vaadin.version>7.7.9</vaadin.version>
11
    <vaadin.version>7.7.10</vaadin.version>
12 12
    <vaadin-spring.version>1.2.0</vaadin-spring.version>
13 13
    <vaadin.plugin.version>${vaadin.version}</vaadin.plugin.version>
14 14
    <cdmlib.version>4.8.0-SNAPSHOT</cdmlib.version>
......
421 421
      <version>${vaadin.version}</version> <scope>provided</scope> </dependency> -->
422 422
    <dependency>
423 423
      <groupId>com.vaadin</groupId>
424
      <artifactId>vaadin-client</artifactId>
424
      <artifactId>vaadin-client</artifactId> 
425 425
      <scope>test</scope>
426
      <exclusions>
427
        <exclusion>
428
            <groupId>javax.validation</groupId>
429
            <artifactId>validation-api</artifactId>
430
        </exclusion>
431
      </exclusions>
426 432
    </dependency>
427 433
    <!-- disabling push for the moment because it does not work with run-jetty-run 
428 434
      due to the fact that the latest (even nightly) version of run-jetty-run uses 
......
453 459
    <dependency>
454 460
       <groupId>org.vaadin.teemu</groupId>
455 461
       <artifactId>switch</artifactId>
456
       <version>3.0.0</version>
462
       <version>2.0.4-SNAPSHOT</version>
457 463
    </dependency>
458 464
    <dependency>
459 465
       <groupId>org.vaadin</groupId>
src/main/java/eu/etaxonomy/cdm/vaadin/AppWidgetSet.gwt.xml
33 33

  
34 34
    
35 35

  
36
    <inherits name="eu.etaxonomy.vaadin.ui.DevDayWidgetset" />
36
    
37 37

  
38 38
    
39 39

  
......
46 46
    
47 47

  
48 48
    
49

  
50
    <inherits name="eu.etaxonomy.vaadin.ui.DevDayWidgetset" />
49 51
</module>
src/main/java/eu/etaxonomy/cdm/vaadin/component/common/PersonField.java
8 8
*/
9 9
package eu.etaxonomy.cdm.vaadin.component.common;
10 10

  
11
import org.vaadin.teemu.switchui.Switch;
12

  
11 13
import com.vaadin.data.fieldgroup.BeanFieldGroup;
12 14
import com.vaadin.data.fieldgroup.FieldGroup;
13 15
import com.vaadin.ui.Component;
......
207 209
    protected void addDefaultStyles(){
208 210
        cacheField.addStyleName("cache-field");
209 211
        detailsContainer.addStyleName("details-fields");
212
        unlockSwitch.addStyleName(Switch.ICON_STYLE);
210 213
    }
211 214

  
212 215
    /**
src/main/java/eu/etaxonomy/vaadin/component/SwitchButton.java
21 21

  
22 22
    private ValueChangeListener valueSetListener = null;
23 23

  
24
    public SwitchButton() {
25
        super();
26
    }
27

  
24 28
    /**
25 29
     * {@inheritDoc}
26 30
     */
src/main/java/eu/etaxonomy/vaadin/component/SwitchableTextField.java
50 50

  
51 51
        addStyledComponent(textField);
52 52
        addStyledComponent(unlockSwitch);
53
        addDefaultStyles();
53 54
    }
54 55

  
55 56
    /**
......
100 101
     */
101 102
    @Override
102 103
    protected void addDefaultStyles() {
103
        // no default styles
104

  
104
        unlockSwitch.addStyleName(Switch.ICON_STYLE);
105 105
    }
106 106

  
107 107
    /**
src/main/webapp/VAADIN/themes/edit-valo/custom-fields.scss
88 88
  // ------------ v-switchable-textfield ------------ //
89 89
  .v-switchable-textfield {
90 90
    @include icon-button-field('v-textfield', 'v-switch', 1, 'right');
91
    .v-switch-icon{
92
        height: 1.3em; // TODO fix in addon
93
        font-size: $v-unit-size; // 40px
94
        width: 54px;
95
        top: 10px;
96
    }
91 97
  }
92 98
  
93 99
  // ------------ v-person-field ------------ //

Also available in: Unified diff