Merge pull request mozilla-b2g#7317 from KevinGrandon/bug_820145_new_…

…icons Bug 820145 - Update edit/compose icons
dscravag · Jan 7, 2013 · cba0de2 · cba0de2
2 parents b2515d8 + de65797
commit cba0de2
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 3 deletions.
diff --git a/apps/communications/contacts/index.html b/apps/communications/contacts/index.html
@@ -171,7 +171,7 @@ <h1 data-l10n-id="contacts">Contacts</h1>
         <header id='details-view-header'>
           <button id="details-back" class="negative"><span class="icon icon-back" data-l10n-id="back">back</span></button>
           <menu type="toolbar">
-            <button role="menuitem" id="edit-contact-button"><span class="icon icon-edit"
+            <button role="menuitem" id="edit-contact-button"><span class="icon icon-edit-contact"
                                                                    data-l10n-id="edit" data-l10n-id="edit">edit</span></button>
           </menu>
           <h1 id='contact-name-title'></h1>

diff --git a/apps/communications/contacts/style/contacts.css b/apps/communications/contacts/style/contacts.css
@@ -17,6 +17,10 @@ section[role="region"] > header:first-child sup {
   top: 0;
 }
 
+section[role="region"] > header:first-child .icon.icon-edit-contact {
+  background: url(images/edit-contact.png) no-repeat center center;
+}
+
 .contact-header img {
   width: 100%;
   height: 7.6rem;

diff --git a/apps/communications/contacts/style/images/edit-contact.png b/apps/communications/contacts/style/images/edit-contact.png
diff --git a/apps/email/index.html b/apps/email/index.html
@@ -122,7 +122,7 @@ <h3>
             </a>
             <menu type="toolbar">
               <a href="#" class="msg-compose-btn">
-                <span class="icon icon-add">add</span>
+                <span class="icon icon-compose">compose</span>
               </a>
             </menu>
             <h1 class="msg-list-header-folder-label header-label"></h1>

diff --git a/apps/sms/index.html b/apps/sms/index.html
@@ -13,6 +13,7 @@
     <link rel="stylesheet" type="text/css" href="shared/style/confirm.css">
     <link rel="stylesheet" type="text/css" href="shared/style_unstable/progress_activity.css">
     <link rel="stylesheet" type="text/css" href="shared/style_unstable/lists.css">
+    <link rel="stylesheet" type="text/css" href="/shared/style_unstable/tabs.css">
 
     <!-- App styles -->
     <link rel="stylesheet" type="text/css" href="style/root.css">
@@ -54,7 +55,7 @@
         <header class="view-header regular-header">
           <menu type="toolbar">
             <a href="#new" id="icon-add">
-              <span class="icon icon-add"></span>
+              <span class="icon icon-compose"></span>
             </a>
             <a href="#edit" id="icon-edit-threads">
               <span class="icon icon-edit"></span>

diff --git a/shared/style/headers.css b/shared/style/headers.css
@@ -179,6 +179,10 @@ section[role="region"] > header:first-child .icon.icon-add {
   background-image: url(headers/images/icons/add.png);
 }
 
+section[role="region"] > header:first-child .icon.icon-compose {
+  background-image: url(headers/images/icons/compose.png);
+}
+
 section[role="region"] > header:first-child .icon.icon-edit {
   background-image: url(headers/images/icons/edit.png);
 }

diff --git a/shared/style/headers/images/icons/compose.png b/shared/style/headers/images/icons/compose.png
diff --git a/shared/style/headers/images/icons/edit.png b/shared/style/headers/images/icons/edit.png