1 files changed, 19 insertions, 2 deletions
diff --git a/WebContent/VAADIN/themes/valo/components/_optiongroup.scss b/WebContent/VAADIN/themes/valo/components/_optiongroup.scss
index 71c67cd9d8..a058ad4e85 100644
--- a/WebContent/VAADIN/themes/valo/components/_optiongroup.scss
+++ b/WebContent/VAADIN/themes/valo/components/_optiongroup.scss
@@ -1,13 +1,30 @@
-@mixin valo-optiongroup ($primary-stylename: v-optiongroup) {
+@mixin valo-optiongroup ($primary-stylename: v-select-optiongroup, $include-additional-styles: contains($v-included-additional-styles, optiongroup)) {
 
   .v-radiobutton {
     @include valo-radiobutton-style;
   }
 
-  .v-select-optiongroup {
+  .#{$primary-stylename} {
     @include valo-optiongroup-style;
   }
 
+
+  @if $include-additional-styles {
+    .#{$primary-stylename}-small {
+      @include valo-optiongroup-style($unit-size: $v-unit-size--small);
+      font-size: $v-font-size--small;
+    }
+
+    .#{$primary-stylename}-large {
+      @include valo-optiongroup-style($unit-size: $v-unit-size--large);
+      font-size: $v-font-size--large;
+    }
+
+    .#{$primary-stylename}-horizontal {
+      @include valo-optiongroup-horizontal;
+    }
+  }
+
 }