Fixes #2505: global font styles for components inside PopupView.

svn changeset:6663/svn branch:trunk

diff --git a/WebContent/ITMILL/themes/default/common/common.css b/WebContent/ITMILL/themes/default/common/common.css
index 290ce61eab2c2c8361e0ef6a7f6577ef1b744b72..df9fc479f3e16e06afb5b8f4a5280b1cea734c6e 100644 (file)
--- a/WebContent/ITMILL/themes/default/common/common.css
+++ b/WebContent/ITMILL/themes/default/common/common.css
@@ -10,8 +10,7 @@
 
 .i-app {
        background: #e9eced;
-       font-family: "Trebuchet MS", geneva, helvetica, arial, tahoma, verdana,
-               sans-serif;
+       font-family: "Trebuchet MS", geneva, helvetica, arial, tahoma, verdana, sans-serif;
        color: #464f52;
        font-size: 13px;
        line-height: 18px;
@@ -57,18 +56,31 @@
        }
 }
 
-.i-view:active,.i-view:focus {
+.i-view:active,
+.i-view:focus {
        outline: none;
 }
 
-.i-app input,.i-window input,.i-app select,.i-window select,.i-app textarea,.i-window textarea,.i-app button,.i-window button
-       {
-       font-family: "Trebuchet MS", geneva, helvetica, arial, tahoma, verdana,
-               sans-serif;
+/* Global font styles */
+.i-app input,
+.i-app select,
+.i-app button,
+.i-app textarea,
+.i-window input,
+.i-window select,
+.i-window button,
+.i-window textarea,
+.i-popupview-popup input,
+.i-popupview-popup select,
+.i-popupview-popup button,
+.i-popupview-popup textarea {
+       font-family: "Trebuchet MS", geneva, helvetica, arial, tahoma, verdana, sans-serif;
        color: #464f52;
+       font-size: 13px;
 }
 
-.i-app select,.i-window select {
+.i-app select,
+.i-window select {
        padding: 0;
        margin: 0;
 }
@@ -109,7 +121,9 @@ input.i-modified,
        background:transparent;\r
        background-color: #FFFFE0;\r
 }
-*/ /**
+*/
+
+/**
  * Custom tooltip
  */
 .i-tooltip {
@@ -159,8 +173,7 @@ input.i-modified,
  */
 .i-contextmenu {
        background: #e9eced url(../tabsheet/img/tab-bg.png);
-       font-family: "Trebuchet MS", geneva, helvetica, arial, tahoma, verdana,
-               sans-serif;
+       font-family: "Trebuchet MS", geneva, helvetica, arial, tahoma, verdana, sans-serif;
        background-color: #f6f7f7;
        color: #464f52;
        font-size: 12px;
@@ -215,8 +228,9 @@ input.i-modified,
  * Note: client side expects that loading indicator has a height. It depends on
  * this css property to ensure browsers have applied all required styles.
  */
-.i-loading-indicator,.i-loading-indicator-delay,.i-loading-indicator-wait
-       {
+.i-loading-indicator,
+.i-loading-indicator-delay,
+.i-loading-indicator-wait {
        width: 31px;
        height: 31px;
        background: transparent url(img/loading-indicator.gif);
@@ -263,12 +277,16 @@ input.i-modified,
 }
 
 /* Debug style */
-.i-app .invalidlayout,.i-app .invalidlayout * {
+.i-app .invalidlayout,
+.i-app .invalidlayout * {
        background: #f99 !important;
 }
 
 /* Fix for liferay. #2384 */
-.i-app input[type="text"],.i-app input[type="password"],.i-app input[type="reset"],.i-app select,.i-app textarea,.i-app .textarea
-       {
-       padding: 2px 2px;
+.i-app input[type="text"],
+.i-app input[type="password"],
+.i-app input[type="reset"],
+.i-app select,
+.i-app textarea {
+       padding: 2px;
 }
\ No newline at end of file

diff --git a/WebContent/ITMILL/themes/default/popupview/popupview.css b/WebContent/ITMILL/themes/default/popupview/popupview.css
index bd52ebd429206b67b6ab8a563a88c68726194fa2..1a00d0d4ba2a5396f6b0e2420936cf14cd31510b 100644 (file)
--- a/WebContent/ITMILL/themes/default/popupview/popupview.css
+++ b/WebContent/ITMILL/themes/default/popupview/popupview.css
@@ -1,16 +1,12 @@
-/*
- * PopupView styles
- */
-.i-popupview-popup{
-       border:                                 1px solid #babfc0;
-       border-bottom:                  1px solid #dee2e3;
-       background-color:               white;
-       overflow:                               auto;
-       padding:                                3px;
-       margin:                                 3px;
+.i-popupview-popup {
+       border: 1px solid #babfc0;
+       border-bottom: 1px solid #dee2e3;
+       background: #fff;
+       overflow: auto;
+       padding: 3px;
+       margin: 3px;
 }
 
 .i-popupview {
-       cursor:                                 pointer; 
-       cursor:                                 hand;
+       cursor: pointer;
 }
\ No newline at end of file

diff --git a/WebContent/ITMILL/themes/default/styles.css b/WebContent/ITMILL/themes/default/styles.css
index b1710999b63531b10c17f17652ad9de7298577b3..ca030944331ad6f343db805b412b224bef4b451c 100644 (file)
--- a/WebContent/ITMILL/themes/default/styles.css
+++ b/WebContent/ITMILL/themes/default/styles.css
@@ -177,8 +177,7 @@
 
 .i-app {
        background: #e9eced;
-       font-family: "Trebuchet MS", geneva, helvetica, arial, tahoma, verdana,
-               sans-serif;
+       font-family: "Trebuchet MS", geneva, helvetica, arial, tahoma, verdana, sans-serif;
        color: #464f52;
        font-size: 13px;
        line-height: 18px;
@@ -224,18 +223,31 @@
        }
 }
 
-.i-view:active,.i-view:focus {
+.i-view:active,
+.i-view:focus {
        outline: none;
 }
 
-.i-app input,.i-window input,.i-app select,.i-window select,.i-app textarea,.i-window textarea,.i-app button,.i-window button
-       {
-       font-family: "Trebuchet MS", geneva, helvetica, arial, tahoma, verdana,
-               sans-serif;
+/* Global font styles */
+.i-app input,
+.i-app select,
+.i-app button,
+.i-app textarea,
+.i-window input,
+.i-window select,
+.i-window button,
+.i-window textarea,
+.i-popupview-popup input,
+.i-popupview-popup select,
+.i-popupview-popup button,
+.i-popupview-popup textarea {
+       font-family: "Trebuchet MS", geneva, helvetica, arial, tahoma, verdana, sans-serif;
        color: #464f52;
+       font-size: 13px;
 }
 
-.i-app select,.i-window select {
+.i-app select,
+.i-window select {
        padding: 0;
        margin: 0;
 }
@@ -276,7 +288,9 @@ input.i-modified,
        background:transparent;
        background-color: #FFFFE0;
 }
-*/ /**
+*/
+
+/**
  * Custom tooltip
  */
 .i-tooltip {
@@ -326,8 +340,7 @@ input.i-modified,
  */
 .i-contextmenu {
        background: #e9eced url(tabsheet/img/tab-bg.png);
-       font-family: "Trebuchet MS", geneva, helvetica, arial, tahoma, verdana,
-               sans-serif;
+       font-family: "Trebuchet MS", geneva, helvetica, arial, tahoma, verdana, sans-serif;
        background-color: #f6f7f7;
        color: #464f52;
        font-size: 12px;
@@ -382,8 +395,9 @@ input.i-modified,
  * Note: client side expects that loading indicator has a height. It depends on
  * this css property to ensure browsers have applied all required styles.
  */
-.i-loading-indicator,.i-loading-indicator-delay,.i-loading-indicator-wait
-       {
+.i-loading-indicator,
+.i-loading-indicator-delay,
+.i-loading-indicator-wait {
        width: 31px;
        height: 31px;
        background: transparent url(common/img/loading-indicator.gif);
@@ -430,14 +444,18 @@ input.i-modified,
 }
 
 /* Debug style */
-.i-app .invalidlayout,.i-app .invalidlayout * {
+.i-app .invalidlayout,
+.i-app .invalidlayout * {
        background: #f99 !important;
 }
 
 /* Fix for liferay. #2384 */
-.i-app input[type="text"],.i-app input[type="password"],.i-app input[type="reset"],.i-app select,.i-app textarea,.i-app .textarea
-       {
-       padding: 2px 2px;
+.i-app input[type="text"],
+.i-app input[type="password"],
+.i-app input[type="reset"],
+.i-app select,
+.i-app textarea {
+       padding: 2px;
 }
 
 /* ./WebContent/ITMILL/themes/default/customcomponent/customcomponent.css */
@@ -1161,21 +1179,17 @@ input.i-modified,
 }
 
 /* ./WebContent/ITMILL/themes/default/popupview/popupview.css */
-/*
- * PopupView styles
- */
-.i-popupview-popup{
-       border:                                 1px solid #babfc0;
-       border-bottom:                  1px solid #dee2e3;
-       background-color:               white;
-       overflow:                               auto;
-       padding:                                3px;
-       margin:                                 3px;
+.i-popupview-popup {
+       border: 1px solid #babfc0;
+       border-bottom: 1px solid #dee2e3;
+       background: #fff;
+       overflow: auto;
+       padding: 3px;
+       margin: 3px;
 }
 
 .i-popupview {
-       cursor:                                 pointer; 
-       cursor:                                 hand;
+       cursor: pointer;
 }
 
 /* ./WebContent/ITMILL/themes/default/progressindicator/progressindicator.css */

diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/IPopupView.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/IPopupView.java
index 01c16930a756e32d73bdeebec69bdd934e3162cc..1f0b7bc88ab4d26e9bcd26eb2082f22d5529c90e 100644 (file)
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/IPopupView.java
+++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/IPopupView.java
@@ -46,7 +46,7 @@ public class IPopupView extends HTML implements Paintable {
         setStyleName(CLASSNAME);
         popup.setStylePrimaryName(CLASSNAME + "-popup");
 
-        setHTML("PopupPanel");
+        setHTML("(No HTML defined for PopupView)");
         popup.setWidget(loading);
 
         // When we click to open the popup...