Pixelated Mail

- - - - - - - - - - + + + + + + + + + + diff --git a/web-ui/app/js/main.js b/web-ui/app/js/main.js index 6f3b3e8c..06eca8dc 100644 --- a/web-ui/app/js/main.js +++ b/web-ui/app/js/main.js @@ -17,7 +17,7 @@ 'use strict'; requirejs.config({ - baseUrl: '../', + baseUrl: '../assets/', paths: { 'mail_list': 'js/mail_list', 'page': 'js/page', diff --git a/web-ui/app/js/views/i18n.js b/web-ui/app/js/views/i18n.js index b09490f5..19327c27 100644 --- a/web-ui/app/js/views/i18n.js +++ b/web-ui/app/js/views/i18n.js @@ -24,7 +24,7 @@ define(['i18next'], function(i18n) { self.get = self; self.init = function(path) { - i18n.init({detectLngQS: 'lang', fallbackLng: 'en', lowerCaseLng: true, getAsync: false, resGetPath: path + 'locales/__lng__/__ns__.json'}); + i18n.init({detectLngQS: 'lang', fallbackLng: 'en', lowerCaseLng: true, getAsync: false, resGetPath: path + 'assets/locales/__lng__/__ns__.json'}); Handlebars.registerHelper('t', self.get.bind(self)); }; diff --git a/web-ui/app/scss/news-cycle.scss b/web-ui/app/scss/news-cycle.scss index 8f813996..ecca383c 100644 --- a/web-ui/app/scss/news-cycle.scss +++ b/web-ui/app/scss/news-cycle.scss @@ -1,13 +1,13 @@ @font-face { font-family: 'News Cycle'; - src: url('/fonts/NewsCycleRegular.ttf') format('truetype'); + src: url('assets/fonts/NewsCycleRegular.ttf') format('truetype'); font-weight: normal; font-style: normal; } @font-face { font-family: 'News Cycle'; - src: url('/fonts/NewsCycleBold.ttf') format('truetype'); + src: url('assets/fonts/NewsCycleBold.ttf') format('truetype'); font-weight: bold; font-style: normal; } diff --git a/web-ui/app/scss/opensans.scss b/web-ui/app/scss/opensans.scss index 5d5c7ff5..84529c41 100644 --- a/web-ui/app/scss/opensans.scss +++ b/web-ui/app/scss/opensans.scss @@ -2,60 +2,60 @@ font-family: 'Open Sans'; font-style: normal; font-weight: 300; - src: local('Open Sans Light'), local('OpenSans-Light'), url('/fonts/OpenSans-Light.woff') format('woff'); + src: local('Open Sans Light'), local('OpenSans-Light'), url('/assets/fonts/OpenSans-Light.woff') format('woff'); } @font-face { font-family: 'Open Sans'; font-style: normal; font-weight: 400; - src: local('Open Sans'), local('OpenSans'), url('/fonts/OpenSans.woff') format('woff'); + src: local('Open Sans'), local('OpenSans'), url('/assets/fonts/OpenSans.woff') format('woff'); } @font-face { font-family: 'Open Sans'; font-style: normal; font-weight: 600; - src: local('Open Sans Semibold'), local('OpenSans-Semibold'), url('/fonts/OpenSans-Semibold.woff') format('woff'); + src: local('Open Sans Semibold'), local('OpenSans-Semibold'), url('/assets/fonts/OpenSans-Semibold.woff') format('woff'); } @font-face { font-family: 'Open Sans'; font-style: normal; font-weight: 700; - src: local('Open Sans Bold'), local('OpenSans-Bold'), url('/fonts/OpenSans-Bold.woff') format('woff'); + src: local('Open Sans Bold'), local('OpenSans-Bold'), url('/assets/fonts/OpenSans-Bold.woff') format('woff'); } @font-face { font-family: 'Open Sans'; font-style: normal; font-weight: 800; - src: local('Open Sans Extrabold'), local('OpenSans-Extrabold'), url('/fonts/OpenSans-Extrabold.woff') format('woff'); + src: local('Open Sans Extrabold'), local('OpenSans-Extrabold'), url('/assets/fonts/OpenSans-Extrabold.woff') format('woff'); } @font-face { font-family: 'Open Sans'; font-style: italic; font-weight: 300; - src: local('Open Sans Light Italic'), local('OpenSansLight-Italic'), url('/fonts/OpenSansLight-Italic.woff') format('woff'); + src: local('Open Sans Light Italic'), local('OpenSansLight-Italic'), url('/assets/fonts/OpenSansLight-Italic.woff') format('woff'); } @font-face { font-family: 'Open Sans'; font-style: italic; font-weight: 400; - src: local('Open Sans Italic'), local('OpenSans-Italic'), url('/fonts/OpenSans-Italic.woff') format('woff'); + src: local('Open Sans Italic'), local('OpenSans-Italic'), url('/assets/fonts/OpenSans-Italic.woff') format('woff'); } @font-face { font-family: 'Open Sans'; font-style: italic; font-weight: 600; - src: local('Open Sans Semibold Italic'), local('OpenSans-SemiboldItalic'), url('/fonts/OpenSans-SemiboldItalic.woff + src: local('Open Sans Semibold Italic'), local('OpenSans-SemiboldItalic'), url('/assets/fonts/OpenSans-SemiboldItalic.woff ') format('woff'); } @font-face { font-family: 'Open Sans'; font-style: italic; font-weight: 700; - src: local('Open Sans Bold Italic'), local('OpenSans-BoldItalic'), url('/fonts/OpenSans-BoldItalic.woff') format('woff'); + src: local('Open Sans Bold Italic'), local('OpenSans-BoldItalic'), url('/assets/fonts/OpenSans-BoldItalic.woff') format('woff'); } @font-face { font-family: 'Open Sans'; font-style: italic; font-weight: 800; - src: local('Open Sans Extrabold Italic'), local('OpenSans-ExtraboldItalic'), url('/fonts/OpenSans-ExtraboldItalic.woff') format('woff'); + src: local('Open Sans Extrabold Italic'), local('OpenSans-ExtraboldItalic'), url('/assets/fonts/OpenSans-ExtraboldItalic.woff') format('woff'); } -- cgit v1.2.3