From 7626e48e0172ffcbdca9c14f27134b03e0e501fb Mon Sep 17 00:00:00 2001 From: rvelices Date: Sun, 12 Dec 2010 12:22:49 +0000 Subject: css sprites git-svn-id: http://piwigo.org/svn/trunk@8091 68402e56-0260-453c-a942-63ccdbb3a9ee --- themes/clear/theme.css | 5 +- themes/default/iconset.css | 37 +++---- themes/default/sprite.png | Bin 6128 -> 7034 bytes themes/default/template/about.tpl | 6 +- themes/default/template/index.tpl | 145 +++++++++++++++------------- themes/default/template/nbm.tpl | 14 +-- themes/default/template/password.tpl | 14 +-- themes/default/template/picture_toolbar.tpl | 2 +- themes/default/template/popuphelp.tpl | 14 ++- themes/default/template/search_rules.tpl | 14 ++- themes/default/template/upload.tpl | 15 +-- themes/default/theme.css | 1 - 12 files changed, 133 insertions(+), 134 deletions(-) diff --git a/themes/clear/theme.css b/themes/clear/theme.css index dc690e1d9..07e86ecda 100644 --- a/themes/clear/theme.css +++ b/themes/clear/theme.css @@ -50,8 +50,9 @@ UL.thumbnails SPAN.wrap2:hover, /* links */ A, INPUT.rateButton { - color: #005e89; - background: transparent; + color: #005e89; + background: transparent; + border-bottom: 1px dotted #005e89; } A:hover, INPUT.rateButton:hover { diff --git a/themes/default/iconset.css b/themes/default/iconset.css index bd9f3f9e6..5be7cbde4 100644 --- a/themes/default/iconset.css +++ b/themes/default/iconset.css @@ -6,13 +6,13 @@ } .pwg-button-text { display:none; } -a.pwg-state-default, a.pwg-state-default:visited, a.pwg-state-default:hover { +A.pwg-state-default, A.pwg-state-default:visited, A.pwg-state-default:hover { text-decoration: none !important; } .pwg-state-disabled .pwg-icon { opacity: .5; - -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=50)";! + -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=50)"; filter: alpha(opacity=50); } @@ -23,10 +23,11 @@ a.pwg-state-default, a.pwg-state-default:visited, a.pwg-state-default:hover { .pwg-icon-home {background-position: -26px 0} .pwg-icon-camera {background-position: -52px 0} -.pwg-icon-calendar {background-position: -78px 0} -.pwg-icon-save {background-position: -104px 0} -.pwg-icon-cloud {background-position: -130px 0} -.pwg-icon-letters {background-position: -156px 0} +.pwg-icon-save {background-position: -78px 0} +.pwg-icon-cloud {background-position: -104px 0} +.pwg-icon-letters {background-position: -130px 0} +.pwg-icon-calendar {background-position: -156px 0} +.pwg-icon-camera-calendar {background-position: -182px 0} .pwg-icon-arrow-n {background-position: 0 -26px} .pwg-icon-arrow-e {background-position: -26px -26px} @@ -37,6 +38,11 @@ a.pwg-state-default, a.pwg-state-default:visited, a.pwg-state-default:hover { .pwg-icon-arrowstop-s {background-position: -156px -26px} .pwg-icon-arrowstop-w {background-position: -182px -26px} +.pwg-icon-close {background-position: 0 -52px} +.pwg-icon-category-edit {background-position: -26px -52px} +.pwg-icon-category-view-normal {background-position: -156px -52px} +.pwg-icon-category-view-flat {background-position: -182px -52px} + .pwg-icon-caddie {background-position: 0 -78px} .pwg-icon-caddie-add {background-position: -26px -78px} .pwg-icon-caddie-del {background-position: -52px -78px} @@ -45,7 +51,7 @@ a.pwg-state-default, a.pwg-state-default:visited, a.pwg-state-default:hover { .pwg-icon-favorite-del {background-position: -130px -78px} .pwg-icon-camera-info {background-position: 0 -104px} -.pwg-icon-camera-representative {background-position: -26px -104px} +.pwg-icon-representative {background-position: -26px -104px} .pwg-icon-edit {background-position: -52px -104px} .pwg-icon-register {background-position: -78px -104px} .pwg-icon-lost-password {background-position: -104px -104px} @@ -59,23 +65,6 @@ a.pwg-state-default, a.pwg-state-default:visited, a.pwg-state-default:hover { .pwg-icon-repeat-play {background-position: -156px -130px} .pwg-icon-repeat-stop {background-position: -182px -130px} -/* -.pwg-icon-camera-calendar -flat -normal -filter-plus -filter-minus - -.pwg-icon-stop - -.pwg-icon-time -.pwg-icon-time-plus -.pwg-icon-time-minus -.pwg-icon-repeat -.pwg-icon-repeat-yes -.pwg-icon-repeat-no -*/ - A.pwg-button { border: 1px solid blue; diff --git a/themes/default/sprite.png b/themes/default/sprite.png index dfeaaf74a..df0627c42 100644 Binary files a/themes/default/sprite.png and b/themes/default/sprite.png differ diff --git a/themes/default/template/about.tpl b/themes/default/template/about.tpl index 9e9515386..eca44dbed 100644 --- a/themes/default/template/about.tpl +++ b/themes/default/template/about.tpl @@ -1,9 +1,9 @@

{'About'|@translate}

diff --git a/themes/default/template/index.tpl b/themes/default/template/index.tpl index 37f577f84..8c68cfd8b 100644 --- a/themes/default/template/index.tpl +++ b/themes/default/template/index.tpl @@ -1,76 +1,85 @@ {$MENUBAR} {if !empty($PLUGIN_INDEX_CONTENT_BEFORE)}{$PLUGIN_INDEX_CONTENT_BEFORE}{/if}
-
-
    - {if !empty($image_orders) } -
  • - {'Sort order'|@translate}: - -
    • - {/if} - - {if isset($favorite) } -
  • favorite
    • - {/if} - - {if isset($U_CADDIE) } -
  • {'caddie'|@translate}
    • - {/if} - - {if isset($U_EDIT) } -
  • {'edit'|@translate}
    • - {/if} - - {if isset($U_SEARCH_RULES) } - {combine_script id='core.scripts' load='async' path='themes/default/js/scripts.js'} -
  • (?)
    • - {/if} - - {if isset($U_SLIDESHOW) } -
  • {'slideshow'|@translate}
    • - {/if} - - {if isset($U_MODE_FLAT) } -
  • {'display all elements in all sub-albums'|@translate}
    • - {/if} - - {if isset($U_MODE_NORMAL) } -
  • {'return to normal view mode'|@translate}
    • - {/if} - - {if isset($U_MODE_POSTED) } -
  • {'display a calendar by posted date'|@translate}
    • - {/if} - - {if isset($U_MODE_CREATED) } -
  • {'display a calendar by creation date'|@translate}
    • - {/if} - - {if !empty($PLUGIN_INDEX_ACTIONS)}{$PLUGIN_INDEX_ACTIONS}{/if} -
- -

{$TITLE}

- - {if isset($chronology_views) } -
{'View'|@translate}: - -
- {/if} +
+ + +

{$TITLE}

+ +{if isset($chronology_views)} +
{'View'|@translate}: + +
+{/if} - {if isset($chronology.TITLE) } -

{$chronology.TITLE}

- {/if} +{if isset($chronology.TITLE) } +

{$chronology.TITLE}

+{/if} -
+
{if !empty($PLUGIN_INDEX_CONTENT_BEGIN)}{$PLUGIN_INDEX_CONTENT_BEGIN}{/if} diff --git a/themes/default/template/nbm.tpl b/themes/default/template/nbm.tpl index 39574881e..5c40d2938 100644 --- a/themes/default/template/nbm.tpl +++ b/themes/default/template/nbm.tpl @@ -1,11 +1,13 @@
-
-
    -
  • {'Home'|@translate}
    • -
-

{'Notification'|@translate}

-
+
+ +

{'Notification'|@translate}

+
{if not empty($errors)}
diff --git a/themes/default/template/password.tpl b/themes/default/template/password.tpl index 413286e29..def94dff8 100644 --- a/themes/default/template/password.tpl +++ b/themes/default/template/password.tpl @@ -1,11 +1,13 @@
-
-
    -
  • {'Home'|@translate}
    • -
-

{'Password forgotten'|@translate}

-
+
+ +

{'Password forgotten'|@translate}

+
{if count($errors)}
diff --git a/themes/default/template/picture_toolbar.tpl b/themes/default/template/picture_toolbar.tpl index e6f0d8edd..7ea2e80c5 100644 --- a/themes/default/template/picture_toolbar.tpl +++ b/themes/default/template/picture_toolbar.tpl @@ -17,7 +17,7 @@ {/if} {if isset($PLUGIN_PICTURE_ACTIONS)}{$PLUGIN_PICTURE_ACTIONS}{/if} {if isset($favorite)} - +  {'Favorites'|@translate} {/if} diff --git a/themes/default/template/popuphelp.tpl b/themes/default/template/popuphelp.tpl index 89cba8578..523ad4942 100644 --- a/themes/default/template/popuphelp.tpl +++ b/themes/default/template/popuphelp.tpl @@ -1,14 +1,12 @@
-
+
-

{$PAGE_TITLE}

-
+

{$PAGE_TITLE}

+
{$HELP_CONTENT} diff --git a/themes/default/template/search_rules.tpl b/themes/default/template/search_rules.tpl index adc1f9193..db334b859 100644 --- a/themes/default/template/search_rules.tpl +++ b/themes/default/template/search_rules.tpl @@ -1,14 +1,12 @@
-
+
-

{'Search rules'|@translate}

-
+

{'Search rules'|@translate}

+
{if isset($INTRODUCTION) }

{$INTRODUCTION}

diff --git a/themes/default/template/upload.tpl b/themes/default/template/upload.tpl index 6e6bdc42a..268ccbfa7 100644 --- a/themes/default/template/upload.tpl +++ b/themes/default/template/upload.tpl @@ -1,4 +1,3 @@ - {* Example of resizeable *} {* {include file='include/autosize.inc.tpl'} @@ -6,12 +5,14 @@
-
-
    -
  • {'Home'|@translate}
    • -
-

{'Upload a picture'|@translate}

-
+
+ +

{'Upload a picture'|@translate}

+
{if !empty($errors)}
diff --git a/themes/default/theme.css b/themes/default/theme.css index e0cf02373..ee84b150a 100644 --- a/themes/default/theme.css +++ b/themes/default/theme.css @@ -455,7 +455,6 @@ H2 { A { text-decoration:none; - border-bottom: 1px dotted #005e89; } A:hover { border-bottom: 1px solid #858460; -- cgit v1.2.3