aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>2011-04-07 02:43:03 +0000
committercash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>2011-04-07 02:43:03 +0000
commit0f925897123a97a06e0c296f3cd5fa0e81a06ce2 (patch)
tree1a653191ff43f7a39d28220a1edd454c61e9d6d3
parentb0e834d9124b4ee7d374e54eaa60942ca5e8b3c7 (diff)
downloadelgg-0f925897123a97a06e0c296f3cd5fa0e81a06ce2.tar.gz
elgg-0f925897123a97a06e0c296f3cd5fa0e81a06ce2.tar.bz2
Fixes #3108 added admin sprites (enough for beta release)
git-svn-id: http://code.elgg.org/elgg/trunk@8949 36083f99-b078-4883-b0ff-0f9b5a30f544
-rw-r--r--_graphics/admin_sprites.pngbin0 -> 1797 bytes
-rw-r--r--views/default/admin/appearance/profile_fields/list.php2
-rw-r--r--views/default/css/admin.php91
3 files changed, 27 insertions, 66 deletions
diff --git a/_graphics/admin_sprites.png b/_graphics/admin_sprites.png
new file mode 100644
index 000000000..1d18c17ae
--- /dev/null
+++ b/_graphics/admin_sprites.png
Binary files differ
diff --git a/views/default/admin/appearance/profile_fields/list.php b/views/default/admin/appearance/profile_fields/list.php
index 16e34ffab..542ab1b6f 100644
--- a/views/default/admin/appearance/profile_fields/list.php
+++ b/views/default/admin/appearance/profile_fields/list.php
@@ -37,7 +37,7 @@ foreach ($items as $item) {
$url = elgg_view('output/url', array(
'href' => "action/profile/fields/delete?id={$item->shortname}",
'is_action' => TRUE,
- 'text' => elgg_view_icon('delete'),
+ 'text' => elgg_view_icon('delete-alt'),
));
$type = elgg_echo($item->type);
echo <<<HTML
diff --git a/views/default/css/admin.php b/views/default/css/admin.php
index b57b42db3..5fb85676e 100644
--- a/views/default/css/admin.php
+++ b/views/default/css/admin.php
@@ -699,15 +699,23 @@ input[type="submit"]:hover, .elgg-button-submit:hover, .elgg-button-action:hover
width: 18px;
height: 18px;
padding: 2px 2px 0 0;
- border: 1px solid transparent;
}
.elgg-widget-collapse-button {
left: 5px;
- background:transparent url(<?php echo elgg_get_site_url(); ?>_graphics/elgg_sprites.png) no-repeat 0px -385px;
+ color: #c5c5c5;
+ text-decoration: none;
+}
+a.elgg-widget-collapse-button:hover,
+a.elgg-widget-collapsed:hover {
+ color: #9d9d9d;
+ text-decoration: none;
}
-.elgg-widget-collapsed {
- background-position: 0px -365px;
+a.elgg-widget-collapse-button:before {
+ content: "\25BC";
+}
+a.elgg-widget-collapsed:before {
+ content: "\25BA";
}
.elgg-widget-delete-button {
right: 5px;
@@ -715,10 +723,6 @@ input[type="submit"]:hover, .elgg-button-submit:hover, .elgg-button-action:hover
.elgg-widget-edit-button {
right: 25px;
}
-.elgg-module-widget .elgg-widget-edit-button:hover,
-.elgg-module-widget .elgg-widget-delete-button:hover {
- border: 1px solid #ccc;
-}
.elgg-module-widget > .elgg-body {
border-top: 1px solid #dedede;
background-color: white;
@@ -861,72 +865,29 @@ a.elgg-longtext-control {
ICONS
*************************************** */
.elgg-icon {
- background: transparent url(<?php echo elgg_get_site_url(); ?>_graphics/elgg_sprites.png) no-repeat left;
+ background: transparent url(<?php echo elgg_get_site_url(); ?>_graphics/admin_sprites.png) no-repeat left;
width: 16px;
height: 16px;
- display: block;
- float: left;
+ display: inline-block;
margin: 0 2px;
}
-.elgg-icon-settings {
- background-position: -302px -44px;
-}
-.elgg-icon-friends {
- background-position: 0 -300px;
- width: 36px;
-}
-.elgg-icon-friends:hover {
- background-position: 0 -340px;
+.elgg-icon-delete-alt:hover {
+ background-position: 0 -0px;
}
-.elgg-icon-help {
- background-position: -302px -136px;
+.elgg-icon-delete-alt {
+ background-position: 0 -18px;
}
-.elgg-icon-delete {
- background-position: -199px 1px;
+.elgg-icon-drag-arrow:hover {
+ background-position: 0 -36px;
}
-.elgg-icon-delete:hover {
- background-position: -199px -15px;
+.elgg-icon-drag-arrow {
+ background-position: 0 -54px;
}
-.elgg-icon-thumbs-up {
- background-position: 0px -101px;
- width: 20px;
- height: 20px;
-}
-.elgg-icon-thumbs-up:hover {
- background-position: 0px -131px;
-}
-.elgg-icon-thumbs-up-alt {
- background-position: 0px -131px;
- width: 20px;
- height: 20px;
-}
-.elgg-icon-arrow-s {
- background-position: -146px -56px;
-}
-.elgg-icon-arrow-s:hover {
- background-position: -146px -76px;
-}
-.elgg-icon-following {
- background-position: -35px -100px;
- width: 22px;
- height: 20px;
-}
-.elgg-icon-rss {
- background-position: -249px 1px;
-}
-.elgg-icon-hover-menu {
- background-position: -150px 0;
-}
-.elgg-icon-hover-menu:hover {
- background-position: -150px -32px;
-}
-.elgg-icon-dragger {
- background-position: -302px -186px;
- width: 21px;
- height: 21px;
+.elgg-icon-settings-alt:hover {
+ background-position: 0 -72px;
}
-.elgg-icon-gear {
- background-position: -300px -2px;
+.elgg-icon-settings-alt {
+ background-position: 0 -90px;
}
.elgg-ajax-loader {