From 9d30f9ce6640be87cdbd0756886b2d704a4970bc Mon Sep 17 00:00:00 2001 From: =?utf8?q?Johannes=20Dahlstr=C3=B6m?= Date: Wed, 31 Oct 2012 17:31:16 +0200 Subject: [PATCH] UI stylename handling (#9832) * Change VUI class name from v-view to v-ui * Use state.primaryStyleName so it can be changed * Remove useless v-app-VaadinServiceSession from bootstrap root div Change-Id: I67d3cb3efb5b4033416dcfcf7f39cbc71ac70cbc --- WebContent/VAADIN/themes/base/common/common.scss | 10 +++++----- WebContent/VAADIN/themes/chameleon/common/common.scss | 2 +- WebContent/VAADIN/themes/tests-tickets/styles.css | 2 +- client/src/com/vaadin/client/ui/VUI.java | 4 ---- client/src/com/vaadin/client/ui/ui/UIConnector.java | 2 +- server/src/com/vaadin/server/BootstrapHandler.java | 6 +----- shared/src/com/vaadin/shared/ui/ui/UIState.java | 3 +++ 7 files changed, 12 insertions(+), 17 deletions(-) diff --git a/WebContent/VAADIN/themes/base/common/common.scss b/WebContent/VAADIN/themes/base/common/common.scss index 7fd4d2cc32..b1e5ae1674 100644 --- a/WebContent/VAADIN/themes/base/common/common.scss +++ b/WebContent/VAADIN/themes/base/common/common.scss @@ -28,7 +28,7 @@ div.v-app-loading { width: 100%; height: 100%; } -.v-view { +.v-ui { height: 100%; width: 100%; /* avoid scrollbars with margins in root layout */ @@ -36,7 +36,7 @@ div.v-app-loading { position: relative; } /* Prevent margin collapse */ -.v-view.v-view-embedded { +.v-ui.v-ui-embedded { margin-top: -1px; border-top: 1px solid transparent; } @@ -54,15 +54,15 @@ div.v-app-loading { height: auto; min-height: 20cm; } - .v-view { + .v-ui { overflow: visible; } .v-gridlayout { overflow: visible !important; } } -.v-view:active, -.v-view:focus { +.v-ui:active, +.v-ui:focus { outline: none; } .v-app select, diff --git a/WebContent/VAADIN/themes/chameleon/common/common.scss b/WebContent/VAADIN/themes/chameleon/common/common.scss index a7878b38ec..10247032ac 100644 --- a/WebContent/VAADIN/themes/chameleon/common/common.scss +++ b/WebContent/VAADIN/themes/chameleon/common/common.scss @@ -15,7 +15,7 @@ $chameleon-line-height: 1.4; overflow: hidden; } - .v-view { + .v-ui { margin-top: 0; border-top: none; } diff --git a/WebContent/VAADIN/themes/tests-tickets/styles.css b/WebContent/VAADIN/themes/tests-tickets/styles.css index f088e0dd35..fd4db4e6b5 100644 --- a/WebContent/VAADIN/themes/tests-tickets/styles.css +++ b/WebContent/VAADIN/themes/tests-tickets/styles.css @@ -320,7 +320,7 @@ /*****************************************************************************/ /* The reference screenshots all have a white background */ /*****************************************************************************/ -.v-view { +.v-ui { background: #fff; } diff --git a/client/src/com/vaadin/client/ui/VUI.java b/client/src/com/vaadin/client/ui/VUI.java index 7f067c605d..a4d1df9423 100644 --- a/client/src/com/vaadin/client/ui/VUI.java +++ b/client/src/com/vaadin/client/ui/VUI.java @@ -51,8 +51,6 @@ public class VUI extends SimplePanel implements ResizeHandler, Window.ClosingHandler, ShortcutActionHandlerOwner, Focusable, HasResizeHandlers { - private static final String CLASSNAME = "v-view"; - private static int MONITOR_PARENT_TIMER_INTERVAL = 1000; /** For internal use only. May be removed or replaced in the future. */ @@ -157,8 +155,6 @@ public class VUI extends SimplePanel implements ResizeHandler, public VUI() { super(); - setStyleName(CLASSNAME); - // Allow focusing the view by using the focus() method, the view // should not be in the document focus flow getElement().setTabIndex(-1); diff --git a/client/src/com/vaadin/client/ui/ui/UIConnector.java b/client/src/com/vaadin/client/ui/ui/UIConnector.java index a0898b3281..a51cccf355 100644 --- a/client/src/com/vaadin/client/ui/ui/UIConnector.java +++ b/client/src/com/vaadin/client/ui/ui/UIConnector.java @@ -355,7 +355,7 @@ public class UIConnector extends AbstractComponentContainerConnector implements * Must set absolute position if the child has relative height and * there's a chance of horizontal scrolling as some browsers will * otherwise not take the scrollbar into account when calculating the - * height. Assuming v-view does not have an undefined width for now, see + * height. Assuming v-ui does not have an undefined width for now, see * #8460. */ if (child.isRelativeHeight() && !BrowserInfo.get().isIE9()) { diff --git a/server/src/com/vaadin/server/BootstrapHandler.java b/server/src/com/vaadin/server/BootstrapHandler.java index 15aaab313b..df0ace78db 100644 --- a/server/src/com/vaadin/server/BootstrapHandler.java +++ b/server/src/com/vaadin/server/BootstrapHandler.java @@ -317,16 +317,12 @@ public abstract class BootstrapHandler implements RequestHandler { * .v-theme- */ - String appClass = "v-app-" - + context.getSession().getClass().getSimpleName(); - - String classNames = "v-app " + appClass; List fragmentNodes = context.getBootstrapResponse() .getFragmentNodes(); Element mainDiv = new Element(Tag.valueOf("div"), ""); mainDiv.attr("id", context.getAppId()); - mainDiv.addClass(classNames); + mainDiv.addClass("v-app"); if (style != null && style.length() != 0) { mainDiv.attr("style", style); } diff --git a/shared/src/com/vaadin/shared/ui/ui/UIState.java b/shared/src/com/vaadin/shared/ui/ui/UIState.java index c734ee5d0b..028218409f 100644 --- a/shared/src/com/vaadin/shared/ui/ui/UIState.java +++ b/shared/src/com/vaadin/shared/ui/ui/UIState.java @@ -18,4 +18,7 @@ package com.vaadin.shared.ui.ui; import com.vaadin.shared.ComponentState; public class UIState extends ComponentState { + { + primaryStyleName = "v-ui"; + } } \ No newline at end of file -- 2.39.5