diff --git a/calendar/resources/jar.mn b/calendar/resources/jar.mn index 3f868ff54df..aa7a84583de 100644 --- a/calendar/resources/jar.mn +++ b/calendar/resources/jar.mn @@ -114,8 +114,6 @@ calendar.jar: skin/classic/calendar/all_day_event_down.png (skin/classic/all_day_event_down.png) skin/classic/calendar/all_day_event_hover.png (skin/classic/all_day_event_hover.png) skin/classic/calendar/btn1.png (skin/classic/btn1.png) - skin/classic/calendar/btn1.gif (skin/classic/btn1.gif) - skin/classic/calendar/btnwm1.gif (skin/classic/btnwm1.gif) skin/classic/calendar/calendar-16.gif (skin/classic/calendar-16.gif) skin/classic/calendar/calendar.css (skin/classic/calendar.css) skin/classic/calendar/calendar-button.css (skin/classic/calendar-button.css) @@ -162,8 +160,6 @@ calendar.jar: skin/modern/calendar/all_day_event_down.png (skin/modern/all_day_event_down.png) skin/modern/calendar/all_day_event_hover.png (skin/modern/all_day_event_hover.png) skin/modern/calendar/btn1.png (skin/modern/btn1.png) - skin/modern/calendar/btn1.gif (skin/modern/btn1.gif) - skin/modern/calendar/btnwm1.gif (skin/modern/btnwm1.gif) skin/modern/calendar/calendar-16.gif (skin/modern/calendar-16.gif) skin/modern/calendar/calendar.css (skin/modern/calendar.css) skin/modern/calendar/calendar_topbar.gif (skin/modern/calendar_topbar.gif) diff --git a/calendar/resources/skin/classic/btn1.gif b/calendar/resources/skin/classic/btn1.gif deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/calendar/resources/skin/classic/btn1.png b/calendar/resources/skin/classic/btn1.png index 31a50baeccb..5423e5f15e7 100644 Binary files a/calendar/resources/skin/classic/btn1.png and b/calendar/resources/skin/classic/btn1.png differ diff --git a/calendar/resources/skin/classic/btnwm1.gif b/calendar/resources/skin/classic/btnwm1.gif deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/calendar/resources/skin/classic/calendar.css b/calendar/resources/skin/classic/calendar.css index 5103fc6a953..0a3c96dca02 100644 --- a/calendar/resources/skin/classic/calendar.css +++ b/calendar/resources/skin/classic/calendar.css @@ -73,21 +73,21 @@ #calendar-new-event-button { - -moz-image-region: rect(105px 32px 126px 0px); + -moz-image-region: rect(126px 32px 147px 0px); } #calendar-new-event-button[disabled="true"], #calendar-new-event-button[disabled="true"]:hover, #calendar-new-event-button[disabled="true"]:hover:active { - -moz-image-region: rect(105px 128px 126px 96px); + -moz-image-region: rect(126px 128px 147px 96px); } #calendar-new-event-button:hover { - -moz-image-region: rect(105px 64px 126px 32px); + -moz-image-region: rect(126px 64px 147px 32px); } #calendar-new-event-button:hover:active { - -moz-image-region: rect(105px 96px 126px 64px); + -moz-image-region: rect(126px 96px 147px 64px); } /*-------------------------------------------------------------------- @@ -96,24 +96,24 @@ #calendar-edit-event-button { - -moz-image-region: rect(126px 32px 147px 0px); + -moz-image-region: rect(147px 32px 168px 0px); } #calendar-edit-event-button[disabled="true"], #calendar-edit-event-button[disabled="true"]:hover, #calendar-edit-event-button[disabled="true"]:hover:active { - -moz-image-region: rect(126px 128px 147px 96px); + -moz-image-region: rect(147px 128px 168px 96px); } #calendar-edit-event-button:hover { - -moz-image-region: rect(126px 64px 147px 32px); + -moz-image-region: rect(147px 64px 168px 32px); } #calendar-edit-event-button:hover:active { - -moz-image-region: rect(126px 96px 147px 64px); + -moz-image-region: rect(147px 96px 168px 64px); } /*-------------------------------------------------------------------- @@ -122,24 +122,24 @@ #calendar-delete-event-button { - -moz-image-region: rect(147px 32px 168px 0px); + -moz-image-region: rect(168px 32px 189px 0px); } #calendar-delete-event-button[disabled="true"], #calendar-delete-event-button[disabled="true"]:hover, #calendar-delete-event-button[disabled="true"]:hover:active { - -moz-image-region: rect(147px 128px 168px 96px); + -moz-image-region: rect(168px 128px 189px 96px); } #calendar-delete-event-button:hover { - -moz-image-region: rect(147px 64px 168px 32px); + -moz-image-region: rect(168px 64px 189px 32px); } #calendar-delete-event-button:hover:active { - -moz-image-region: rect(147px 96px 168px 64px); + -moz-image-region: rect(168px 96px 189px 64px); } /*-------------------------------------------------------------------- @@ -148,21 +148,21 @@ #calendar-go-to-today-button { - -moz-image-region: rect(84px 32px 105px 0px); + -moz-image-region: rect(105px 32px 126px 0px); } #calendar-go-to-today-button[disabled="true"], #calendar-go-to-today-button[disabled="true"]:hover, #calendar-go-to-today-button[disabled="true"]:hover:active { - -moz-image-region: rect(84px 128px 105px 96px); + -moz-image-region: rect(105px 128px 126px 96px); } #calendar-go-to-today-button:hover { - -moz-image-region: rect(84px 64px 105px 32px); + -moz-image-region: rect(105px 64px 126px 32px); } #calendar-go-to-today-button:hover:active { - -moz-image-region: rect(84px 96px 105px 64px); + -moz-image-region: rect(105px 96px 126px 64px); } @@ -172,45 +172,44 @@ #calendar-choose-date-button { - -moz-image-region: rect(63px 32px 84px 0px); + -moz-image-region: rect(84px 32px 105px 0px); } #calendar-choose-date-button[disabled="true"], #calendar-choose-date-button[disabled="true"]:hover, #calendar-choose-date-button[disabled="true"]:hover:active { - -moz-image-region: rect(63px 128px 84px 96px); + -moz-image-region: rect(84px 128px 105px 96px); } #calendar-choose-date-button:hover { - -moz-image-region: rect(63px 64px 84px 32px); + -moz-image-region: rect(84px 64px 105px 32px); } #calendar-choose-date-button:hover:active { - -moz-image-region: rect(63px 96px 84px 64px); + -moz-image-region: rect(84px 96px 105px 64px); } /*-------------------------------------------------------------------- * Change to multiweek view button *-------------------------------------------------------------------*/ -.toolbarbutton-1#calendar-multiweek-view-button { - list-style-image: url("chrome://calendar/skin/btnwm1.gif"); -} - #calendar-multiweek-view-button { - -moz-image-region: rect(1px 32px 21px 0px); + -moz-image-region: rect(42px 32px 63px 0px); } #calendar-multiweek-view-button[disabled="true"], #calendar-multiweek-view-button[disabled="true"]:hover, -#calendar-multiweek-view-button[disabled="true"]:hover:active, -#calendar-multiweek-view-button:hover:active +#calendar-multiweek-view-button[disabled="true"]:hover:active { - -moz-image-region: rect(1px 128px 21px 96px); + -moz-image-region: rect(42px 128px 63px 96px); } #calendar-multiweek-view-button:hover { - -moz-image-region: rect(1px 64px 21px 32px); + -moz-image-region: rect(42px 64px 63px 32px); + } +#calendar-multiweek-view-button:hover:active + { + -moz-image-region: rect(42px 96px 63px 64px); } /*-------------------------------------------------------------------- @@ -219,21 +218,21 @@ #calendar-month-view-button { - -moz-image-region: rect(42px 32px 63px 0px); + -moz-image-region: rect(63px 32px 84px 0px); } #calendar-month-view-button[disabled="true"], #calendar-month-view-button[disabled="true"]:hover, #calendar-month-view-button[disabled="true"]:hover:active { - -moz-image-region: rect(42px 128px 63px 96px); + -moz-image-region: rect(63px 128px 84px 96px); } #calendar-month-view-button:hover { - -moz-image-region: rect(42px 64px 63px 32px); + -moz-image-region: rect(63px 64px 84px 32px); } #calendar-month-view-button:hover:active { - -moz-image-region: rect(42px 96px 63px 64px); + -moz-image-region: rect(63px 96px 84px 64px); } /*-------------------------------------------------------------------- diff --git a/calendar/resources/skin/modern/btn1.gif b/calendar/resources/skin/modern/btn1.gif deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/calendar/resources/skin/modern/btn1.png b/calendar/resources/skin/modern/btn1.png index 049cfbed434..eac1748c9ca 100644 Binary files a/calendar/resources/skin/modern/btn1.png and b/calendar/resources/skin/modern/btn1.png differ diff --git a/calendar/resources/skin/modern/btnwm1.gif b/calendar/resources/skin/modern/btnwm1.gif deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/calendar/resources/skin/modern/calendar.css b/calendar/resources/skin/modern/calendar.css index cc0ec386e37..14b0f78f081 100644 --- a/calendar/resources/skin/modern/calendar.css +++ b/calendar/resources/skin/modern/calendar.css @@ -80,21 +80,21 @@ { margin-left: 5px; padding-top: 1px; - -moz-image-region: rect(170px 45px 204px 0px); + -moz-image-region: rect(204px 45px 238px 0px); } #calendar-new-event-button[disabled="true"], #calendar-new-event-button[disabled="true"]:hover, #calendar-new-event-button[disabled="true"]:hover:active { - -moz-image-region: rect(170px 180px 204px 135px); + -moz-image-region: rect(204px 180px 238px 135px); } #calendar-new-event-button:hover { - -moz-image-region: rect(170px 90px 204px 45px); + -moz-image-region: rect(204px 90px 238px 45px); } #calendar-new-event-button:hover:active { - -moz-image-region: rect(170px 135px 204px 90px); + -moz-image-region: rect(204px 135px 238px 90px); } /*-------------------------------------------------------------------- @@ -104,24 +104,24 @@ #calendar-edit-event-button { padding-top: 1px; - -moz-image-region: rect(204px 45px 238px 0px); + -moz-image-region: rect(238px 45px 272px 0px); } #calendar-edit-event-button[disabled="true"], #calendar-edit-event-button[disabled="true"]:hover, #calendar-edit-event-button[disabled="true"]:hover:active { - -moz-image-region: rect(204px 180px 238px 135px); + -moz-image-region: rect(238px 180px 272px 135px); } #calendar-edit-event-button:hover { - -moz-image-region: rect(204px 90px 238px 45px); + -moz-image-region: rect(238px 90px 272px 45px); } #calendar-edit-event-button:hover:active { - -moz-image-region: rect(204px 135px 238px 90px); + -moz-image-region: rect(238px 135px 272px 90px); } /*-------------------------------------------------------------------- @@ -131,24 +131,24 @@ #calendar-delete-event-button { padding-top: 1px; - -moz-image-region: rect(238px 45px 272px 0px); + -moz-image-region: rect(272px 45px 306px 0px); } #calendar-delete-event-button[disabled="true"], #calendar-delete-event-button[disabled="true"]:hover, #calendar-delete-event-button[disabled="true"]:hover:active { - -moz-image-region: rect(238px 180px 272px 135px); + -moz-image-region: rect(272px 180px 306px 135px); } #calendar-delete-event-button:hover { - -moz-image-region: rect(238px 90px 272px 45px); + -moz-image-region: rect(272px 90px 306px 45px); } #calendar-delete-event-button:hover:active { - -moz-image-region: rect(238px 135px 272px 90px); + -moz-image-region: rect(272px 135px 306px 90px); } /*-------------------------------------------------------------------- @@ -158,21 +158,21 @@ #calendar-go-to-today-button { padding-top: 1px; - -moz-image-region: rect(136px 45px 170px 0px); + -moz-image-region: rect(170px 45px 204px 0px); } #calendar-go-to-today-button[disabled="true"], #calendar-go-to-today-button[disabled="true"]:hover, #calendar-go-to-today-button[disabled="true"]:hover:active { - -moz-image-region: rect(136px 180px 170px 135px); + -moz-image-region: rect(170px 180px 204px 135px); } #calendar-go-to-today-button:hover { - -moz-image-region: rect(136px 90px 170px 45px); + -moz-image-region: rect(170px 90px 204px 45px); } #calendar-go-to-today-button:hover:active { - -moz-image-region: rect(136px 135px 170px 90px); + -moz-image-region: rect(170px 135px 204px 90px); } @@ -183,46 +183,42 @@ #calendar-choose-date-button { padding-top: 1px; - -moz-image-region: rect(102px 45px 136px 0px); + -moz-image-region: rect(136px 45px 170px 0px); } #calendar-choose-date-button[disabled="true"], #calendar-choose-date-button[disabled="true"]:hover, #calendar-choose-date-button[disabled="true"]:hover:active { - -moz-image-region: rect(102px 180px 136px 135px); + -moz-image-region: rect(136px 180px 170px 135px); } #calendar-choose-date-button:hover { - -moz-image-region: rect(102px 90px 136px 45px); + -moz-image-region: rect(136px 90px 170px 45px); } #calendar-choose-date-button:hover:active { - -moz-image-region: rect(102px 135px 136px 90px); + -moz-image-region: rect(136px 135px 170px 90px); } /*-------------------------------------------------------------------- * Change to multiweek view button *-------------------------------------------------------------------*/ -.toolbarbutton-1#calendar-multiweek-view-button { - list-style-image: url("chrome://calendar/skin/btnwm1.gif"); -} - #calendar-multiweek-view-button { padding-top: 1px; - -moz-image-region: rect(1px 45px 35px 0px); + -moz-image-region: rect(68px 45px 102px 0px); } #calendar-multiweek-view-button[disabled="true"], #calendar-multiweek-view-button[disabled="true"]:hover, #calendar-multiweek-view-button[disabled="true"]:hover:active, #calendar-multiweek-view-button:hover:active { - -moz-image-region: rect(1px 135px 35px 90px); + -moz-image-region: rect(68px 135px 102px 90px); } #calendar-multiweek-view-button:hover { - -moz-image-region: rect(1px 90px 35px 45px); + -moz-image-region: rect(68px 90px 102px 45px); } /*-------------------------------------------------------------------- @@ -232,18 +228,18 @@ #calendar-month-view-button { padding-top: 1px; - -moz-image-region: rect(68px 45px 102px 0px); + -moz-image-region: rect(102px 45px 136px 0px); } #calendar-month-view-button[disabled="true"], #calendar-month-view-button[disabled="true"]:hover, #calendar-month-view-button[disabled="true"]:hover:active, #calendar-month-view-button:hover:active { - -moz-image-region: rect(68px 135px 102px 90px); + -moz-image-region: rect(102px 135px 136px 90px); } #calendar-month-view-button:hover { - -moz-image-region: rect(68px 90px 102px 45px); + -moz-image-region: rect(102px 90px 136px 45px); } /*--------------------------------------------------------------------