From bed46ba2eb2fa34ff5ede7f35d459cf472947e4e Mon Sep 17 00:00:00 2001
From: iRouge <bfavreault@inverse.ca>
Date: Tue, 3 Mar 2015 23:26:57 -0500
Subject: [PATCH] Correct sources to prevent angular.js deprecation Warning
 Correct scss to prevent 404 server response

---
 .../ContactsUI/UIxContactFoldersView.wox         |  2 +-
 UI/Templates/MailerUI/UIxMailMainFrame.wox       |  2 +-
 UI/Templates/MailerUI/UIxMailViewTemplate.wox    |  3 ++-
 UI/WebServerResources/js/Common/ui.js            |  6 +++---
 .../scss/core/typography/typography.scss         | 16 ++++++++--------
 5 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/UI/Templates/ContactsUI/UIxContactFoldersView.wox b/UI/Templates/ContactsUI/UIxContactFoldersView.wox
index a2e0272fe..5813fead9 100644
--- a/UI/Templates/ContactsUI/UIxContactFoldersView.wox
+++ b/UI/Templates/ContactsUI/UIxContactFoldersView.wox
@@ -146,7 +146,7 @@
          sg-subscribe-on-select="subscribeToFolder">!- subscription dropdown -</div>
     -->
 <!-- Sidenav -->
-    <md-sidenav class="md-sidenav-left" md-component-id="left" md-is-locked-open="$media('gt-md')" layout="column">
+    <md-sidenav class="md-sidenav-left" md-component-id="left" md-is-locked-open="$mdMedia('gt-md')" layout="column">
       <md-toolbar class="md-tall" layout-align="end start">
         <span class="sg-logo"> </span>
         <h2 class="md-toolbar-tools md-toolbar-tools-bottom">
diff --git a/UI/Templates/MailerUI/UIxMailMainFrame.wox b/UI/Templates/MailerUI/UIxMailMainFrame.wox
index 53bf80712..459c22057 100644
--- a/UI/Templates/MailerUI/UIxMailMainFrame.wox
+++ b/UI/Templates/MailerUI/UIxMailMainFrame.wox
@@ -263,7 +263,7 @@
     </div>
 
 <!-- Sidenav -->
-    <md-sidenav class="md-sidenav-left" md-component-id="left" md-is-locked-open="$media('gt-md')" layout="column">
+    <md-sidenav class="md-sidenav-left" md-component-id="left" md-is-locked-open="$mdMedia('gt-md')" layout="column">
       <md-toolbar class="md-tall" layout-align="end start">
         <span class="sg-logo"> </span>
         <h2 class="md-toolbar-tools md-toolbar-tools-bottom">
diff --git a/UI/Templates/MailerUI/UIxMailViewTemplate.wox b/UI/Templates/MailerUI/UIxMailViewTemplate.wox
index 021f98cac..cbc86b7ec 100644
--- a/UI/Templates/MailerUI/UIxMailViewTemplate.wox
+++ b/UI/Templates/MailerUI/UIxMailViewTemplate.wox
@@ -40,7 +40,8 @@
     <div class="sg-icon-bar">
       <!-- todo: Replace md-tooltip values by localizable string variable -->
         <md-button class="iconButton"
-            ui-sref="mail.account.mailbox.message.action({accountId: account.id, mailboxId: (mailbox.path | encodeUri), messageId: message.uid, actionName: 'reply'})">
+            ui-sref="mail.account.mailbox.message.action({accountId: account.id, mailboxId: (mailbox.path | encodeUri), messageId: message.uid, actionName: 'reply'})"
+            aria-label="reply">
           <md-tooltip md-direction="left">Reply to the message</md-tooltip>
           <i class="md-icon-reply"><!-- reply --></i>
         </md-button>
diff --git a/UI/WebServerResources/js/Common/ui.js b/UI/WebServerResources/js/Common/ui.js
index b53c8dc93..291a5b402 100644
--- a/UI/WebServerResources/js/Common/ui.js
+++ b/UI/WebServerResources/js/Common/ui.js
@@ -73,14 +73,14 @@
         // Default theme definition
         // .primaryColor will soon be deprecated in favor of primaryPalette (already on dev builds https://groups.google.com/forum/m/#!topic/ngmaterial/-sXR8CYBMPg)
         $mdThemingProvider.theme('default')
-          .primaryColor('vintage-blue', {
+          .primaryPalette('vintage-blue', {
               'default': '300',
               'hue-1': '100',
               'hue-2': '400',
               'hue-3': 'A700'
             })
-          .accentColor('sogo-green')
-          .backgroundColor('paper', {
+          .accentPalette('sogo-green')
+          .backgroundPalette('paper', {
               'default': '500',
               'hue-1': '200',
               'hue-2': '50',
diff --git a/UI/WebServerResources/scss/core/typography/typography.scss b/UI/WebServerResources/scss/core/typography/typography.scss
index c91cf8584..d6456ef12 100644
--- a/UI/WebServerResources/scss/core/typography/typography.scss
+++ b/UI/WebServerResources/scss/core/typography/typography.scss
@@ -61,10 +61,10 @@
 
 @font-face {
   font-family: 'Fira sans';
-  src: url('../fonts/FiraSans-medium.eot');
-  src: url('../fonts/FiraSans-medium.eot?#iefix') format('embedded-opentype'),
-  url('../fonts/FiraSans-medium.woff') format('woff'),
-  url('../fonts/FiraSans-medium.ttf') format('truetype');
+  src: url('../fonts/FiraSans-Medium.eot');
+  src: url('../fonts/FiraSans-Medium.eot?#iefix') format('embedded-opentype'),
+  url('../fonts/FiraSans-Medium.woff') format('woff'),
+  url('../fonts/FiraSans-Medium.ttf') format('truetype');
   font-weight: 600;
   font-style: normal;
 }
@@ -121,10 +121,10 @@
 
 @font-face {
   font-family: 'Fira sans';
-  src: url('../fonts/FiraSans-mediumItalic.eot');
-  src: url('../fonts/FiraSans-mediumItalic.eot?#iefix') format('embedded-opentype'),
-  url('../fonts/FiraSans-mediumItalic.woff') format('woff'),
-  url('../fonts/FiraSans-mediumItalic.ttf') format('truetype');
+  src: url('../fonts/FiraSans-MediumItalic.eot');
+  src: url('../fonts/FiraSans-MediumItalic.eot?#iefix') format('embedded-opentype'),
+  url('../fonts/FiraSans-MediumItalic.woff') format('woff'),
+  url('../fonts/FiraSans-MediumItalic.ttf') format('truetype');
   font-weight: 600;
   font-style: italic;
 }