From 17e8e0667f85696e93374a3a67de315dc2708ce2 Mon Sep 17 00:00:00 2001 From: Massimiliano Assante Date: Sat, 9 Nov 2013 15:45:53 +0000 Subject: [PATCH] updated popup style git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/portlets/user/gcube-widgets@85261 82a268e6-3cf1-43bd-a215-b396298e98cf --- pom.xml | 2 +- .../user/gcubewidgets/client/GCubePanel.java | 1 - .../gcubewidgets/client/WidgetFactory.java | 2 + .../public/gcube_common_styles.css | 46 ++++++++++------ war/gcube_common_styles.css | 11 ++-- war/gcubewidgets/gcube_common_styles.css | 55 +++++++++++++------ war/gcubewidgets/gcubewidgets.nocache.js | 31 ++++++----- war/gcubewidgets/hosted.html | 21 +++---- war/gcubewidgets/old-dialog.css | 1 + 9 files changed, 102 insertions(+), 68 deletions(-) diff --git a/pom.xml b/pom.xml index 4018bf3..fc421b2 100644 --- a/pom.xml +++ b/pom.xml @@ -140,7 +140,7 @@ - + compile diff --git a/src/main/java/org/gcube/portlets/user/gcubewidgets/client/GCubePanel.java b/src/main/java/org/gcube/portlets/user/gcubewidgets/client/GCubePanel.java index 314b387..96f4382 100644 --- a/src/main/java/org/gcube/portlets/user/gcubewidgets/client/GCubePanel.java +++ b/src/main/java/org/gcube/portlets/user/gcubewidgets/client/GCubePanel.java @@ -22,7 +22,6 @@ import com.google.gwt.user.client.ui.Widget; * GCubePanel is the wrapper panel gCube Portlet that lays all of its widgets out in a single vertical column. * * @author Massimiliano Assante, ISTI-CNR - massimiliano.assante@isti.cnr.it - * @version December 2009 (0.2b) */ public class GCubePanel extends VerticalPanel implements HasCaption { diff --git a/src/main/java/org/gcube/portlets/user/gcubewidgets/client/WidgetFactory.java b/src/main/java/org/gcube/portlets/user/gcubewidgets/client/WidgetFactory.java index b240320..39b5c87 100644 --- a/src/main/java/org/gcube/portlets/user/gcubewidgets/client/WidgetFactory.java +++ b/src/main/java/org/gcube/portlets/user/gcubewidgets/client/WidgetFactory.java @@ -24,8 +24,10 @@ public class WidgetFactory implements EntryPoint { * This is the entry point method. */ public void onModuleLoad() { + //showSample(); } private void showSample() { + // PushButton button = new PushButton("Click me"); diff --git a/src/main/java/org/gcube/portlets/user/gcubewidgets/public/gcube_common_styles.css b/src/main/java/org/gcube/portlets/user/gcubewidgets/public/gcube_common_styles.css index d35b3a3..b9ed829 100644 --- a/src/main/java/org/gcube/portlets/user/gcubewidgets/public/gcube_common_styles.css +++ b/src/main/java/org/gcube/portlets/user/gcubewidgets/public/gcube_common_styles.css @@ -1,7 +1,7 @@ /** * Common CSS for gCube Portlets * - * Massimiliano Assante, March 2013 + * Massimiliano Assante, November 2013 */ /****** PANELS STYLES *******/ @import url(normalize.css); @@ -145,7 +145,7 @@ border: 1px solid #BBB; -moz-border-radius: 2em; -webkit-border-radius: 2em; - border-radius: 2em; + border-radius: 4px; background: #F2F2F2 url(gcube_images/white-grad.png) repeat-x scroll left top; font-size: 12px; cursor: pointer; @@ -281,20 +281,37 @@ .gcube_DialogBox { z-index: 10001; background: #FFFFFF none repeat-x scroll 0 0; - border: 9px solid rgb(80, 80, 80); /* for not understanding rgba prop browsers*/ - border: 9px solid rgba(0, 0, 0, 0.60); - -webkit-background-clip: padding-box; /* for Safari */ - background-clip: padding-box; /* for IE9+, Firefox 4+, Opera, Chrome */ - border-radius: 6px; - -moz-border-radius: 6px; - -webkit-border-radius: 6px; + + border: 2px solid #CCC; + + border-radius: 4px; + -moz-border-radius: 4px; + -webkit-border-radius: 4px; +} + +.gcube_DialogBox .Caption { + color: #19326C; + font-family: "HelveticaNeue-Light", "Helvetica Neue Light", + "Helvetica Neue", Helvetica, Arial, "Lucida Grande", sans-serif; + font-size: 15px; + font-weight: normal; + padding: 5px; + +} + +.gcube_DialogBox .dialogContent div { + font-family: "HelveticaNeue-Light", "Helvetica Neue Light", + "Helvetica Neue", Helvetica, Arial, "Lucida Grande", sans-serif; + font-size: 13px; + color: #555; } .gcube_DialogBox .dialogTop { - background: #2999c9; + background: #EDEDEF; margin: 0px; padding-left: 5px; height: 20px; + border-bottom: 1px #CCC solid; } .gcube_DialogBox .dialogMiddleCenter { @@ -318,14 +335,7 @@ height: 5px; } -.gcube_DialogBox .Caption { - font-family: 'lucida grande', tahoma, verdana, arial, sans-serif; - font-size: 14px; - font-weight: bold; - color: #FFF; - padding: 5px; - -} + /****** DECORATED TAB BAR - TAB PANEL ********/ .gwt-TabPanel { diff --git a/war/gcube_common_styles.css b/war/gcube_common_styles.css index 849a8a4..ad74b4f 100644 --- a/war/gcube_common_styles.css +++ b/war/gcube_common_styles.css @@ -281,7 +281,7 @@ } .gcube_DialogBox .dialogTop { - background: #2999c9; + background: green; margin: 0px; padding-left: 5px; height: 20px; @@ -309,10 +309,11 @@ } .gcube_DialogBox .Caption { - font-family: 'lucida grande', tahoma, verdana, arial, sans-serif; - font-size: 14px; - font-weight: bold; - color: #FFF; + color: #4c68a6; + font-family: "HelveticaNeue-Light", "Helvetica Neue Light", + "Helvetica Neue", Helvetica, Arial, "Lucida Grande", sans-serif; + font-weight: 300; + font-size: 12px !important; padding: 5px; } diff --git a/war/gcubewidgets/gcube_common_styles.css b/war/gcubewidgets/gcube_common_styles.css index 12f4cb6..dbdc640 100644 --- a/war/gcubewidgets/gcube_common_styles.css +++ b/war/gcubewidgets/gcube_common_styles.css @@ -5,7 +5,6 @@ */ /****** PANELS STYLES *******/ @import url(normalize.css); - @import url(switchbutton.css); /* Use it for your portlet main Panel */ .gcube_panel { @@ -119,6 +118,16 @@ } /****** FORM COMPONENTS STYLES ******/ + +.gwt-CheckBox { + font-family: Arial, Helvetica, sans-serif; + font-size: 12px; +} + +.gwt-CheckBox label { + padding: 3px; +} + .gwt-TextBox { background: #FFFFFF url(gcube_images/text-bg.gif) repeat-x scroll 0 0; border: 1px solid #B5B8C8; @@ -136,7 +145,7 @@ border: 1px solid #BBB; -moz-border-radius: 2em; -webkit-border-radius: 2em; - border-radius: 2em; + border-radius: 4px; background: #F2F2F2 url(gcube_images/white-grad.png) repeat-x scroll left top; font-size: 12px; cursor: pointer; @@ -272,20 +281,37 @@ .gcube_DialogBox { z-index: 10001; background: #FFFFFF none repeat-x scroll 0 0; - border: 9px solid rgb(80, 80, 80); /* for not understanding rgba prop browsers*/ - border: 9px solid rgba(0, 0, 0, 0.60); - -webkit-background-clip: padding-box; /* for Safari */ - background-clip: padding-box; /* for IE9+, Firefox 4+, Opera, Chrome */ - border-radius: 6px; - -moz-border-radius: 6px; - -webkit-border-radius: 6px; + + border: 2px solid #CCC; + + border-radius: 4px; + -moz-border-radius: 4px; + -webkit-border-radius: 4px; +} + +.gcube_DialogBox .Caption { + color: #177ffc; + font-family: "HelveticaNeue-Light", "Helvetica Neue Light", + "Helvetica Neue", Helvetica, Arial, "Lucida Grande", sans-serif; + font-size: 15px; + font-weight: normal; + padding: 5px; + +} + +.gcube_DialogBox .dialogContent div { + font-family: "HelveticaNeue-Light", "Helvetica Neue Light", + "Helvetica Neue", Helvetica, Arial, "Lucida Grande", sans-serif; + font-size: 13px; + color: #555; } .gcube_DialogBox .dialogTop { - background: #2999c9; + background: #ebebeb; margin: 0px; padding-left: 5px; height: 20px; + border-bottom: 1px #CCC solid; } .gcube_DialogBox .dialogMiddleCenter { @@ -309,14 +335,7 @@ height: 5px; } -.gcube_DialogBox .Caption { - font-family: 'lucida grande', tahoma, verdana, arial, sans-serif; - font-size: 14px; - font-weight: bold; - color: #FFF; - padding: 5px; - -} + /****** DECORATED TAB BAR - TAB PANEL ********/ .gwt-TabPanel { diff --git a/war/gcubewidgets/gcubewidgets.nocache.js b/war/gcubewidgets/gcubewidgets.nocache.js index e012922..ae20e09 100644 --- a/war/gcubewidgets/gcubewidgets.nocache.js +++ b/war/gcubewidgets/gcubewidgets.nocache.js @@ -1,16 +1,17 @@ -function gcubewidgets(){var N='',ub='" for "gwt:onLoadErrorFn"',sb='" for "gwt:onPropertyErrorFn"',gb='"><\/script>',X='#',Sb='.cache.html',Z='/',Rb=':',mb='::',$b='