Skip to content

Commit

Permalink
Merge pull request #393 from berubs/feature-calendar
Browse files Browse the repository at this point in the history
[calendar] Update colors/icons to match new theme
  • Loading branch information
Paul Jackson authored and Paul Jackson committed Sep 11, 2012
2 parents d9fe86d + d5540a7 commit a001dec
Show file tree
Hide file tree
Showing 14 changed files with 13 additions and 13 deletions.
2 changes: 1 addition & 1 deletion build/js/dependencies/calendar-min.js

Large diffs are not rendered by default.

Binary file removed build/js/images/calendar/n.gif
Binary file not shown.
Binary file added build/js/images/calendar/n.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed build/js/images/calendar/p.gif
Binary file not shown.
Binary file added build/js/images/calendar/p.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 3 additions & 3 deletions src/js/dependencies/calendar.js
Expand Up @@ -148,7 +148,7 @@
btn.children('img').attr('alt', alt);
} else {
btnCtn = $('<div class="cal-' + suffix + '"></div>');
btn = $('<a href="javascript:;" role="button"><img class="image-actual" src="' + pe.add.liblocation + 'images/calendar/' + suffix.substr(0, 1) + '.gif" alt="' + alt + '" /></a>');
btn = $('<a href="javascript:;" role="button"><img class="image-actual" src="' + pe.add.liblocation + 'images/calendar/' + suffix.substr(0, 1) + '.png" alt="' + alt + '" /></a>');

btnCtn.append(btn);
if (n === 0) {
Expand Down Expand Up @@ -259,12 +259,12 @@
}

buttonContainer = $('<div class="cal-goto-button"></div>');
button = $('<input type="submit" value="' + pe.dic.get('%calendar-goToButton') + '" />');
button = $('<input type="submit" class="button button-accent" value="' + pe.dic.get('%calendar-goToButton') + '" />');
buttonContainer.append(button);
fieldset.append(buttonContainer);

buttonCancelContainer = $('<div class="cal-goto-button"></div>');
buttonCancel = $('<input type="button" value="' + pe.dic.get('%calendar-cancelButton') + '" />');
buttonCancel = $('<input type="button" class="button button-dark" value="' + pe.dic.get('%calendar-cancelButton') + '" />');
buttonCancel.click(function () {
_pe.fn.calendar.hideGoToForm(calendarid);
});
Expand Down
Binary file removed src/js/images/calendar/n.gif
Binary file not shown.
Binary file added src/js/images/calendar/n.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed src/js/images/calendar/p.gif
Binary file not shown.
Binary file added src/js/images/calendar/p.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion src/js/sass/calendar-base.scss
Expand Up @@ -32,7 +32,7 @@ div.cal-cnt{
}
.cal-goto p{
float: left;
width: 13.7em;
width: 13.5em;
}
.cal-goto-link{
margin: 0 0 0.5em 0;
Expand Down
12 changes: 6 additions & 6 deletions src/js/sass/calendar-theme.scss
Expand Up @@ -5,12 +5,12 @@
*/
div.cal-cnt {
.cal-header{
background:#36C;
background:#333;
color:#FFF;
font-weight:bold;
}
.cal-nextmonth a:link, .cal-nextmonth a:visited, .cal-prevmonth a:link, .cal-prevmonth a:visited {
border:1px solid #36C;
border:1px solid #333;
}
.cal-nextmonth a:hover, .cal-nextmonth a:focus, .cal-nextmonth a:active, .cal-prevmonth a:hover, .cal-prevmonth a:focus, .cal-prevmonth a:active{
color:#FFF;
Expand All @@ -34,9 +34,9 @@ div.cal-cnt {

ol.cal-weekdays li{
border-style:solid;
border-color:#111;
border-color:#333;
font-weight:bolder;
background:#222;
background:#555;
color:#FFF;
}

Expand All @@ -47,13 +47,13 @@ div.cal-days {
background:#FFF;
}
span.cal-we, ol.cal-day-list li.cal-we{
background:#CCC;
background:#EEE;
}
a{
color:#111;
}
a:hover, a:focus, a:active{ /* active is for IE, focus is for Firefox | active est pour IE, focus est pour Firefox */
background:#600;
background:#333;
color:#FFF;
}
.cal-currentday, .cal-currentday a{
Expand Down
2 changes: 1 addition & 1 deletion src/js/sass/datepicker.scss
Expand Up @@ -51,6 +51,6 @@ div.cal-days {
text-decoration:underline;
}
ol.cal-day-list li.datepicker-selected a{
background-color:#600;
background-color:#333;
}
}
2 changes: 1 addition & 1 deletion src/js/sass/events-calendar.scss
Expand Up @@ -5,7 +5,7 @@
*/
div.cal-days a.calEvent{
color:#FFF !important;
background:#36C;
background:#176ca7;
}

ul.ev-details{
Expand Down

0 comments on commit a001dec

Please sign in to comment.