diff options
| author | Bart Visscher <bartv@thisnet.nl> | 2011-10-07 16:03:26 +0200 |
|---|---|---|
| committer | Bart Visscher <bartv@thisnet.nl> | 2011-10-07 16:03:26 +0200 |
| commit | 980a0893f0070de007d5c3842994c6720b381117 (patch) | |
| tree | 6d48352f40aad1b53b7e10bc4032708d82d1ab2a /apps | |
| parent | e345fbd386f3e2c63b6682ae245beb7b24af08fb (diff) | |
| download | nextcloud-server-980a0893f0070de007d5c3842994c6720b381117.tar.gz nextcloud-server-980a0893f0070de007d5c3842994c6720b381117.zip | |
Change colorselector to use border for selected color
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/calendar/css/style.css | 4 | ||||
| -rw-r--r-- | apps/calendar/js/calendar.js | 4 |
2 files changed, 3 insertions, 5 deletions
diff --git a/apps/calendar/css/style.css b/apps/calendar/css/style.css index 14b7d45523e..80d29ca8974 100644 --- a/apps/calendar/css/style.css +++ b/apps/calendar/css/style.css @@ -58,5 +58,5 @@ color:#A9A9A9; select#category{width:140px;} button.category{margin:0 3px;} -.calendar-colorpicker-color{display:inline-block;width:20px;height:20px;margin-right:2px;cursor:pointer;} -.calendar-colorpicker-color.active{background-image:url("../../../core/img/actions/selected.svg");background-position:2px 2px;} +.calendar-colorpicker-color{display:inline-block;width:20px;height:20px;margin-right:2px;cursor:pointer;border:2px solid transparent;} +.calendar-colorpicker-color.active{border:2px solid black;} diff --git a/apps/calendar/js/calendar.js b/apps/calendar/js/calendar.js index 131325007a0..87954b7aac6 100644 --- a/apps/calendar/js/calendar.js +++ b/apps/calendar/js/calendar.js @@ -491,8 +491,6 @@ Calendar={ // based on jquery-colorpicker at jquery.webspirited.com var obj = $('.colorpicker', container); var picker = $('<div class="calendar-colorpicker"></div>'); - var size = 20; - //build an array of colors var colors = {}; $(obj).children('option').each(function(i, elm) { @@ -501,7 +499,7 @@ Calendar={ colors[i].label = $(elm).text(); }); for (var i in colors) { - picker.append('<span class="calendar-colorpicker-color ' + (colors[i].color == $(obj).children(":selected").val() ? ' active' : '') + '" rel="' + colors[i].label + '" style="background-color: #' + colors[i].color + '; width: ' + size + 'px; height: ' + size + 'px;"></span>'); + picker.append('<span class="calendar-colorpicker-color ' + (colors[i].color == $(obj).children(":selected").val() ? ' active' : '') + '" rel="' + colors[i].label + '" style="background-color: #' + colors[i].color + ';"></span>'); } picker.delegate(".calendar-colorpicker-color", "click", function() { $(obj).val($(this).attr('rel')); |