Remove unused test themes

Change-Id: I38e7986692f833ca92aaa77dd7cad3ce72e3aced

15 files changed, 14 insertions, 208 deletions

diff --git a/uitest/src/main/java/com/vaadin/tests/themes/valo/ValoThemeUI.java b/uitest/src/main/java/com/vaadin/tests/themes/valo/ValoThemeUI.java
index 2663c7d07f..6701d502a4 100644
--- a/uitest/src/main/java/com/vaadin/tests/themes/valo/ValoThemeUI.java
+++ b/uitest/src/main/java/com/vaadin/tests/themes/valo/ValoThemeUI.java
@@ -39,6 +39,8 @@ import com.vaadin.server.Resource;
 import com.vaadin.server.Responsive;
 import com.vaadin.server.ThemeResource;
 import com.vaadin.server.VaadinRequest;
+import com.vaadin.server.VaadinSession;
+import com.vaadin.server.WebBrowser;
 import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.ui.Alignment;
 import com.vaadin.ui.Button;
@@ -66,13 +68,7 @@ public class ValoThemeUI extends UI {
     private static LinkedHashMap<String, String> themeVariants = new LinkedHashMap<String, String>();
     static {
         themeVariants.put("tests-valo", "Default");
-        themeVariants.put("tests-valo-blueprint", "Blueprint");
         themeVariants.put("tests-valo-dark", "Dark");
-        themeVariants.put("tests-valo-facebook", "Facebook");
-        themeVariants.put("tests-valo-flatdark", "Flat dark");
-        themeVariants.put("tests-valo-flat", "Flat");
-        themeVariants.put("tests-valo-light", "Light");
-        themeVariants.put("tests-valo-metro", "Metro");
     }
     private TestIcon testIcon = new TestIcon(100);
 
@@ -343,6 +339,18 @@ public class ValoThemeUI extends UI {
     }
 
     private Component createThemeSelect() {
+        // Keep theme select the same size as in the current screenshots
+        double width = 96;
+        WebBrowser browser = VaadinSession.getCurrent().getBrowser();
+        if (browser.isChrome()) {
+            width = 95;
+        } else if (browser.isIE()) {
+            width = 95.39;
+        } else if (browser.isFirefox()) {
+            width = 98;
+        }
+        getPage().getStyles()
+                .add("#themeSelect select {width: " + width + "px;}");
         final NativeSelect ns = new NativeSelect();
         ns.setNullSelectionAllowed(false);
         ns.setId("themeSelect");
diff --git a/uitest/src/main/themes/VAADIN/themes/tests-valo-blueprint/_variables.scss b/uitest/src/main/themes/VAADIN/themes/tests-valo-blueprint/_variables.scss
deleted file mode 100644
index 696da0b69e..0000000000
--- a/uitest/src/main/themes/VAADIN/themes/tests-valo-blueprint/_variables.scss
+++ /dev/null
@@ -1,20 +0,0 @@
-$v-app-loading-text: "Blueprint Valo";
-$v-background-color: #1a61b7;
-$v-focus-color: #fff;
-$v-panel-background-color: $v-background-color;
-$v-overlay-background-color: $v-background-color;
-$valo-menu-background-color: $v-background-color;
-$v-overlay-shadow: 0 0 0 1px rgba(#fff, .5);
-$v-window-shadow: $v-overlay-shadow;
-$v-window-modality-curtain-background-color: $v-background-color;
-$v-bevel: false;
-$v-gradient: false;
-$v-shadow: false;
-$v-textfield-bevel: false;
-$v-textfield-shadow: false;
-$v-border: 1px solid (v-tint 1.5);
-$v-textfield-background-color: $v-background-color;
-$v-font-family: sans-serif;
-$v-font-size: 18px;
-
-@import "../valo/valo";
diff --git a/uitest/src/main/themes/VAADIN/themes/tests-valo-blueprint/styles.scss b/uitest/src/main/themes/VAADIN/themes/tests-valo-blueprint/styles.scss
deleted file mode 100644
index 9433f4eba6..0000000000
--- a/uitest/src/main/themes/VAADIN/themes/tests-valo-blueprint/styles.scss
+++ /dev/null
@@ -1,6 +0,0 @@
-@import "variables";
-@import "../tests-valo/valotest";
-
-.tests-valo-blueprint {
-   @include valotest;
-}
diff --git a/uitest/src/main/themes/VAADIN/themes/tests-valo-facebook/_variables.scss b/uitest/src/main/themes/VAADIN/themes/tests-valo-facebook/_variables.scss
deleted file mode 100644
index 5b83aae4ca..0000000000
--- a/uitest/src/main/themes/VAADIN/themes/tests-valo-facebook/_variables.scss
+++ /dev/null
@@ -1,24 +0,0 @@
-$v-app-loading-text: "Facebook Valo";
-$v-background-color: #fafafa;
-$v-app-background-color: #e7ebf2;
-$v-panel-background-color: #fff;
-$v-focus-color: #3b5998;
-$v-focus-style: 0 0 1px 1px rgba($v-focus-color, .5);
-$v-border-radius: 3px;
-$v-textfield-border-radius: 0;
-$v-font-family: Helvetica, Arial, 'lucida grande', tahoma, verdana, arial, sans-serif;
-$v-font-size: 14px;
-$v-font-color: #37404E;
-$v-font-weight: 400;
-$v-link-text-decoration: none;
-$v-shadow: 0 1px 0 (v-shade 0.2);
-$v-bevel: inset 0 1px 0 v-tint;
-$v-unit-size: 30px;
-$v-gradient: v-linear 12%;
-$v-overlay-shadow: 0 3px 8px v-shade, 0 0 0 1px (v-shade 0.7);
-$v-shadow-opacity: 20%;
-$v-selection-overlay-padding-horizontal: 0;
-$v-selection-overlay-padding-vertical: 6px;
-$v-selection-item-border-radius: 0;
-
-@import "../valo/valo";
diff --git a/uitest/src/main/themes/VAADIN/themes/tests-valo-facebook/styles.scss b/uitest/src/main/themes/VAADIN/themes/tests-valo-facebook/styles.scss
deleted file mode 100644
index 7b784627b2..0000000000
--- a/uitest/src/main/themes/VAADIN/themes/tests-valo-facebook/styles.scss
+++ /dev/null
@@ -1,6 +0,0 @@
-@import "variables";
-@import "../tests-valo/valotest";
-
-.tests-valo-facebook {
-   @include valotest;
-}
diff --git a/uitest/src/main/themes/VAADIN/themes/tests-valo-flat/_variables.scss b/uitest/src/main/themes/VAADIN/themes/tests-valo-flat/_variables.scss
deleted file mode 100644
index 298e26ac36..0000000000
--- a/uitest/src/main/themes/VAADIN/themes/tests-valo-flat/_variables.scss
+++ /dev/null
@@ -1,44 +0,0 @@
-$v-app-loading-text: "Flat Valo";
-
-$v-font-family: "Roboto", sans-serif;
-$v-font-weight: 400;
-$v-font-weight--header: 400;
-$v-background-color: #fff;
-$v-focus-color: rgb(150,190,90);
-$v-luminance-threshold: 180;
-$v-border: 2px solid v-shade;
-$v-border-radius: 6px;
-$v-bevel: false;
-$v-gradient: false;
-$v-shadow: false;
-$v-textfield-bevel: false;
-$v-textfield-shadow: false;
-$v-link-text-decoration: false;
-$v-selection-overlay-padding-horizontal: 0;
-$v-selection-overlay-padding-vertical: 6px;
-$v-selection-item-height: 30px;
-$v-selection-item-border-radius: 0;
-$valo-menu-background-color: #eee;
-
-
-@import "../valo/valo";
-
-
-.valo-test {
-  .v-button-primary.v-button-primary {
-    background: #fff;
-    border-color: $v-focus-color;
-    color: $v-focus-color;
-  }
-
-  .v-button-danger.v-button-danger {
-    background: #fff;
-    border-color: $v-error-indicator-color;
-    color: $v-error-indicator-color;
-  }
-
-  .v-slider-base:before,
-  .v-slider-base:after {
-    border: none !important;
-  }
-}
diff --git a/uitest/src/main/themes/VAADIN/themes/tests-valo-flat/styles.scss b/uitest/src/main/themes/VAADIN/themes/tests-valo-flat/styles.scss
deleted file mode 100644
index 7b981de04a..0000000000
--- a/uitest/src/main/themes/VAADIN/themes/tests-valo-flat/styles.scss
+++ /dev/null
@@ -1,6 +0,0 @@
-@import "variables";
-@import "../tests-valo/valotest";
-
-.tests-valo-flat {
-   @include valotest;
-}
diff --git a/uitest/src/main/themes/VAADIN/themes/tests-valo-flatdark/_variables.scss b/uitest/src/main/themes/VAADIN/themes/tests-valo-flatdark/_variables.scss
deleted file mode 100644
index fa785af8b8..0000000000
--- a/uitest/src/main/themes/VAADIN/themes/tests-valo-flatdark/_variables.scss
+++ /dev/null
@@ -1,20 +0,0 @@
-$v-app-loading-text: "Dark & Flat Valo";
-
-$v-background-color: #000;
-$v-focus-color: #ffa500;
-$v-font-size: 15px;
-$v-font-weight: 600;
-$v-unit-size: 42px;
-$v-bevel: false;
-$v-shadow: false;
-$v-gradient: false;
-$v-textfield-bevel: false;
-$v-textfield-shadow: false;
-$v-border-radius: 0;
-$v-border: 2px solid v-tone;
-$v-overlay-shadow: 0 0 0 2px (v-tint 10);
-$v-focus-style: $v-focus-color;
-$v-font-family: "Lato", sans-serif;
-$v-font-weight--header: 600;
-
-@import "../valo/valo";
diff --git a/uitest/src/main/themes/VAADIN/themes/tests-valo-flatdark/styles.scss b/uitest/src/main/themes/VAADIN/themes/tests-valo-flatdark/styles.scss
deleted file mode 100644
index d0871fcba2..0000000000
--- a/uitest/src/main/themes/VAADIN/themes/tests-valo-flatdark/styles.scss
+++ /dev/null
@@ -1,6 +0,0 @@
-@import "variables";
-@import "../tests-valo/valotest";
-
-.tests-valo-flatdark {
-   @include valotest;
-}
diff --git a/uitest/src/main/themes/VAADIN/themes/tests-valo-light/_variables.scss b/uitest/src/main/themes/VAADIN/themes/tests-valo-light/_variables.scss
deleted file mode 100644
index e851f075e4..0000000000
--- a/uitest/src/main/themes/VAADIN/themes/tests-valo-light/_variables.scss
+++ /dev/null
@@ -1,24 +0,0 @@
-$v-app-loading-text: "Light Valo";
-
-$v-background-color: hsl(0, 0, 99.5%);
-$v-app-background-color: #fff;
-$v-focus-color: hsl(218, 80%, 60%);
-$v-border: 1px solid (v-shade 0.6);
-$v-border-radius: 3px;
-$v-bevel: inset 0 1px 0 v-tint;
-$v-textfield-bevel: false;
-$v-gradient: v-linear 3%;
-$v-shadow: false;
-$valo-menu-background-color: hsl(218, 20%, 98%);
-$v-friendly-color: hsl(163, 61%, 41%);
-$v-error-indicator-color: hsl(349, 66%, 56%);
-
-
-@import "../valo/valo";
-
-.tests-valo-light .valo-menu .valo-menu-title {
-  background: $v-app-background-color;
-  color: $v-selection-color;
-  text-shadow: none;
-  border-color: first-color(valo-border($color: $v-app-background-color, $strength: 0.5));
-}
diff --git a/uitest/src/main/themes/VAADIN/themes/tests-valo-light/styles.scss b/uitest/src/main/themes/VAADIN/themes/tests-valo-light/styles.scss
deleted file mode 100644
index 12ee8a780e..0000000000
--- a/uitest/src/main/themes/VAADIN/themes/tests-valo-light/styles.scss
+++ /dev/null
@@ -1,6 +0,0 @@
-@import "variables";
-@import "../tests-valo/valotest";
-
-.tests-valo-light {
-   @include valotest;
-}
diff --git a/uitest/src/main/themes/VAADIN/themes/tests-valo-metro/_variables.scss b/uitest/src/main/themes/VAADIN/themes/tests-valo-metro/_variables.scss
deleted file mode 100644
index 0240bf1ed2..0000000000
--- a/uitest/src/main/themes/VAADIN/themes/tests-valo-metro/_variables.scss
+++ /dev/null
@@ -1,25 +0,0 @@
-$v-app-loading-text: "Metro Valo";
-
-$v-font-family: "Source Sans Pro", sans-serif;
-$v-app-background-color: #fff;
-$v-background-color: #eee;
-$v-focus-color: #0072C6;
-$v-focus-style: 0 0 0 1px $v-focus-color;
-$valo-menu-background-color: darken($v-focus-color, 10%);
-$v-border: 0 solid v-shade;
-$v-border-radius: 0px;
-$v-bevel: false;
-$v-gradient: false;
-$v-shadow: false;
-$v-textfield-bevel: false;
-$v-textfield-shadow: false;
-$v-textfield-border: 1px solid v-shade;
-$v-link-text-decoration: none;
-$v-overlay-shadow: 0 0 0 2px #000;
-$v-window-shadow: $v-overlay-shadow;
-$v-selection-overlay-background-color: #fff;
-$v-selection-overlay-padding-horizontal: 0;
-$v-selection-overlay-padding-vertical: 6px;
-$v-panel-border: 2px solid v-shade;
-
-@import "../valo/valo";
diff --git a/uitest/src/main/themes/VAADIN/themes/tests-valo-metro/styles.scss b/uitest/src/main/themes/VAADIN/themes/tests-valo-metro/styles.scss
deleted file mode 100644
index 51b3427a12..0000000000
--- a/uitest/src/main/themes/VAADIN/themes/tests-valo-metro/styles.scss
+++ /dev/null
@@ -1,6 +0,0 @@
-@import "variables";
-@import "../tests-valo/valotest";
-
-.tests-valo-metro {
-   @include valotest;
-}
diff --git a/uitest/src/main/themes/VAADIN/themes/tests-valo-no-font-awesome/_variables.scss b/uitest/src/main/themes/VAADIN/themes/tests-valo-no-font-awesome/_variables.scss
deleted file mode 100644
index 59b31a4a68..0000000000
--- a/uitest/src/main/themes/VAADIN/themes/tests-valo-no-font-awesome/_variables.scss
+++ /dev/null
@@ -1,3 +0,0 @@
-$v-font-awesome: false;
-
-@import "../valo/valo";
diff --git a/uitest/src/main/themes/VAADIN/themes/tests-valo-no-font-awesome/styles.scss b/uitest/src/main/themes/VAADIN/themes/tests-valo-no-font-awesome/styles.scss
deleted file mode 100644
index d66db2b0d6..0000000000
--- a/uitest/src/main/themes/VAADIN/themes/tests-valo-no-font-awesome/styles.scss
+++ /dev/null
@@ -1,6 +0,0 @@
-@import "variables";
-@import "../tests-valo/valotest";
-
-.tests-valo-no-font-awesome {
-   @include valotest;
-}