From 980a0893f0070de007d5c3842994c6720b381117 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Fri, 7 Oct 2011 16:03:26 +0200
Subject: [PATCH] Change colorselector to use border for selected color
---
apps/calendar/css/style.css | 4 +-
apps/calendar/js/calendar.js | 4 +-
core/img/actions/selected.png | Bin 276 -> 0 bytes
core/img/actions/selected.svg | 73 ----------------------------------
4 files changed, 3 insertions(+), 78 deletions(-)
delete mode 100644 core/img/actions/selected.png
delete mode 100644 core/img/actions/selected.svg
diff --git a/apps/calendar/css/style.css b/apps/calendar/css/style.css
index 14b7d45523..80d29ca897 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 131325007a..87954b7aac 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'));
diff --git a/core/img/actions/selected.png b/core/img/actions/selected.png
deleted file mode 100644
index 98c29df9cf5d612e21d8ab86bfa1b871c92064a8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 276
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61SBU+%rFB|Y)RhkE)4%caKYZ?lYt^9JzX3_
zG$u}+w2`;PfXDUh%V`ag87mfYELA<$*tOEAF<VPZ>;!|LP-<7b>pLcKCZYYCKh2wa
z;v~a`$$R83?%tqt+E%<_eZtzSQSld}va{cAKcF9b{p{zS;ANRf&jQ{xb%?ko_E=sz
zHpAw;tBN8+fLCbf*4)|p*GqLz2Wgh3{9_SRR7xv5XZd`_%#Oad$&3!M*Ii6_obP{k
zxnknWa->OKNNB4+$3NA1eR=hoEsD>-F&HiR7j%1DoQ3?}$*X0Lf6RLQlGD8MPqe*{
Xt2h5v=GtXIPceA9`njxgN@xNA?L=;U
diff --git a/core/img/actions/selected.svg b/core/img/actions/selected.svg
deleted file mode 100644
index 3294f68c68..0000000000
--- a/core/img/actions/selected.svg
+++ /dev/null
@@ -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>
--
GitLab