From 47d85a29a8d23e52c2a19ccef44b7435682256d9 Mon Sep 17 00:00:00 2001
From: rudolfkoenig <>
Date: Wed, 8 Apr 2015 08:12:21 +0000
Subject: [PATCH] fhem_sortable: fix firefox, add ios7 (Forum #35761)

git-svn-id: https://svn.fhem.de/fhem/trunk@8400 2b470e98-0d58-463d-a4d8-8e2adae1ed80
---
 fhem/www/pgm2/darkstyle.css     | 21 ++++++++++++++++++---
 fhem/www/pgm2/defaultCommon.css |  6 +++---
 fhem/www/pgm2/ios7Common.css    |  1 +
 fhem/www/pgm2/ios7style.css     | 22 ++++++++++++++++++++++
 4 files changed, 44 insertions(+), 6 deletions(-)

diff --git a/fhem/www/pgm2/darkstyle.css b/fhem/www/pgm2/darkstyle.css
index b367000f0..4578c02bb 100644
--- a/fhem/www/pgm2/darkstyle.css
+++ b/fhem/www/pgm2/darkstyle.css
@@ -81,10 +81,25 @@ select {  margin-left:5px; margin-right:5px; }
 .downText,.makeSelect select { margin:0.7em; }
 
 /* sortable Widget */
-ul.sortable-src, ul.sortable-dest {min-width: 130px; min-height:1.8em; list-style-type: none;border: 2px solid white;vertical-align:middle; border-radius: 3px; margin: 3px; background: #aaa; padding: 2px;} 
-ul.sortable-src li, ul.sortable-dest li { color: black!important;font-size: 0.8em; line-height: 1.6em; white-space: nowrap; vertical-align:middle; text-align:left; border-radius:3px; margin: 3px; padding: 2px; padding-left:4px;  min-width: 120px; } 
+ul.sortable-src, ul.sortable-dest {
+  min-width: 130px; min-height:1.8em;
+  list-style-type: none; border: 2px solid white;
+  vertical-align:middle; border-radius: 3px;
+  margin: 3px; background: #aaa; padding: 2px;
+} 
+ul.sortable-src li, ul.sortable-dest li { 
+  color: black!important; font-size: 0.8em;
+  line-height: 1.6em; vertical-align:middle;
+  text-align:left; border-radius: 3px;
+  margin: 3px; padding: 2px; padding-left:4px;
+  min-width: 120px;
+} 
 ul.sortable-dest { background:  #101010; } 
-span.sort-item-delete-link { float:right; margin:0px;vertical-align:middle; margin-left:3px; padding:0px;} 
+span.sort-item-delete-link { 
+  float:right; margin:0px;
+  vertical-align:middle; margin-left:3px;
+  padding:0px;
+} 
 .ui-state-highlight { height: 1.1em; line-height: 1.1em; } 
 
 
diff --git a/fhem/www/pgm2/defaultCommon.css b/fhem/www/pgm2/defaultCommon.css
index c07d626ab..9a4187a80 100644
--- a/fhem/www/pgm2/defaultCommon.css
+++ b/fhem/www/pgm2/defaultCommon.css
@@ -54,9 +54,9 @@ ul.sortable-src, ul.sortable-dest {
 } 
 ul.sortable-src li, ul.sortable-dest li { 
   color: black!important;font-size: 0.8em;
-  line-height: 1.6em; white-space: nowrap; 
-  vertical-align:middle; text-align:left;
-  border-radius:3px; margin: 3px; padding: 2px; padding-left:4px;
+  line-height: 1.6em; vertical-align:middle;
+  text-align:left; border-radius:3px; 
+  margin: 3px; padding: 2px; padding-left:4px;
   min-width: 120px;
 } 
 ul.sortable-dest { background:  #278727; } 
diff --git a/fhem/www/pgm2/ios7Common.css b/fhem/www/pgm2/ios7Common.css
index aa07afa97..996e7810b 100644
--- a/fhem/www/pgm2/ios7Common.css
+++ b/fhem/www/pgm2/ios7Common.css
@@ -4,6 +4,7 @@
 div.ui-dialog { border:3px solid #e5e5e5; padding: 0.2em; }
 div.ui-dialog div.ui-dialog-titlebar { display:none; }
 div.ui-widget-content { font-family:Helvetica; background:white; color:#151515;}
+div.ui-widget-content a { color: #147bff!important; text-decoration:none!important; cursor: pointer!important;}
 
 .colorpicker_ct .slider { background: url(../jscolor/ct_background.svg); }
 .colorpicker_ct_mired .slider { background: url(../jscolor/ct_mired_background.svg); }
diff --git a/fhem/www/pgm2/ios7style.css b/fhem/www/pgm2/ios7style.css
index 1272e5ad2..6d5b45da1 100644
--- a/fhem/www/pgm2/ios7style.css
+++ b/fhem/www/pgm2/ios7style.css
@@ -143,6 +143,28 @@ select {  margin-left:5px; margin-right:5px; background: #fff; border:0px; }
 /* timepicker */
 .set .set { margin-bottom:2px; margin-top:3px; }
 
+/* sortable Widget */
+ul.sortable-src, ul.sortable-dest {
+min-width: 130px; min-height:1.8em;
+list-style-type: none; border: 2px solid black;
+vertical-align:middle; border-radius: 3px;
+margin: 3px; background: #aaa;
+padding: 2px;
+} 
+ul.sortable-src li, ul.sortable-dest li {
+  color: black!important; font-size: 0.8em;
+  line-height: 1.6em; vertical-align:middle;
+  text-align:left; border-radius:3px;
+  margin: 3px; padding: 2px;
+  padding-left:4px;  min-width: 120px; 
+} 
+ul.sortable-dest { background:  #147bff; } 
+span.sort-item-delete-link {
+  float:right; margin:0px;vertical-align:middle;
+  margin-left:3px; padding:0px;
+ } 
+.ui-state-highlight { height: 1.1em; line-height: 1.1em; } 
+
 /* save button */
 .changed a, .changed { color:#fc3e39!important; }
 #saveCheck { position: absolute; top: 10px; right: 10px; padding: 0; }