From 63a4464c72bec9a49476134ee183ac562cf97a1f Mon Sep 17 00:00:00 2001 From: Gabriel Monnerat <gabriel@tiolive.com> Date: Mon, 11 Apr 2011 20:52:36 +0000 Subject: [PATCH] improve css git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@45302 20353a03-c40f-0410-a6d1-a30d3c3de9de --- .../erp5_web_ung_theme/ung_css/ung_theme.css.xml | 10 +++++++--- .../portal_skins/erp5_web_ung_theme/ung_js/ung.js.xml | 1 + bt5/erp5_web_ung_theme/bt/revision | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/ung_css/ung_theme.css.xml b/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/ung_css/ung_theme.css.xml index 08d3996330..88ed166cd2 100644 --- a/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/ung_css/ung_theme.css.xml +++ b/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/ung_css/ung_theme.css.xml @@ -517,9 +517,8 @@ div#select_language li li {\n border-right: 1px solid #C9D7F1;\n }\n \n -.menu_create_object li li, {\n +.menu_create_object li li, {\n display:block;\n - float:none;\n margin-left:0;\n }\n \n @@ -531,9 +530,9 @@ div#select_language li ul {\n width:70px;\n }\n \n -\n .menu_create_object li ul {\n border:1px solid #D1D1D1;\n + background-color: #FFF;\n }\n .menu_create_object li ul, div#select_language li ul {\n display:none;\n @@ -1135,6 +1134,11 @@ div.navigation-right fieldset.widget div {\n \n span.date-format {\n font-style: italic;\n +}\n +\n +span#no-input-file {\n + display: none;\n + color: #f61717;\n } ]]></string> </value> diff --git a/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/ung_js/ung.js.xml b/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/ung_js/ung.js.xml index 90ae16327c..171da7e06b 100644 --- a/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/ung_js/ung.js.xml +++ b/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/ung_js/ung.js.xml @@ -93,6 +93,7 @@ function checkConversion(){\n status = jQuery.parseJSON(data);\n switch (status) {\n case "converted":\n + $("a#loading_message").text("Opening your Document...");\n clearTimeout();\n setTimeout(updateWebPage(), 1000); \n break;\n diff --git a/bt5/erp5_web_ung_theme/bt/revision b/bt5/erp5_web_ung_theme/bt/revision index 6ffe0d0bf6..235adf8bd8 100644 --- a/bt5/erp5_web_ung_theme/bt/revision +++ b/bt5/erp5_web_ung_theme/bt/revision @@ -1 +1 @@ -348 \ No newline at end of file +349 \ No newline at end of file -- 2.30.9