diff options
| author | Georg Ehrke <dev@georgswebsite.de> | 2012-07-21 17:37:10 +0200 |
|---|---|---|
| committer | Georg Ehrke <dev@georgswebsite.de> | 2012-07-21 17:37:10 +0200 |
| commit | f9d33888544ac8abdaf287cc8d558d057de01720 (patch) | |
| tree | dafc4ebff833be164ea6db5e06f992ec4f5f0e67 /apps/calendar/js | |
| parent | d49b789348315be677e66593eaca43e0e399d3da (diff) | |
| parent | 57207ddb82875f7e3e36b0dfb2811ab161a0f08c (diff) | |
| download | nextcloud-server-f9d33888544ac8abdaf287cc8d558d057de01720.tar.gz nextcloud-server-f9d33888544ac8abdaf287cc8d558d057de01720.zip | |
Merge branch 'master' into calendar_import
Diffstat (limited to 'apps/calendar/js')
| -rw-r--r-- | apps/calendar/js/settings.js | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/apps/calendar/js/settings.js b/apps/calendar/js/settings.js index 03e4217573d..60741f2b6fc 100644 --- a/apps/calendar/js/settings.js +++ b/apps/calendar/js/settings.js @@ -34,6 +34,7 @@ $(document).ready(function(){ $.getJSON(OC.filePath('calendar', 'ajax/settings', 'timeformat.php'), function(jsondata, status) { $('#' + jsondata.timeformat).attr('selected',true); $('#timeformat').chosen(); + $('#timeformat_chzn').css('width', '100px'); }); $.getJSON(OC.filePath('calendar', 'ajax/settings', 'gettimezonedetection.php'), function(jsondata, status){ if(jsondata.detection == 'true'){ @@ -43,6 +44,7 @@ $(document).ready(function(){ $.getJSON(OC.filePath('calendar', 'ajax/settings', 'getfirstday.php'), function(jsondata, status) { $('#' + jsondata.firstday).attr('selected',true); $('#firstday').chosen(); + $('#firstday_chzn').css('width', '100px'); }); $('#cleancalendarcache').click(function(){ $.getJSON(OC.filePath('calendar', 'ajax/cache', 'rescan.php'), function(){ @@ -55,7 +57,7 @@ function calendarcachecheck(){ $.getJSON(OC.filePath('calendar', 'ajax/cache', 'status.php'), function(jsondata, status) { $('#cleancalendarcache').attr('title', jsondata.l10n.text); if(jsondata.status == 'success'){ - $('#cleancalendarcache').css('background', '#90EE90'); + $('#cleancalendarcache').css('background', '#F8F8F8'); $('#cleancalendarcache').css('color', '#333'); $('#cleancalendarcache').css('text-shadow', '#fff 0 1px 0'); }else{ |