amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-04-05 05:18:51 +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-03-03 23:26:57 -05: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

6
UI/WebServerResources/js/Common/ui.js
View File

@@ -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',

16
UI/WebServerResources/scss/core/typography/typography.scss
View File

@@ -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;
}