From 9db609ecc15acf638816e22dbfc5161e7b171aca Mon Sep 17 00:00:00 2001 From: Peter 'Pita' Martischka Date: Wed, 6 Jul 2011 14:08:20 +0100 Subject: [PATCH] beautify the colorpicker --- static/css/pad_lite.css | 2 +- static/img/colorpicker.gif | Bin 2020 -> 1992 bytes static/js/pad_userlist.js | 6 +++--- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/static/css/pad_lite.css b/static/css/pad_lite.css index 7a33cc3bd..b8ed14b21 100644 --- a/static/css/pad_lite.css +++ b/static/css/pad_lite.css @@ -1125,7 +1125,7 @@ ul#colorpickerswatches ul#colorpickerswatches li { - border: 1px solid #fff; + border: 1px solid #ccc; width: 14px; height: 14px; overflow: hidden; diff --git a/static/img/colorpicker.gif b/static/img/colorpicker.gif index effa3cc01e88dad1234c539b9b14a581cffa3d89..4f74446586bab9cd55c8af2b7ef3a14c3f22d7b8 100644 GIT binary patch delta 1637 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 L$_Y;hA`k#OR1RZm diff --git a/static/js/pad_userlist.js b/static/js/pad_userlist.js index 486da81ec..9d2ff54db 100644 --- a/static/js/pad_userlist.js +++ b/static/js/pad_userlist.js @@ -609,7 +609,7 @@ function closeColorPicker(accept) { } colorPickerOpen = false; - $("#mycolorpicker").css('display', 'none'); + $("#mycolorpicker").fadeOut("fast"); } function showColorPicker() { @@ -641,10 +641,10 @@ function showColorPicker() { colorPickerSetup = true; } - $("#mycolorpicker").css('display', 'block'); + $("#mycolorpicker").fadeIn(); colorPickerOpen = true; $("#colorpickerswatches li").removeClass('picked'); $($("#colorpickerswatches li")[myUserInfo.colorId]).addClass("picked"); //seems weird } -} \ No newline at end of file +}