diff options
author | Johannes Dahlström <johannesd@vaadin.com> | 2012-10-31 17:31:16 +0200 |
---|---|---|
committer | Johannes Dahlström <johannesd@vaadin.com> | 2012-11-14 15:18:36 +0200 |
commit | 9d30f9ce6640be87cdbd0756886b2d704a4970bc (patch) | |
tree | 2605044ff8a1d7d51dceb21afbdd54e8c1d164f5 /WebContent | |
parent | 1b7a4a1ee9e03f445cbfcbb520a5ac970ccf47de (diff) | |
download | vaadin-framework-9d30f9ce6640be87cdbd0756886b2d704a4970bc.tar.gz vaadin-framework-9d30f9ce6640be87cdbd0756886b2d704a4970bc.zip |
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
Diffstat (limited to 'WebContent')
-rw-r--r-- | WebContent/VAADIN/themes/base/common/common.scss | 10 | ||||
-rw-r--r-- | WebContent/VAADIN/themes/chameleon/common/common.scss | 2 | ||||
-rw-r--r-- | WebContent/VAADIN/themes/tests-tickets/styles.css | 2 |
3 files changed, 7 insertions, 7 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; } |