From 35d0361b0aebb0c0a1194d0c37e920dd9242fe4e Mon Sep 17 00:00:00 2001 From: talkabout <> Date: Mon, 3 Aug 2015 18:02:25 +0000 Subject: [PATCH] 95_Dashboard: fixed style issue with colorpicker - fixed issue with editing groups in the dashboard configuration dialog git-svn-id: https://svn.fhem.de/fhem/trunk@9018 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/CHANGED | 2 ++ fhem/FHEM/95_Dashboard.pm | 4 +++- fhem/www/pgm2/ios6dashboard.css | 9 +++++---- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/fhem/CHANGED b/fhem/CHANGED index 1ae1dad3e..9fcc7ea20 100644 --- a/fhem/CHANGED +++ b/fhem/CHANGED @@ -1,5 +1,7 @@ # Add changes at the top of the list. Keep it in ASCII, and 80-char wide. # Do not insert empty lines here, update check depends on it. + - bugfix: 95_Dashboard: fixed style issue with colorpicker in ios6touchpad style + fixed issue with editing groups in the dashboard configuration dialog - feature: 30_pilight_dimmer.pm: SetExtensions (on-for-timer, etc.) - feature: 30_pilight_switch.pm: SetExtensions (on-for-timer, etc.) - feature: 30_pilight_raw.pm: send raw codes to pilight diff --git a/fhem/FHEM/95_Dashboard.pm b/fhem/FHEM/95_Dashboard.pm index fa2913b73..218a0350b 100644 --- a/fhem/FHEM/95_Dashboard.pm +++ b/fhem/FHEM/95_Dashboard.pm @@ -473,7 +473,9 @@ sub Dashboard_SummaryFN($$$$) $ret .= "
\n"; $ret .= " Tabtitle:"; $ret .= " Tabicon:"; - $ret .= " Groups:"; + # the method FW_multipleSelect seems not to be available any more in fhem + #$ret .= " Groups:"; + $ret .= " Groups:"; $ret .= " "; $ret .= " \n"; $ret .= " \n"; diff --git a/fhem/www/pgm2/ios6dashboard.css b/fhem/www/pgm2/ios6dashboard.css index cc7dbc869..99382ccf8 100644 --- a/fhem/www/pgm2/ios6dashboard.css +++ b/fhem/www/pgm2/ios6dashboard.css @@ -311,16 +311,17 @@ padding: 5px; /* Colorpicker ------------------------------------------------------------------------*/ -.evo-pop {-index: 10000; +.evo-pop.ui-widget-content {-index: 10000; width: 225px; padding: 3px 3px 0; - background-color:#fefefe; + background-color:#fefefe !important; border: 1px #999999 solid; + transform: translate(-100px,0px); } -.evo-pop-ie {z-index: 10000; +.evo-pop-ie.ui-widget-content {z-index: 10000; width: 225px; padding: 3px; -background-color:#fefefe; +background-color:#fefefe !important; border: 1px #999999 solid; }