Icon cleanup

diff --git a/CRM/Core/BAO/Navigation.php b/CRM/Core/BAO/Navigation.php
index 2eb3042d5cabdf604e3e1757433441670d60bcc1..ec1b4ddefada470dfc9b3053a745cd8fc913c064 100644 (file)
--- a/CRM/Core/BAO/Navigation.php
+++ b/CRM/Core/BAO/Navigation.php
@@ -599,7 +599,7 @@ ORDER BY parent_id, weight";
       // get home menu from db
       $homeParams = array('name' => 'Home');
       $homeNav = array();
-      $homeIcon = '<img src="' . $config->userFrameworkResourceURL . 'i/logo16px.png" style="vertical-align:middle;" />';
+      $homeIcon = '<span class="crm-logo-sm" ></span>';
       self::retrieve($homeParams, $homeNav);
       if ($homeNav) {
         list($path, $q) = explode('?', $homeNav['url']);

diff --git a/CRM/Core/Resources.php b/CRM/Core/Resources.php
index b3effac2b51433979fd6e407c146c274b9428b5a..fae2d0b2c37ac734c7c748678bb63a0786e5f0bb 100644 (file)
--- a/CRM/Core/Resources.php
+++ b/CRM/Core/Resources.php
@@ -695,7 +695,7 @@ class CRM_Core_Resources {
     // These scripts are only needed by back-office users
     if (CRM_Core_Permission::check('access CiviCRM')) {
       $items[] = "packages/jquery/plugins/jquery.menu$min.js";
-      $items[] = "packages/jquery/css/menu.css";
+      $items[] = "css/navigation.css";
       $items[] = "packages/jquery/plugins/jquery.jeditable$min.js";
       $items[] = "packages/jquery/plugins/jquery.notify$min.js";
       $items[] = "js/jquery/jquery.crmeditable.js";

diff --git a/css/civicrm.css b/css/civicrm.css
index 2fa64257dbe9181725dc9a6f2937e13f8d9f468e..483a0503db6554c2dec984cca99e9f5a6e49ba3c 100644 (file)
--- a/css/civicrm.css
+++ b/css/civicrm.css
@@ -3296,7 +3296,7 @@ div.m ul#civicrm-menu,
   color: #F5F6F1;
 }
 .crm-container .ui-dialog-title {
-  background: url("../i/logo16px.png") no-repeat scroll 0 center;
+  background: url("../i/item_sprites.png") no-repeat scroll -79px -47px;
   margin-left: -5px;
   padding-left: 25px;
 }

diff --git a/css/navigation.css b/css/navigation.css
new file mode 100644 (file)
index 0000000..feb8325
--- /dev/null
+++ b/css/navigation.css
@@ -0,0 +1,135 @@
+html>body div.outerbox
+{
+  padding: 0 5px 5px 0;
+  z-index:999999;
+  font-size: 13px;
+  margin-top:2px;
+}
+html>body div.outerbox div.shadowbox1
+{
+  position: absolute;
+  right: 0;
+  bottom: 5px;
+  width: 5px;
+  height: 100%;
+  background: url(../i/myshadow.png) no-repeat right top;
+}
+html>body div.outerbox div.shadowbox2
+{
+  position: absolute;
+  bottom: 0;
+  right: 5px;
+  height: 5px;
+  width: 100%;
+  background: url(../i/myshadow.png) left bottom;
+}
+html>body div.outerbox div.shadowbox3
+{
+  position: absolute;
+  bottom: 0;
+  right: 0;
+  height: 5px;
+  width: 5px;
+  background: url(../i/myshadow.png) no-repeat right bottom;
+}
+html>body .innerbox
+{
+  margin: 0;
+  z-index:999999;
+  margin-left:10px;
+}
+
+#root-menu-div ul {
+  border: 1px solid #000;
+}
+#root-menu-div li{
+  white-space:nowrap;
+  background-image: none;
+  text-align: left;
+}
+* html #root-menu-div li{
+  height: 1.5em; /* fixing ie6 problem */
+}
+#civicrm-menu,
+#root-menu-div ul {
+  list-style: none;
+  margin: 0;
+  padding: 0;
+  background:#5D5D5D;
+  color: white;
+  cursor: default;
+  font-size: 12px;
+  font-family: Tahoma, Verdana, Arial, Sans;
+}
+
+#civicrm-menu {
+  position:absolute;
+  top:0;
+  left:0;
+  background:#1B1B1B repeat-x;
+  width:100%;
+  height:27px;
+  z-index:99999;
+  overflow: hidden;
+}
+
+li.menu-separator.active{
+  background-color: transparent;
+}
+
+.menu-ul li.active {
+  background-color: #aaa;
+}
+
+#civicrm-menu .activetarget{
+  background-color: #aaa;
+}
+
+#civicrm-menu li a, #root-menu-div li a {
+  color:white;
+  cursor:pointer;
+  display:block;
+  font-weight:normal;
+  text-decoration:none;
+}
+
+* html div.menu-item {
+  display: inline; /* fixes problem in ie6 */
+}
+
+li.menumain {
+  float: left;
+  padding: 3px 10px;
+  background-image: none;
+  border-right: 1px solid #5D5D5D;
+  margin:0;
+}
+
+#root-menu-div .menu-ul li {
+  margin: 0;
+  padding: 0 20px 0 2px;
+}
+
+div.menu-item {
+  padding: 1px 10px 1px 4px;
+  height: auto;
+}
+img.menu-item-arrow{
+  position: absolute;
+  right: 4px;
+  top: 8px;
+}
+li.menu-separator{
+  border-bottom: 1px solid #000;
+  font-size: 0; /* for ie */
+  height: 0;
+  line-height: 0; /* for ie */
+  margin: 2px 0;
+}
+#civicrm-menu .crm-logo-sm {
+  background: url('../i/item_sprites.png') no-repeat scroll -80px -16px;
+  display: inline-block;
+  width: 16px;
+  height: 16px;
+  vertical-align:middle;
+}
\ No newline at end of file

diff --git a/i/binocular.gif b/i/binocular.gif
deleted file mode 100644 (file)
index c6a8152..0000000
Binary files a/i/binocular.gif and /dev/null differ

diff --git a/i/contact_all.ico b/i/contact_all.ico
deleted file mode 100644 (file)
index 85f7e85..0000000
Binary files a/i/contact_all.ico and /dev/null differ

diff --git a/i/contact_ind_medium.gif b/i/contact_ind_medium.gif
deleted file mode 100644 (file)
index b810b70..0000000
Binary files a/i/contact_ind_medium.gif and /dev/null differ

diff --git a/i/custom_activity.gif b/i/custom_activity.gif
deleted file mode 100644 (file)
index 2a7d28f..0000000
Binary files a/i/custom_activity.gif and /dev/null differ

diff --git a/i/delete.png b/i/delete.png
deleted file mode 100644 (file)
index 6d0d29d..0000000
Binary files a/i/delete.png and /dev/null differ

diff --git a/i/draggable.png b/i/draggable.png
deleted file mode 100644 (file)
index 47e8a02..0000000
Binary files a/i/draggable.png and /dev/null differ

diff --git a/i/include.jpeg b/i/include.jpeg
deleted file mode 100644 (file)
index 4de3dc5..0000000
Binary files a/i/include.jpeg and /dev/null differ

diff --git a/i/item_sprites.png b/i/item_sprites.png
index c27a116617138b778384005e1aee6f09f1d3a1cd..45aacbfe116dd25c275e1c9b0be6415cff9c0ce6 100644 (file)
Binary files a/i/item_sprites.png and b/i/item_sprites.png differ

diff --git a/i/myshadow.png b/i/myshadow.png
new file mode 100644 (file)
index 0000000..fb6c71b
Binary files /dev/null and b/i/myshadow.png differ

diff --git a/i/notes.png b/i/notes.png
deleted file mode 100644 (file)
index 5055c7d..0000000
Binary files a/i/notes.png and /dev/null differ

diff --git a/i/popupMenuBg.gif b/i/popupMenuBg.gif
deleted file mode 100644 (file)
index 15f4f1b..0000000
Binary files a/i/popupMenuBg.gif and /dev/null differ