diff --git a/bower.json b/bower.json index ba520ba..87ee5f5 100644 --- a/bower.json +++ b/bower.json @@ -73,6 +73,9 @@ }, "slimScroll": { "main": "./jquery.slimscroll.js" + }, + "font-awesome": { + "main": "css/font-awesome.css" } }, "devDependencies": { diff --git a/gulp/watch.js b/gulp/watch.js index f748ccb..d140558 100644 --- a/gulp/watch.js +++ b/gulp/watch.js @@ -15,8 +15,8 @@ gulp.task('watch', ['inject'], function () { gulp.watch([path.join(conf.paths.src, '/*.html'), 'bower.json'], ['inject-reload']); gulp.watch([ - path.join(conf.paths.src, '/app/**/*.css'), - path.join(conf.paths.src, '/app/**/*.scss') + path.join(conf.paths.src, '/sass/**/*.css'), + path.join(conf.paths.src, '/sass/**/*.scss') ], function(event) { if(isOnlyChange(event)) { gulp.start('styles-reload'); diff --git a/src/app/pages/charts/amCharts/areaChart/AreaChartCtrl.js b/src/app/pages/charts/amCharts/areaChart/AreaChartCtrl.js index b273670..d946c26 100644 --- a/src/app/pages/charts/amCharts/areaChart/AreaChartCtrl.js +++ b/src/app/pages/charts/amCharts/areaChart/AreaChartCtrl.js @@ -9,7 +9,7 @@ .controller('AreaChartCtrl', AreaChartCtrl); /** @ngInject */ - function AreaChartCtrl($scope, layoutColors, $element, tplSkinChartWatcherHelper) { + function AreaChartCtrl($scope, layoutColors, $element, tplSkinChartWatcherHelper, layoutPaths) { var id = $element[0].getAttribute('id'); var areaChart = AmCharts.makeChart(id, { type: 'serial', @@ -131,7 +131,7 @@ export: { enabled: true }, - pathToImages: 'img/' + pathToImages: layoutPaths.images.amChart }); tplSkinChartWatcherHelper.watchAxisChartStyleChanges($scope, areaChart); diff --git a/src/app/pages/charts/amCharts/barChart/BarChartCtrl.js b/src/app/pages/charts/amCharts/barChart/BarChartCtrl.js index beed31f..3996f23 100644 --- a/src/app/pages/charts/amCharts/barChart/BarChartCtrl.js +++ b/src/app/pages/charts/amCharts/barChart/BarChartCtrl.js @@ -9,7 +9,7 @@ .controller('BarChartCtrl', BarChartCtrl); /** @ngInject */ - function BarChartCtrl($scope, layoutColors, $element, tplSkinChartWatcherHelper) { + function BarChartCtrl($scope, layoutColors, $element, tplSkinChartWatcherHelper, layoutPaths) { var id = $element[0].getAttribute('id'); var barChart = AmCharts.makeChart(id, { type: 'serial', @@ -79,7 +79,7 @@ enabled: true }, creditsPosition: 'top-right', - pathToImages: 'img/' + pathToImages: layoutPaths.images.amChart }); tplSkinChartWatcherHelper.watchAxisChartStyleChanges($scope, barChart); diff --git a/src/app/pages/charts/amCharts/funnelChart/FunnelChartCtrl.js b/src/app/pages/charts/amCharts/funnelChart/FunnelChartCtrl.js index 26fcc9e..bc0099a 100644 --- a/src/app/pages/charts/amCharts/funnelChart/FunnelChartCtrl.js +++ b/src/app/pages/charts/amCharts/funnelChart/FunnelChartCtrl.js @@ -9,7 +9,7 @@ .controller('FunnelChartCtrl', FunnelChartCtrl); /** @ngInject */ - function FunnelChartCtrl($scope, $element, tplSkinChartWatcherHelper) { + function FunnelChartCtrl($scope, $element, tplSkinChartWatcherHelper, layoutPaths) { var id = $element[0].getAttribute('id'); var funnelChart = AmCharts.makeChart(id, { type: 'funnel', @@ -60,7 +60,7 @@ enabled: true }, creditsPosition: 'bottom-left', - pathToImages: 'img/' + pathToImages: layoutPaths }); tplSkinChartWatcherHelper.watchFunnelChanges($scope, funnelChart); diff --git a/src/app/pages/charts/amCharts/lineChart/LineChartCtrl.js b/src/app/pages/charts/amCharts/lineChart/LineChartCtrl.js index 074e514..5864df8 100644 --- a/src/app/pages/charts/amCharts/lineChart/LineChartCtrl.js +++ b/src/app/pages/charts/amCharts/lineChart/LineChartCtrl.js @@ -9,7 +9,7 @@ .controller('LineChartCtrl', LineChartCtrl); /** @ngInject */ - function LineChartCtrl($scope, layoutColors, $element, tplSkinChartWatcherHelper) { + function LineChartCtrl($scope, layoutColors, $element, tplSkinChartWatcherHelper, layoutPaths) { var id = $element[0].getAttribute('id'); var lineChart = AmCharts.makeChart(id, { type: 'serial', @@ -137,7 +137,7 @@ enabled: true }, creditsPosition: 'bottom-right', - pathToImages: 'img/' + pathToImages: layoutPaths.images.amChart }); tplSkinChartWatcherHelper.watchAxisChartStyleChanges($scope, lineChart); diff --git a/src/app/pages/charts/amCharts/pieChart/PieChartCtrl.js b/src/app/pages/charts/amCharts/pieChart/PieChartCtrl.js index c9a6570..eb3158f 100644 --- a/src/app/pages/charts/amCharts/pieChart/PieChartCtrl.js +++ b/src/app/pages/charts/amCharts/pieChart/PieChartCtrl.js @@ -9,7 +9,7 @@ .controller('PieChartCtrl', PieChartCtrl); /** @ngInject */ - function PieChartCtrl($scope, $element, tplSkinChartWatcherHelper) { + function PieChartCtrl($scope, $element, tplSkinChartWatcherHelper, layoutPaths) { var id = $element[0].getAttribute('id'); var pieChart = AmCharts.makeChart(id, { type: 'pie', @@ -94,7 +94,7 @@ marginLeft: 0, marginRight: 0, pullOutRadius: 0, - pathToImages: 'img/', + pathToImages: layoutPaths.images.amChart, responsive: { enabled: true, rules: [ diff --git a/src/app/pages/dashboard/blurFeed/BlurFeedCtrl.js b/src/app/pages/dashboard/blurFeed/BlurFeedCtrl.js index 90f7247..4bb826a 100644 --- a/src/app/pages/dashboard/blurFeed/BlurFeedCtrl.js +++ b/src/app/pages/dashboard/blurFeed/BlurFeedCtrl.js @@ -23,7 +23,7 @@ author: 'Andrey', header: 'added new video', text: 'Vader and Me', - preview: 'vader-and-me-preview', + preview: 'app/feed/vader-and-me-preview.png', link: 'https://www.youtube.com/watch?v=IfcpzBbbamk', time: 'Today 9:30 pm', ago: '3 hrs ago', @@ -32,7 +32,7 @@ author: 'Vlad', header: 'added new image', text: 'My little kitten', - preview: 'my-little-kitten', + preview: 'app/feed/my-little-kitten.png', link: 'http://api.ning.com/files/DtcI2O2Ry7A7VhVxeiWfGU9WkHcMy4WSTWZ79oxJq*h0iXvVGndfD7CIYy-Ax-UAFCBCdqXI4GCBw3FOLKTTjQc*2cmpdOXJ/1082127884.jpeg', time: 'Today 2:20 pm', ago: '10 hrs ago', @@ -48,7 +48,7 @@ author: 'Nick', header: 'posted location', text: 'New York, USA', - preview: 'new-york-location', + preview: 'app/feed/new-york-location.png', link: 'https://www.google.by/maps/place/New+York,+NY,+USA/@40.7201111,-73.9893872,14z', time: '11.11.2015', ago: '2 days ago', diff --git a/src/app/pages/dashboard/blurFeed/blurFeed.html b/src/app/pages/dashboard/blurFeed/blurFeed.html index 40c1dc6..1422ff5 100644 --- a/src/app/pages/dashboard/blurFeed/blurFeed.html +++ b/src/app/pages/dashboard/blurFeed/blurFeed.html @@ -2,11 +2,11 @@