diff options
author | Marvin Thomas Rabe <m.rabe@echtzeitraum.de> | 2011-10-06 22:40:11 +0200 |
---|---|---|
committer | Marvin Thomas Rabe <m.rabe@echtzeitraum.de> | 2011-10-06 22:40:11 +0200 |
commit | e345fbd386f3e2c63b6682ae245beb7b24af08fb (patch) | |
tree | 1d7d2e6d2acb193252cd158cec2ab54d501825a0 /apps/calendar/css | |
parent | bb26fe93008bd6fd5031956d654a5ab9c1950416 (diff) | |
parent | 3cc7212c8282d5be2d53ab3b5aa35ec6247cfcbe (diff) | |
download | nextcloud-server-e345fbd386f3e2c63b6682ae245beb7b24af08fb.tar.gz nextcloud-server-e345fbd386f3e2c63b6682ae245beb7b24af08fb.zip |
conflicts solved
Diffstat (limited to 'apps/calendar/css')
-rw-r--r-- | apps/calendar/css/style.css | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/calendar/css/style.css b/apps/calendar/css/style.css index ca9f3274e3c..14b7d45523e 100644 --- a/apps/calendar/css/style.css +++ b/apps/calendar/css/style.css @@ -59,4 +59,4 @@ 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/jquery-ui/ui-icons_222222_256x240.png");background-position:-62px -143px;} +.calendar-colorpicker-color.active{background-image:url("../../../core/img/actions/selected.svg");background-position:2px 2px;} |