merging changes

This commit is contained in:
rolux 2011-04-25 14:25:34 +02:00
commit 351652e513
7 changed files with 11 additions and 16 deletions

View file

@ -381,4 +381,4 @@ Miscellaneous
color: rgba(128, 128, 128, 1);
-moz-box-shadow: 2px 2px 4px rgba(0, 0, 0, 0.5);
-webkit-box-shadow: 2px 2px 4px rgba(0, 0, 0, 0.5);
}
}

View file

@ -398,4 +398,4 @@ Miscellaneous
color: rgba(128, 128, 128, 1);
-moz-box-shadow: 2px 2px 4px rgba(0, 0, 0, 0.5);
-webkit-box-shadow: 2px 2px 4px rgba(0, 0, 0, 0.5);
}
}

View file

@ -309,7 +309,7 @@ Ox.Calendar = function(options, self) {
.css({
textAlign: 'center'
});
renderCalendar();
function changeDate() {

View file

@ -35,4 +35,4 @@ Ox.forEach($('<div>'), function(val, key) {
Ox.UI.elements[id] : ret;
};
}
});
});