diff options
author | Duda Dornelles <dudassdornelles@gmail.com> | 2015-01-21 18:12:25 -0200 |
---|---|---|
committer | Pixpoa pairing <pixpoapairing@pixelated-project.org> | 2015-01-21 18:12:25 -0200 |
commit | 8abb94a88e40fde249b562a841a5b0398582717e (patch) | |
tree | c2cc4c7a00e80fb85423cd3a0b7a25c076a710c4 /web-ui | |
parent | 8310db57c7f1829497ebadddff65682392a60a27 (diff) |
#224 App is working without klein - migration to twisted "complete"
Diffstat (limited to 'web-ui')
-rw-r--r-- | web-ui/app/index.html | 32 | ||||
-rw-r--r-- | web-ui/app/js/main.js | 2 | ||||
-rw-r--r-- | web-ui/app/js/views/i18n.js | 2 | ||||
-rw-r--r-- | web-ui/app/scss/news-cycle.scss | 4 | ||||
-rw-r--r-- | web-ui/app/scss/opensans.scss | 20 |
5 files changed, 30 insertions, 30 deletions
diff --git a/web-ui/app/index.html b/web-ui/app/index.html index e4e0f07d..29356e3c 100644 --- a/web-ui/app/index.html +++ b/web-ui/app/index.html @@ -3,16 +3,16 @@ <head> <link rel="icon" type="image/png" - href="/images/Favicon.png"> + href="assets/images/Favicon.png"> <meta charset="utf-8"> <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"> <title>Pixelated Mail</title> <meta name="description" content=""> <meta name="viewport" content="width=device-width"> -<link href="bower_components/font-awesome/css/font-awesome.min.css" rel="stylesheet" type="text/css"> -<link href="css/opensans.css" rel="stylesheet" type="text/css"> -<link href="css/news-cycle.css" rel="stylesheet" type="text/css"/> -<link rel="stylesheet" href="/css/main.css"> +<link href="assets/bower_components/font-awesome/css/font-awesome.min.css" rel="stylesheet" type="text/css"> +<link href="assets/css/opensans.css" rel="stylesheet" type="text/css"> +<link href="assets/css/news-cycle.css" rel="stylesheet" type="text/css"/> +<link rel="stylesheet" href="assets/css/main.css"> </head> <body> @@ -26,7 +26,7 @@ <div class="inner-wrap"> <div id="menu" class="column collapsed-nav no-padding"> <a class="left-off-canvas-logo" href="#"> - <img id="pixelated-logo" src="images/pixelated-logo_symbol_orange.svg" alt="Pixelated"> + <img id="pixelated-logo" src="assets/images/pixelated-logo_symbol_orange.svg" alt="Pixelated"> </a> <a class="left-off-canvas-toggle" href="#"> <i class=" toggle fa fa-navicon"></i> @@ -71,16 +71,16 @@ </div> <!--usemin_start--> -<script src="/bower_components/modernizr/modernizr.js"></script> -<script src="/bower_components/lodash/dist/lodash.js"></script> -<script src="/bower_components/jquery/dist/jquery.js"></script> -<script src="/js/lib/highlightRegex.js"></script> -<script src="/bower_components/handlebars/handlebars.min.js"></script> -<script src="/bower_components/typeahead.js/dist/typeahead.bundle.min.js"></script> -<script src="/bower_components/foundation/js/foundation.js" ></script> -<script src="/bower_components/foundation/js/foundation/foundation.reveal.js" ></script> -<script src="/bower_components/foundation/js/foundation/foundation.offcanvas.js"></script> -<script src="/bower_components/requirejs/require.js" data-main="js/main.js"></script> +<script src="assets/bower_components/modernizr/modernizr.js"></script> +<script src="assets/bower_components/lodash/dist/lodash.js"></script> +<script src="assets/bower_components/jquery/dist/jquery.js"></script> +<script src="assets/js/lib/highlightRegex.js"></script> +<script src="assets/bower_components/handlebars/handlebars.min.js"></script> +<script src="assets/bower_components/typeahead.js/dist/typeahead.bundle.min.js"></script> +<script src="assets/bower_components/foundation/js/foundation.js" ></script> +<script src="assets/bower_components/foundation/js/foundation/foundation.reveal.js" ></script> +<script src="assets/bower_components/foundation/js/foundation/foundation.offcanvas.js"></script> +<script src="assets/bower_components/requirejs/require.js" data-main="assets/js/main.js"></script> <!--usemin_end--> 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'); } |