From bc147d1c6c95c1ba1394f0198d9e5b810071a4ac Mon Sep 17 00:00:00 2001 From: Chad Kieffer Date: Tue, 1 Sep 2009 23:22:06 -0600 Subject: Merged admin_screen and screen style sheets in the admin theme. Removed some unsused admin styles in the process. Fixed problem in admin header that broke the theme's layout in IE7. Moved the Gallery logo and shortcut icon to lib/images for easier reuse. --- themes/default/images/favicon.ico | Bin 1150 -> 0 bytes themes/default/images/logo.png | Bin 10222 -> 0 bytes 2 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 themes/default/images/favicon.ico delete mode 100644 themes/default/images/logo.png (limited to 'themes/default/images') diff --git a/themes/default/images/favicon.ico b/themes/default/images/favicon.ico deleted file mode 100644 index 66531d8e..00000000 Binary files a/themes/default/images/favicon.ico and /dev/null differ diff --git a/themes/default/images/logo.png b/themes/default/images/logo.png deleted file mode 100644 index 7d7b9b9b..00000000 Binary files a/themes/default/images/logo.png and /dev/null differ -- cgit v1.2.3 From 8972d5f05ce4f37061bdd4dd2c8a1a19c1235611 Mon Sep 17 00:00:00 2001 From: Bharat Mediratta Date: Thu, 3 Sep 2009 10:20:54 -0700 Subject: Move the loading images into lib/images and adjust everything to point at them, including jquery.autocomplete.css so that we don't have stuff from lib that points into a theme directory. They were common images anyway. Incidentally, rename sm/lg to small/large. --- lib/images/loading-large.gif | Bin 0 -> 8238 bytes lib/images/loading-small.gif | Bin 0 -> 673 bytes lib/jquery.autocomplete.css | 10 +++++----- themes/admin_default/css/screen.css | 6 +++--- themes/admin_default/images/loading-lg.gif | Bin 8238 -> 0 bytes themes/admin_default/images/loading-sm.gif | Bin 673 -> 0 bytes themes/default/css/screen.css | 6 +++--- themes/default/images/loading-lg.gif | Bin 8238 -> 0 bytes themes/default/images/loading-sm.gif | Bin 673 -> 0 bytes 9 files changed, 11 insertions(+), 11 deletions(-) create mode 100644 lib/images/loading-large.gif create mode 100644 lib/images/loading-small.gif delete mode 100644 themes/admin_default/images/loading-lg.gif delete mode 100644 themes/admin_default/images/loading-sm.gif delete mode 100644 themes/default/images/loading-lg.gif delete mode 100644 themes/default/images/loading-sm.gif (limited to 'themes/default/images') diff --git a/lib/images/loading-large.gif b/lib/images/loading-large.gif new file mode 100644 index 00000000..cc70a7a8 Binary files /dev/null and b/lib/images/loading-large.gif differ diff --git a/lib/images/loading-small.gif b/lib/images/loading-small.gif new file mode 100644 index 00000000..d0bce154 Binary files /dev/null and b/lib/images/loading-small.gif differ diff --git a/lib/jquery.autocomplete.css b/lib/jquery.autocomplete.css index cdf26f56..00cd1c9b 100644 --- a/lib/jquery.autocomplete.css +++ b/lib/jquery.autocomplete.css @@ -20,15 +20,15 @@ padding: 2px 5px; cursor: default; display: block; - /* - if width will be 100% horizontal scrollbar will apear + /* + if width will be 100% horizontal scrollbar will apear when scroll mode will be used */ /*width: 100%;*/ font: menu; font-size: 12px; - /* - it is very important, if line-height not setted or setted + /* + it is very important, if line-height not setted or setted in relative units scroll will be broken in firefox */ line-height: 16px; @@ -36,7 +36,7 @@ } .ac_loading { - background: white url('../themes/default/images/loading-sm.gif') right center no-repeat; + background: white url('images/loading-small.gif') right center no-repeat; } .ac_odd { diff --git a/themes/admin_default/css/screen.css b/themes/admin_default/css/screen.css index c81db58d..4f802039 100644 --- a/themes/admin_default/css/screen.css +++ b/themes/admin_default/css/screen.css @@ -768,17 +768,17 @@ li.gDefaultGroup h4, li.gDefaultGroup .gUser { /* Ajax loading indicator ~~~~~~~~~~~~~~~~ */ .gLoadingLarge { - background: #e8e8e8 url('../images/loading-lg.gif') no-repeat center center; + background: #e8e8e8 url('../../../lib/images/loading-arge.gif') no-repeat center center; font-size: 0; } .gDialogLoadingLarge { - background: url('../images/loading-lg.gif') no-repeat center center !important; + background: url('../../../lib/images/loading-large.gif') no-repeat center center !important; font-size: 0; } .gLoadingSmall { - background: #e8e8e8 url('../images/loading-sm.gif') no-repeat center center; + background: #e8e8e8 url('../../../lib/images/loading-small.gif') no-repeat center center; font-size: 0; } diff --git a/themes/admin_default/images/loading-lg.gif b/themes/admin_default/images/loading-lg.gif deleted file mode 100644 index cc70a7a8..00000000 Binary files a/themes/admin_default/images/loading-lg.gif and /dev/null differ diff --git a/themes/admin_default/images/loading-sm.gif b/themes/admin_default/images/loading-sm.gif deleted file mode 100644 index d0bce154..00000000 Binary files a/themes/admin_default/images/loading-sm.gif and /dev/null differ diff --git a/themes/default/css/screen.css b/themes/default/css/screen.css index 96be8996..fd85d696 100644 --- a/themes/default/css/screen.css +++ b/themes/default/css/screen.css @@ -819,17 +819,17 @@ form .gError, /* Ajax loading indicator ~~~~~~~~~~~~~~~~ */ .gLoadingLarge { - background: #e8e8e8 url('../images/loading-lg.gif') no-repeat center center; + background: #e8e8e8 url('../../../lib/images/loading-large.gif') no-repeat center center; font-size: 0; } .gDialogLoadingLarge { - background: url('../images/loading-lg.gif') no-repeat center center !important; + background: url('../../../lib/images/loading-large.gif') no-repeat center center !important; font-size: 0; } .gLoadingSmall { - background: #e8e8e8 url('../images/loading-sm.gif') no-repeat center center; + background: #e8e8e8 url('../../../lib/images/loading-small.gif') no-repeat center center; font-size: 0; } diff --git a/themes/default/images/loading-lg.gif b/themes/default/images/loading-lg.gif deleted file mode 100644 index cc70a7a8..00000000 Binary files a/themes/default/images/loading-lg.gif and /dev/null differ diff --git a/themes/default/images/loading-sm.gif b/themes/default/images/loading-sm.gif deleted file mode 100644 index d0bce154..00000000 Binary files a/themes/default/images/loading-sm.gif and /dev/null differ -- cgit v1.2.3