]> source.dussan.org Git - vaadin-framework.git/commitdiff
projects / vaadin-framework.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: e9f3fcc)
Fixes light theme window sprites #12171
authorJohn Ahlroos <john@vaadin.com>
Thu, 25 Jul 2013 06:53:50 +0000 (09:53 +0300)
committerJohn Ahlroos <john@vaadin.com>
Fri, 26 Jul 2013 11:01:13 +0000 (14:01 +0300)
The close buttons images for the Window black theme was mistakenly
added to the white theme sprite and ended up in the middle of the
light theme window. Moved the black theme button images to the
black theme sprite.

Change-Id: Ieaaaa1b404f1d623c61fe7cfecb4996d96904b27

WebContent/VAADIN/themes/reindeer/window/window.scss patch | blob | history
uitest/src/com/vaadin/tests/components/window/WindowThemes.html [new file with mode: 0644] patch | blob
uitest/src/com/vaadin/tests/components/window/WindowThemes.java [new file with mode: 0644] patch | blob

diff --git a/WebContent/VAADIN/themes/reindeer/window/window.scss b/WebContent/VAADIN/themes/reindeer/window/window.scss
index e8f001139777398de446bec929b7459c964b27e5..57bd2d4c12113934eb1ba63972a1f79474ff8d82 100644 (file)
--- a/WebContent/VAADIN/themes/reindeer/window/window.scss
+++ b/WebContent/VAADIN/themes/reindeer/window/window.scss
@@ -210,12 +210,12 @@
        .#{$primaryStyleName}-closebox {
                top: 8px;
                
-               background-image: url(img/black/close.png); /** sprite-ref: verticals */
+               background-image: url(img/black/close.png); /** sprite-ref: black-verticals */
                &:hover {
-                       background-image: url(img/black/close-hover.png); /** sprite-ref: verticals */
+                       background-image: url(img/black/close-hover.png); /** sprite-ref: black-verticals */
                }
                &:active {
-                       background-image: url(img/black/close-pressed.png); /** sprite-ref: verticals */
+                       background-image: url(img/black/close-pressed.png); /** sprite-ref: black-verticals */
                }
        }
        .#{$primaryStyleName}-footer {
@@ -232,23 +232,23 @@
        .#{$primaryStyleName}-maximizebox {
                top: 8px;
                
-               background-image: url(img/black/maximize.png); /** sprite-ref: verticals */
+               background-image: url(img/black/maximize.png); /** sprite-ref: black-verticals */
                &:hover {
-                       background-image: url(img/black/maximize-hover.png); /** sprite-ref: verticals */
+                       background-image: url(img/black/maximize-hover.png); /** sprite-ref: black-verticals */
                }
                &:active {
-                       background-image: url(img/black/maximize-active.png); /** sprite-ref: verticals */
+                       background-image: url(img/black/maximize-active.png); /** sprite-ref: black-verticals */
                }
        }
        .#{$primaryStyleName}-restorebox {
                top: 8px;
        
-               background-image: url(img/black/restore.png); /** sprite-ref: verticals */
+               background-image: url(img/black/restore.png); /** sprite-ref: black-verticals */
                &:hover {
-                       background-image: url(img/black/restore-hover.png); /** sprite-ref: verticals */
+                       background-image: url(img/black/restore-hover.png); /** sprite-ref: black-verticals */
                }
                &:active {
-                       background-image: url(img/black/restore-active.png); /** sprite-ref: verticals */
+                       background-image: url(img/black/restore-active.png); /** sprite-ref: black-verticals */
                }
        }
        
diff --git a/uitest/src/com/vaadin/tests/components/window/WindowThemes.html b/uitest/src/com/vaadin/tests/components/window/WindowThemes.html
new file mode 100644 (file)
index 0000000..a93c280
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/components/window/WindowThemes.html
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head profile="http://selenium-ide.openqa.org/profiles/test-case">
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+<link rel="selenium.base" href="http://localhost:7171/" />
+<title>New Test</title>
+</head>
+<body>
+<table cellpadding="1" cellspacing="1" border="1">
+<thead>
+<tr><td rowspan="1" colspan="3">New Test</td></tr>
+</thead><tbody>
+<tr>
+       <td>open</td>
+       <td>/run/com.vaadin.tests.components.window.WindowLightDarkThemes</td>
+       <td></td>
+</tr>
+<tr>
+       <td>screenCapture</td>
+       <td></td>
+       <td>windows</td>
+</tr>
+
+</tbody></table>
+</body>
+</html>
diff --git a/uitest/src/com/vaadin/tests/components/window/WindowThemes.java b/uitest/src/com/vaadin/tests/components/window/WindowThemes.java
new file mode 100644 (file)
index 0000000..2b39916
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/components/window/WindowThemes.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright 2000-2013 Vaadin Ltd.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
+/**
+ * 
+ */
+package com.vaadin.tests.components.window;
+
+import com.vaadin.server.VaadinRequest;
+import com.vaadin.tests.components.AbstractTestUI;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.Window;
+import com.vaadin.ui.themes.Reindeer;
+
+public class WindowThemes extends AbstractTestUI {
+
+    @Override
+    protected void setup(VaadinRequest request) {
+        Window def = new Window("default", new Label("Some content"));
+        def.setWidth("300px");
+        def.setHeight("100%");
+        addWindow(def);
+
+        Window light = new Window("WINDOW_LIGHT", new Label("Some content"));
+        light.setStyleName(Reindeer.WINDOW_LIGHT);
+        light.setPositionX(300);
+        light.setWidth("300px");
+        light.setHeight("100%");
+        addWindow(light);
+
+        Window black = new Window("WINDOW_BLACK", new Label("Some content"));
+        black.setStyleName(Reindeer.WINDOW_BLACK);
+        black.setPositionX(600);
+        black.setWidth("300px");
+        black.setHeight("100%");
+        addWindow(black);
+    }
+
+    @Override
+    protected String getTestDescription() {
+        return "Shows the different css themes of Window";
+    }
+
+    @Override
+    protected Integer getTicketNumber() {
+        // Not tied to any specific ticket
+        return null;
+    }
+}
Vaadin 6, 7, 8 is a Java framework for modern Java web applications: https://github.com/vaadin/framework