From 37defa739b29452fa8e8ea61c5e3d3f1e1dd0289 Mon Sep 17 00:00:00 2001 From: ridiculousfish Date: Sun, 1 Apr 2012 01:31:38 -0700 Subject: [PATCH] Fix for an extra line at the end of the variable listing Once again, fix the issue where some color cells aren't clickable --- share/tools/web_config/index.html | 9 ++++----- share/tools/web_config/webconfig.py | 4 +++- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/share/tools/web_config/index.html b/share/tools/web_config/index.html index ca7eaaeb6..08ba437e0 100644 --- a/share/tools/web_config/index.html +++ b/share/tools/web_config/index.html @@ -199,9 +199,10 @@ body { } .colorpicker_target { - margin: 0px; - height: 50px; - margin-bottom: -50px; + margin: 0 0 -50px 0; + position: relative; + bottom: 47px; + float: left; /* for some reason this makes the cells that it overlaps (before adjusting its bottom) clickable in Safari */ } .colorpicker_target_tab { @@ -217,8 +218,6 @@ body { margin-right: -2px; min-width: 110px; text-align: center; - position: relative; - bottom: 47px; } .colorpicker_target_selected { diff --git a/share/tools/web_config/webconfig.py b/share/tools/web_config/webconfig.py index b73a19cea..20e5514fa 100755 --- a/share/tools/web_config/webconfig.py +++ b/share/tools/web_config/webconfig.py @@ -160,7 +160,9 @@ class FishConfigHTTPRequestHandler(SimpleHTTPServer.SimpleHTTPRequestHandler): # Use \x1e ("record separator") to distinguish between history items. The first # backslash is so Python passes one backslash to fish out, err = run_fish_cmd('for val in $history; echo -n $val \\x1e; end') - return out.split('\x1e') + result = out.split('\x1e') + if result: result.pop() + return result def do_get_color_for_variable(self, name):