amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-09-23 22:20:31 +00:00
Code Issues Projects Releases Wiki Activity

Correct sources to prevent angular.js deprecation Warning

Browse Source 
Correct scss to prevent 404 server response
This commit is contained in:
iRouge
2015-06-12 11:17:54 -04:00
committed by Francis Lachapelle
parent 02cdc869be
commit bed46ba2eb
5 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
UI/Templates/ContactsUI/UIxContactFoldersView.wox
+1 -1
View File
@@ -146,7 +146,7 @@
sg-subscribe-on-select="subscribeToFolder">!- subscription dropdown -</div> sg-subscribe-on-select="subscribeToFolder">!- subscription dropdown -</div>
--> -->
<!-- Sidenav --> <!-- 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"> <md-toolbar class="md-tall" layout-align="end start">
<span class="sg-logo"> </span> <span class="sg-logo"> </span>
<h2 class="md-toolbar-tools md-toolbar-tools-bottom"> <h2 class="md-toolbar-tools md-toolbar-tools-bottom">
UI/Templates/MailerUI/UIxMailMainFrame.wox
+1 -1
View File
@@ -263,7 +263,7 @@
</div> </div>
<!-- Sidenav --> <!-- 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"> <md-toolbar class="md-tall" layout-align="end start">
<span class="sg-logo"> </span> <span class="sg-logo"> </span>
<h2 class="md-toolbar-tools md-toolbar-tools-bottom"> <h2 class="md-toolbar-tools md-toolbar-tools-bottom">
UI/Templates/MailerUI/UIxMailViewTemplate.wox
+2 -1
View File
@@ -40,7 +40,8 @@
<div class="sg-icon-bar"> <div class="sg-icon-bar">
<!-- todo: Replace md-tooltip values by localizable string variable --> <!-- todo: Replace md-tooltip values by localizable string variable -->
<md-button class="iconButton" <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> <md-tooltip md-direction="left">Reply to the message</md-tooltip>
<i class="md-icon-reply"><!-- reply --></i> <i class="md-icon-reply"><!-- reply --></i>
</md-button> </md-button>
UI/WebServerResources/js/Common/ui.js
+3 -3
View File
@@ -73,14 +73,14 @@
// Default theme definition // 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) // .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') $mdThemingProvider.theme('default')
.primaryColor('vintage-blue', { .primaryPalette('vintage-blue', {
'default': '300', 'default': '300',
'hue-1': '100', 'hue-1': '100',
'hue-2': '400', 'hue-2': '400',
'hue-3': 'A700' 'hue-3': 'A700'
}) })
.accentColor('sogo-green') .accentPalette('sogo-green')
.backgroundColor('paper', { .backgroundPalette('paper', {
'default': '500', 'default': '500',
'hue-1': '200', 'hue-1': '200',
'hue-2': '50', 'hue-2': '50',
UI/WebServerResources/scss/core/typography/typography.scss
+8 -8
View File
@@ -61,10 +61,10 @@
@font-face { @font-face {
font-family: 'Fira sans'; font-family: 'Fira sans';
src: url('../fonts/FiraSans-medium.eot'); src: url('../fonts/FiraSans-Medium.eot');
src: url('../fonts/FiraSans-medium.eot?#iefix') format('embedded-opentype'), src: url('../fonts/FiraSans-Medium.eot?#iefix') format('embedded-opentype'),
url('../fonts/FiraSans-medium.woff') format('woff'), url('../fonts/FiraSans-Medium.woff') format('woff'),
url('../fonts/FiraSans-medium.ttf') format('truetype'); url('../fonts/FiraSans-Medium.ttf') format('truetype');
font-weight: 600; font-weight: 600;
font-style: normal; font-style: normal;
} }
@@ -121,10 +121,10 @@
@font-face { @font-face {
font-family: 'Fira sans'; font-family: 'Fira sans';
src: url('../fonts/FiraSans-mediumItalic.eot'); src: url('../fonts/FiraSans-MediumItalic.eot');
src: url('../fonts/FiraSans-mediumItalic.eot?#iefix') format('embedded-opentype'), src: url('../fonts/FiraSans-MediumItalic.eot?#iefix') format('embedded-opentype'),
url('../fonts/FiraSans-mediumItalic.woff') format('woff'), url('../fonts/FiraSans-MediumItalic.woff') format('woff'),
url('../fonts/FiraSans-mediumItalic.ttf') format('truetype'); url('../fonts/FiraSans-MediumItalic.ttf') format('truetype');
font-weight: 600; font-weight: 600;
font-style: italic; font-style: italic;
} }