Project

General

Profile

Revision 65ac8231

ID65ac82311c5e2962d1806e2f3cd694ea07d360bc
Parent 05ce2673
Child 9d1473c1

Added by Andreas Kohlbecker about 3 years ago

fix #6759 using valo theme support included into the addon

View differences:

src/main/java/eu/etaxonomy/cdm/vaadin/AppWidgetSet.gwt.xml
31 31

  
32 32
    <inherits name="org.vaadin.peter.contextmenu.ContextmenuWidgetset" />
33 33

  
34
    
35

  
36
    
37

  
38
    
39

  
40
    
41

  
42
    
43

  
44
    
45

  
46
    
47

  
48
    
49

  
50 34
    <inherits name="eu.etaxonomy.vaadin.ui.DevDayWidgetset" />
51 35

  
52 36
    <inherits name="org.vaadin.teemu.switchui.SwitchComponentWidgetset" />
src/main/webapp/VAADIN/themes/edit-valo/custom-fields.scss
56 56
    @include icon-button-field-button($button-style-name, $button-count, $button-alignment, $button-width);
57 57
}
58 58

  
59

  
59 60
// ===================== Styles ===================== //
60 61

  
61 62
body .edit-valo { // increasing specifity to allow overriding the valo default field themes
......
164 165
        .wrapper{
165 166
          @include composite-field-wrapper;
166 167
        }
167
    }
168
    
169
    // Switch 
170
    
171
    $widget-height: round($v-unit-size / 2);
172
    $widget-width: $v-unit-size;
173
    $widget-border-width: 1px; // must match the value as set in $v-border
174
    $widget-border-radius: round($widget-height / 2);
175
    
176
    $knob-border-width: 1px; // must match the value as set in $v-border
177
    $slider-height: $widget-height - 2 * $widget-border-width;
178
    $knob-inner-height: $slider-height - 2 * $knob-border-width;
179
    
180
    $knob-border-width: 1px; // must match the value as set in $v-border
181
    $slider-width: round($widget-width - 2 * $widget-border-width - $slider-height / 2) * 2;
182
    $knob-border-radius: round($knob-height / 2);
183
    $knob-left: round(($slider-width - $slider-height) / 2);
184
    
185
    .v-switch-dom {
186
        height: $widget-height;
187
        width: $widget-width;
188
        border: valo-border($border: $v-border, $color: $v-background-color, $strength: 0.7);
189
        border-radius: $v-border-radius;
190
        @include box-shadow(valo-bevel-and-shadow($bevel: $v-bevel, $shadow: $v-shadow, $background-color: $v-background-color, $gradient: $v-gradient));
191
        
192
        .v-switch-slider {
193
            height: $slider-height; 
194
            width: $slider-width;
195
            background: none;
196
        }
197
        
198
        .v-switch-on-plate, .v-switch-off-plate {
199
            position: absolute;
200
            top: 0px;
201
            left: 0px;
202
            height: inherit;
203
            width: round($slider-width / 2);
204
            background-color: $v-focus-color;
205
        }
206
        
207
        .v-switch-off-plate {
208
            left: round($slider-width / 2);
209
            background-color: $v-textfield-background-color;
210
        }
211
        
212
        .v-switch-knob {
213
            position: absolute;
214
            top: 0px;
215
            left: $knob-left;
216
            height: $slider-height;
217
            width: $slider-height;
218
            background-color: $v-background-color;
219
            border: valo-border($border: $v-border, $color: $v-background-color, $strength: 0.7);
220
            border-radius: $knob-border-radius;
221
        }
222
    }
223

  
168
    }   
224 169
    
225 170
} 
src/main/webapp/VAADIN/themes/edit-valo/styles.scss
2 2
@import "edit-valo.scss";
3 3
@import "designs.scss";
4 4

  
5
/* import the switch addon valo theme */
6
@import "VAADIN/addons/switch/css/switch-valo.scss";
7

  
5 8
/* This file prefixes all rules with the theme name to avoid causing conflicts with other themes. */
6 9
/* The actual styles should be defined in edit-valo.scss */
7 10
.edit-valo {

Also available in: Unified diff

Add picture from clipboard (Maximum size: 40 MB)