From 5fc6e5f1269655550e6c30def79ad285b49dd6ad Mon Sep 17 00:00:00 2001 From: rvelices Date: Tue, 29 Nov 2011 19:27:25 +0000 Subject: bug 2515: a few icons are not in CSS sprite (start/stop filter are now) also removed many icons that are not used anymore since 2.2 git-svn-id: http://piwigo.org/svn/trunk@12671 68402e56-0260-453c-a942-63ccdbb3a9ee --- themes/default/icon/caddie_add.png | Bin 4170 -> 0 bytes themes/default/icon/calendar.png | Bin 844 -> 0 bytes themes/default/icon/calendar_created.png | Bin 1230 -> 0 bytes themes/default/icon/category_edit.png | Bin 1606 -> 0 bytes themes/default/icon/dec_period.png | Bin 1230 -> 0 bytes themes/default/icon/dec_period_unactive.png | Bin 1042 -> 0 bytes themes/default/icon/del_all_favorites.png | Bin 1391 -> 0 bytes themes/default/icon/del_favorite.png | Bin 1391 -> 0 bytes themes/default/icon/exit.png | Bin 1432 -> 0 bytes themes/default/icon/favorite.png | Bin 1460 -> 0 bytes themes/default/icon/first.png | Bin 1645 -> 0 bytes themes/default/icon/first_unactive.png | Bin 1573 -> 0 bytes themes/default/icon/flat.png | Bin 754 -> 0 bytes themes/default/icon/help.png | Bin 1994 -> 0 bytes themes/default/icon/home.png | Bin 1591 -> 0 bytes themes/default/icon/inc_period.png | Bin 1209 -> 0 bytes themes/default/icon/inc_period_unactive.png | Bin 1039 -> 0 bytes themes/default/icon/last.png | Bin 1642 -> 0 bytes themes/default/icon/last_unactive.png | Bin 1556 -> 0 bytes themes/default/icon/left.png | Bin 1644 -> 0 bytes themes/default/icon/left_unactive.png | Bin 1574 -> 0 bytes themes/default/icon/lost_password.png | Bin 1717 -> 0 bytes themes/default/icon/metadata.png | Bin 1520 -> 0 bytes themes/default/icon/normal_mode.png | Bin 360 -> 0 bytes themes/default/icon/pause.png | Bin 1597 -> 0 bytes themes/default/icon/play.png | Bin 1568 -> 0 bytes themes/default/icon/preferences.png | Bin 1606 -> 0 bytes themes/default/icon/register.png | Bin 1445 -> 0 bytes themes/default/icon/representative.png | Bin 1556 -> 0 bytes themes/default/icon/right.png | Bin 1661 -> 0 bytes themes/default/icon/right_unactive.png | Bin 1556 -> 0 bytes themes/default/icon/save.png | Bin 961 -> 0 bytes themes/default/icon/search_rules.png | Bin 1509 -> 0 bytes themes/default/icon/start_repeat.png | Bin 1691 -> 0 bytes themes/default/icon/start_slideshow.png | Bin 1344 -> 0 bytes themes/default/icon/stop_repeat.png | Bin 1683 -> 0 bytes themes/default/icon/tag_cloud.png | Bin 1165 -> 0 bytes themes/default/icon/tag_letters.png | Bin 882 -> 0 bytes themes/default/icon/up.png | Bin 1641 -> 0 bytes themes/default/iconset.css | 2 ++ themes/default/s26/outline_005e89.png | Bin 1737 -> 1920 bytes themes/default/s26/outline_808060.png | Bin 1737 -> 1920 bytes themes/default/s26/outline_808080.png | Bin 1737 -> 2429 bytes themes/default/s26/outline_ff3363.png | Bin 1737 -> 1920 bytes themes/default/s26/outline_ff7700.png | Bin 1737 -> 1920 bytes themes/default/s26/outline_ffff80.png | Bin 1737 -> 1920 bytes themes/default/s26/outline_ffffff.png | Bin 1766 -> 2116 bytes themes/default/template/menubar_categories.tpl | 12 ++++++------ themes/default/theme.css | 9 ++------- 49 files changed, 10 insertions(+), 13 deletions(-) delete mode 100644 themes/default/icon/caddie_add.png delete mode 100644 themes/default/icon/calendar.png delete mode 100644 themes/default/icon/calendar_created.png delete mode 100644 themes/default/icon/category_edit.png delete mode 100644 themes/default/icon/dec_period.png delete mode 100644 themes/default/icon/dec_period_unactive.png delete mode 100644 themes/default/icon/del_all_favorites.png delete mode 100644 themes/default/icon/del_favorite.png delete mode 100644 themes/default/icon/exit.png delete mode 100644 themes/default/icon/favorite.png delete mode 100644 themes/default/icon/first.png delete mode 100644 themes/default/icon/first_unactive.png delete mode 100644 themes/default/icon/flat.png delete mode 100644 themes/default/icon/help.png delete mode 100644 themes/default/icon/home.png delete mode 100644 themes/default/icon/inc_period.png delete mode 100644 themes/default/icon/inc_period_unactive.png delete mode 100644 themes/default/icon/last.png delete mode 100644 themes/default/icon/last_unactive.png delete mode 100644 themes/default/icon/left.png delete mode 100644 themes/default/icon/left_unactive.png delete mode 100644 themes/default/icon/lost_password.png delete mode 100644 themes/default/icon/metadata.png delete mode 100644 themes/default/icon/normal_mode.png delete mode 100644 themes/default/icon/pause.png delete mode 100644 themes/default/icon/play.png delete mode 100644 themes/default/icon/preferences.png delete mode 100644 themes/default/icon/register.png delete mode 100644 themes/default/icon/representative.png delete mode 100644 themes/default/icon/right.png delete mode 100644 themes/default/icon/right_unactive.png delete mode 100644 themes/default/icon/save.png delete mode 100644 themes/default/icon/search_rules.png delete mode 100644 themes/default/icon/start_repeat.png delete mode 100644 themes/default/icon/start_slideshow.png delete mode 100644 themes/default/icon/stop_repeat.png delete mode 100644 themes/default/icon/tag_cloud.png delete mode 100644 themes/default/icon/tag_letters.png delete mode 100644 themes/default/icon/up.png (limited to 'themes/default') diff --git a/themes/default/icon/caddie_add.png b/themes/default/icon/caddie_add.png deleted file mode 100644 index 5ed7fe695..000000000 Binary files a/themes/default/icon/caddie_add.png and /dev/null differ diff --git a/themes/default/icon/calendar.png b/themes/default/icon/calendar.png deleted file mode 100644 index e0a44a13d..000000000 Binary files a/themes/default/icon/calendar.png and /dev/null differ diff --git a/themes/default/icon/calendar_created.png b/themes/default/icon/calendar_created.png deleted file mode 100644 index 14a84c43c..000000000 Binary files a/themes/default/icon/calendar_created.png and /dev/null differ diff --git a/themes/default/icon/category_edit.png b/themes/default/icon/category_edit.png deleted file mode 100644 index 0f3b619ed..000000000 Binary files a/themes/default/icon/category_edit.png and /dev/null differ diff --git a/themes/default/icon/dec_period.png b/themes/default/icon/dec_period.png deleted file mode 100644 index 107cd16ec..000000000 Binary files a/themes/default/icon/dec_period.png and /dev/null differ diff --git a/themes/default/icon/dec_period_unactive.png b/themes/default/icon/dec_period_unactive.png deleted file mode 100644 index 5bc67affd..000000000 Binary files a/themes/default/icon/dec_period_unactive.png and /dev/null differ diff --git a/themes/default/icon/del_all_favorites.png b/themes/default/icon/del_all_favorites.png deleted file mode 100644 index 7f39903e2..000000000 Binary files a/themes/default/icon/del_all_favorites.png and /dev/null differ diff --git a/themes/default/icon/del_favorite.png b/themes/default/icon/del_favorite.png deleted file mode 100644 index 7f39903e2..000000000 Binary files a/themes/default/icon/del_favorite.png and /dev/null differ diff --git a/themes/default/icon/exit.png b/themes/default/icon/exit.png deleted file mode 100644 index 2aafbb4cb..000000000 Binary files a/themes/default/icon/exit.png and /dev/null differ diff --git a/themes/default/icon/favorite.png b/themes/default/icon/favorite.png deleted file mode 100644 index f92284a47..000000000 Binary files a/themes/default/icon/favorite.png and /dev/null differ diff --git a/themes/default/icon/first.png b/themes/default/icon/first.png deleted file mode 100644 index 2b8db1cff..000000000 Binary files a/themes/default/icon/first.png and /dev/null differ diff --git a/themes/default/icon/first_unactive.png b/themes/default/icon/first_unactive.png deleted file mode 100644 index f0c0364f2..000000000 Binary files a/themes/default/icon/first_unactive.png and /dev/null differ diff --git a/themes/default/icon/flat.png b/themes/default/icon/flat.png deleted file mode 100644 index 43584e825..000000000 Binary files a/themes/default/icon/flat.png and /dev/null differ diff --git a/themes/default/icon/help.png b/themes/default/icon/help.png deleted file mode 100644 index c76f68292..000000000 Binary files a/themes/default/icon/help.png and /dev/null differ diff --git a/themes/default/icon/home.png b/themes/default/icon/home.png deleted file mode 100644 index cce450d85..000000000 Binary files a/themes/default/icon/home.png and /dev/null differ diff --git a/themes/default/icon/inc_period.png b/themes/default/icon/inc_period.png deleted file mode 100644 index 28fef3d1b..000000000 Binary files a/themes/default/icon/inc_period.png and /dev/null differ diff --git a/themes/default/icon/inc_period_unactive.png b/themes/default/icon/inc_period_unactive.png deleted file mode 100644 index f45507dce..000000000 Binary files a/themes/default/icon/inc_period_unactive.png and /dev/null differ diff --git a/themes/default/icon/last.png b/themes/default/icon/last.png deleted file mode 100644 index 12e1367a7..000000000 Binary files a/themes/default/icon/last.png and /dev/null differ diff --git a/themes/default/icon/last_unactive.png b/themes/default/icon/last_unactive.png deleted file mode 100644 index 90469d5c4..000000000 Binary files a/themes/default/icon/last_unactive.png and /dev/null differ diff --git a/themes/default/icon/left.png b/themes/default/icon/left.png deleted file mode 100644 index 63d306c9c..000000000 Binary files a/themes/default/icon/left.png and /dev/null differ diff --git a/themes/default/icon/left_unactive.png b/themes/default/icon/left_unactive.png deleted file mode 100644 index 0aefc64e4..000000000 Binary files a/themes/default/icon/left_unactive.png and /dev/null differ diff --git a/themes/default/icon/lost_password.png b/themes/default/icon/lost_password.png deleted file mode 100644 index ad6d71422..000000000 Binary files a/themes/default/icon/lost_password.png and /dev/null differ diff --git a/themes/default/icon/metadata.png b/themes/default/icon/metadata.png deleted file mode 100644 index d5d8fa6dc..000000000 Binary files a/themes/default/icon/metadata.png and /dev/null differ diff --git a/themes/default/icon/normal_mode.png b/themes/default/icon/normal_mode.png deleted file mode 100644 index 92d27a234..000000000 Binary files a/themes/default/icon/normal_mode.png and /dev/null differ diff --git a/themes/default/icon/pause.png b/themes/default/icon/pause.png deleted file mode 100644 index 6a3928c51..000000000 Binary files a/themes/default/icon/pause.png and /dev/null differ diff --git a/themes/default/icon/play.png b/themes/default/icon/play.png deleted file mode 100644 index dfde7e96a..000000000 Binary files a/themes/default/icon/play.png and /dev/null differ diff --git a/themes/default/icon/preferences.png b/themes/default/icon/preferences.png deleted file mode 100644 index 0f3b619ed..000000000 Binary files a/themes/default/icon/preferences.png and /dev/null differ diff --git a/themes/default/icon/register.png b/themes/default/icon/register.png deleted file mode 100644 index d1dd3c834..000000000 Binary files a/themes/default/icon/register.png and /dev/null differ diff --git a/themes/default/icon/representative.png b/themes/default/icon/representative.png deleted file mode 100644 index f1141d91b..000000000 Binary files a/themes/default/icon/representative.png and /dev/null differ diff --git a/themes/default/icon/right.png b/themes/default/icon/right.png deleted file mode 100644 index f998098e4..000000000 Binary files a/themes/default/icon/right.png and /dev/null differ diff --git a/themes/default/icon/right_unactive.png b/themes/default/icon/right_unactive.png deleted file mode 100644 index cf2f9614c..000000000 Binary files a/themes/default/icon/right_unactive.png and /dev/null differ diff --git a/themes/default/icon/save.png b/themes/default/icon/save.png deleted file mode 100644 index b4b9da08b..000000000 Binary files a/themes/default/icon/save.png and /dev/null differ diff --git a/themes/default/icon/search_rules.png b/themes/default/icon/search_rules.png deleted file mode 100644 index 300186647..000000000 Binary files a/themes/default/icon/search_rules.png and /dev/null differ diff --git a/themes/default/icon/start_repeat.png b/themes/default/icon/start_repeat.png deleted file mode 100644 index 74272979e..000000000 Binary files a/themes/default/icon/start_repeat.png and /dev/null differ diff --git a/themes/default/icon/start_slideshow.png b/themes/default/icon/start_slideshow.png deleted file mode 100644 index 9733eb445..000000000 Binary files a/themes/default/icon/start_slideshow.png and /dev/null differ diff --git a/themes/default/icon/stop_repeat.png b/themes/default/icon/stop_repeat.png deleted file mode 100644 index f1cc1b564..000000000 Binary files a/themes/default/icon/stop_repeat.png and /dev/null differ diff --git a/themes/default/icon/tag_cloud.png b/themes/default/icon/tag_cloud.png deleted file mode 100644 index 79d7bc250..000000000 Binary files a/themes/default/icon/tag_cloud.png and /dev/null differ diff --git a/themes/default/icon/tag_letters.png b/themes/default/icon/tag_letters.png deleted file mode 100644 index d452db7ec..000000000 Binary files a/themes/default/icon/tag_letters.png and /dev/null differ diff --git a/themes/default/icon/up.png b/themes/default/icon/up.png deleted file mode 100644 index 0c9cda5b1..000000000 Binary files a/themes/default/icon/up.png and /dev/null differ diff --git a/themes/default/iconset.css b/themes/default/iconset.css index 3af5b40ba..ab53b9fd1 100644 --- a/themes/default/iconset.css +++ b/themes/default/iconset.css @@ -45,6 +45,8 @@ .pwg-icon-favorite {background-position: -78px -78px} .pwg-icon-favorite-add {background-position: -104px -78px} .pwg-icon-favorite-del {background-position: -130px -78px} +.pwg-icon-filter {background-position: -156px -78px} +.pwg-icon-filter-del {background-position: -182px -78px} .pwg-icon-camera-info {background-position: 0 -104px} .pwg-icon-representative {background-position: -26px -104px} diff --git a/themes/default/s26/outline_005e89.png b/themes/default/s26/outline_005e89.png index f5681ca93..1097a5242 100644 Binary files a/themes/default/s26/outline_005e89.png and b/themes/default/s26/outline_005e89.png differ diff --git a/themes/default/s26/outline_808060.png b/themes/default/s26/outline_808060.png index fc775f6c3..4cfb932fe 100644 Binary files a/themes/default/s26/outline_808060.png and b/themes/default/s26/outline_808060.png differ diff --git a/themes/default/s26/outline_808080.png b/themes/default/s26/outline_808080.png index d8ac3780a..4cac9ecbb 100644 Binary files a/themes/default/s26/outline_808080.png and b/themes/default/s26/outline_808080.png differ diff --git a/themes/default/s26/outline_ff3363.png b/themes/default/s26/outline_ff3363.png index e6467b9bd..5db5cce9a 100644 Binary files a/themes/default/s26/outline_ff3363.png and b/themes/default/s26/outline_ff3363.png differ diff --git a/themes/default/s26/outline_ff7700.png b/themes/default/s26/outline_ff7700.png index 470f1446b..4e07b085f 100644 Binary files a/themes/default/s26/outline_ff7700.png and b/themes/default/s26/outline_ff7700.png differ diff --git a/themes/default/s26/outline_ffff80.png b/themes/default/s26/outline_ffff80.png index b6f78e49f..209a3dd52 100644 Binary files a/themes/default/s26/outline_ffff80.png and b/themes/default/s26/outline_ffff80.png differ diff --git a/themes/default/s26/outline_ffffff.png b/themes/default/s26/outline_ffffff.png index 5c9db3be1..d27b992fa 100644 Binary files a/themes/default/s26/outline_ffffff.png and b/themes/default/s26/outline_ffffff.png differ diff --git a/themes/default/template/menubar_categories.tpl b/themes/default/template/menubar_categories.tpl index 6f3b8d310..65a149cff 100644 --- a/themes/default/template/menubar_categories.tpl +++ b/themes/default/template/menubar_categories.tpl @@ -1,10 +1,10 @@
- {if isset($U_START_FILTER)} - start filter - {/if} - {if isset($U_STOP_FILTER)} - stop filter - {/if} + {if isset($U_START_FILTER)} + + {/if} + {if isset($U_STOP_FILTER)} + + {/if} {'Albums'|@translate}
diff --git a/themes/default/theme.css b/themes/default/theme.css index b6b5cbf1f..d8a219d89 100644 --- a/themes/default/theme.css +++ b/themes/default/theme.css @@ -14,14 +14,9 @@ margin: 0; padding: 0; display: block; } -#menubar .button { - margin: -2px 2px 2px; - width: auto; - padding: 0; - text-indent: 0; - list-style: none; - text-align: center; +.menubarFilter { float: right; + margin: -4px 0 0; } /* H2 properties copied here */ -- cgit v1.2.3