Change colorselector to use border for selected color

This commit is contained in:
Bart Visscher 2011-10-07 16:03:26 +02:00
parent e345fbd386
commit 980a0893f0
4 changed files with 3 additions and 78 deletions

View File

@ -58,5 +58,5 @@ color:#A9A9A9;
select#category{width:140px;} select#category{width:140px;}
button.category{margin:0 3px;} button.category{margin:0 3px;}
.calendar-colorpicker-color{display:inline-block;width:20px;height:20px;margin-right:2px;cursor:pointer;} .calendar-colorpicker-color{display:inline-block;width:20px;height:20px;margin-right:2px;cursor:pointer;border:2px solid transparent;}
.calendar-colorpicker-color.active{background-image:url("../../../core/img/actions/selected.svg");background-position:2px 2px;} .calendar-colorpicker-color.active{border:2px solid black;}

View File

@ -491,8 +491,6 @@ Calendar={
// based on jquery-colorpicker at jquery.webspirited.com // based on jquery-colorpicker at jquery.webspirited.com
var obj = $('.colorpicker', container); var obj = $('.colorpicker', container);
var picker = $('<div class="calendar-colorpicker"></div>'); var picker = $('<div class="calendar-colorpicker"></div>');
var size = 20;
//build an array of colors //build an array of colors
var colors = {}; var colors = {};
$(obj).children('option').each(function(i, elm) { $(obj).children('option').each(function(i, elm) {
@ -501,7 +499,7 @@ Calendar={
colors[i].label = $(elm).text(); colors[i].label = $(elm).text();
}); });
for (var i in colors) { 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() { picker.delegate(".calendar-colorpicker-color", "click", function() {
$(obj).val($(this).attr('rel')); $(obj).val($(this).attr('rel'));

Binary file not shown.

Before

Width:  |  Height:  |  Size: 276 B

View File

@ -1,73 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="16"
height="16"
id="svg3875"
version="1.1"
inkscape:version="0.48.1 r9760"
sodipodi:docname="play.svg"
inkscape:export-filename="/home/jancborchardt/owncloud/core/img/actions/play-add.png"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90">
<defs
id="defs3877" />
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="25.345359"
inkscape:cx="10.565719"
inkscape:cy="5.327912"
inkscape:document-units="px"
inkscape:current-layer="layer1"
showgrid="true"
inkscape:window-width="1280"
inkscape:window-height="969"
inkscape:window-x="-2"
inkscape:window-y="-3"
inkscape:window-maximized="1">
<inkscape:grid
type="xygrid"
id="grid3883"
empspacing="5"
visible="true"
enabled="true"
snapvisiblegridlinesonly="true" />
</sodipodi:namedview>
<metadata
id="metadata3880">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<g
inkscape:label="Layer 1"
inkscape:groupmode="layer"
id="layer1"
transform="translate(0, -1036.36)">
<path
style="fill:#000000;fill-opacity:1;stroke:none"
d="m 14,1038.3622 -6,12 -6,-12 6,6.9978 z"
id="path3086"
inkscape:connector-curvature="0"
sodipodi:nodetypes="ccccc" />
</g>
</svg>

Before

Width:  |  Height:  |  Size: 2.1 KiB