diff --git a/src/app/pages/charts/chartist/chartistCtrl.js b/src/app/pages/charts/chartist/chartistCtrl.js
index 21a2adb6d..de0a818ac 100644
--- a/src/app/pages/charts/chartist/chartistCtrl.js
+++ b/src/app/pages/charts/chartist/chartistCtrl.js
@@ -9,9 +9,10 @@
.controller('chartistCtrl', chartistCtrl);
/** @ngInject */
- function chartistCtrl($scope, $timeout) {
+ function chartistCtrl($scope, $timeout, layoutColors) {
$scope.simpleLineOptions = {
+ color: layoutColors.defaultText,
fullWidth: true,
height: "300px",
chartPadding: {
diff --git a/src/app/pages/charts/morris/morris.module.js b/src/app/pages/charts/morris/morris.module.js
index 4d7ee2773..c2e192a68 100644
--- a/src/app/pages/charts/morris/morris.module.js
+++ b/src/app/pages/charts/morris/morris.module.js
@@ -6,11 +6,11 @@
'use strict';
angular.module('BlurAdmin.pages.charts.morris', [])
- .config(routeConfig).config(function(){
+ .config(routeConfig).config(function(layoutColors){
Morris.Donut.prototype.defaults.backgroundColor = 'transparent';
- Morris.Donut.prototype.defaults.labelColor = 'rgba(255,255,255,0.8)';
- Morris.Grid.prototype.gridDefaults.gridLineColor = 'rgba(255,255,255,0.8)';
- Morris.Grid.prototype.gridDefaults.gridTextColor = 'rgba(255,255,255,0.8)';
+ Morris.Donut.prototype.defaults.labelColor = layoutColors.defaultText;
+ Morris.Grid.prototype.gridDefaults.gridLineColor = layoutColors.borderDark;
+ Morris.Grid.prototype.gridDefaults.gridTextColor = layoutColors.defaultText;
});
/** @ngInject */
diff --git a/src/app/pages/charts/morris/morrisCtrl.js b/src/app/pages/charts/morris/morrisCtrl.js
index de3c697d0..e0e0c0204 100644
--- a/src/app/pages/charts/morris/morrisCtrl.js
+++ b/src/app/pages/charts/morris/morrisCtrl.js
@@ -10,7 +10,7 @@
/** @ngInject */
function morrisCtrl($scope, $window, layoutColors) {
- $scope.colors = [layoutColors.primary, layoutColors.warning, layoutColors.danger, layoutColors.info, layoutColors.success, layoutColors.default, layoutColors.primaryDark];
+ $scope.colors = [layoutColors.primary, layoutColors.warning, layoutColors.danger, layoutColors.info, layoutColors.success, layoutColors.primaryDark];
$scope.lineData = [
{y: "2006", a: 100, b: 90},
{y: "2007", a: 75, b: 65},
diff --git a/src/app/pages/components/mail/mail.html b/src/app/pages/components/mail/mail.html
index 7c53d0e10..0a1593e39 100644
--- a/src/app/pages/components/mail/mail.html
+++ b/src/app/pages/components/mail/mail.html
@@ -1,43 +1,41 @@
-
+
-
-
-
-
-
-
- ![]()
-
+
diff --git a/src/app/pages/components/timeline/timeline.html b/src/app/pages/components/timeline/timeline.html
index 16319b3a6..cafb8e158 100644
--- a/src/app/pages/components/timeline/timeline.html
+++ b/src/app/pages/components/timeline/timeline.html
@@ -6,7 +6,7 @@
+
+
![]()
-
Title of section 1
Lorem ipsum dolor sit amet, consectetur adipisicing elit. Iusto, optio, dolorum provident rerum aut hic quasi @@ -20,7 +20,7 @@
Title of section 1
+
![]()
-
Title of section 2
Donec dapibus at leo eget volutpat. Praesent dolor tellus, ultricies venenatis molestie eu, luctus eget nibh. @@ -34,7 +34,7 @@
Title of section 2
+
![]()
-
Title of section 3
Phasellus auctor tellus eget lacinia condimentum. Cum sociis natoque penatibus et magnis dis parturient @@ -48,7 +48,7 @@
Title of section 3
+
![]()
-
Title of section 4
Morbi fringilla in massa ac posuere. Fusce non sagittis massa, id accumsan odio. Nullam eget tempor est. @@ -62,7 +62,7 @@
Title of section 4
+
![]()
-
Title of section 5
Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Curabitur eget mattis @@ -76,7 +76,7 @@
Title of section 5
+
![]()
-
Title of section 6
Praesent bibendum ante mattis augue consectetur, ut commodo turpis consequat. Donec ligula eros, porta in @@ -89,7 +89,7 @@
Title of section 6
+
\ No newline at end of file
diff --git a/src/app/pages/maps/map-lines/MapLinesPageCtrl.js b/src/app/pages/maps/map-lines/MapLinesPageCtrl.js
index 5beb8ce9c..ec94a7adf 100644
--- a/src/app/pages/maps/map-lines/MapLinesPageCtrl.js
+++ b/src/app/pages/maps/map-lines/MapLinesPageCtrl.js
@@ -77,16 +77,16 @@
top: 45,
labelShiftY: 5,
labelShiftX: 5,
- color: layoutColors.default,
- labelColor: layoutColors.default,
- labelRollOverColor: layoutColors.default,
+ color: layoutColors.defaultText,
+ labelColor: layoutColors.defaultText,
+ labelRollOverColor: layoutColors.defaultText,
labelFontSize: 20
}, {
label: 'show flights from Vilnius',
left: 106,
top: 70,
- labelColor: layoutColors.default,
- labelRollOverColor: layoutColors.default,
+ labelColor: layoutColors.defaultText,
+ labelRollOverColor: layoutColors.defaultText,
labelFontSize: 11,
linkToObject: 'vilnius'
} ]
@@ -145,16 +145,16 @@
top: 45,
labelShiftY: 5,
labelShiftX: 5,
- color: layoutColors.default,
- labelColor: layoutColors.default,
- labelRollOverColor: layoutColors.default,
+ color: layoutColors.defaultText,
+ labelColor: layoutColors.defaultText,
+ labelRollOverColor: layoutColors.defaultText,
labelFontSize: 20
}, {
label: 'show flights from London',
left: 106,
top: 70,
- labelColor: layoutColors.default,
- labelRollOverColor: layoutColors.default,
+ labelColor: layoutColors.defaultText,
+ labelRollOverColor: layoutColors.defaultText,
labelFontSize: 11,
linkToObject: 'london'
} ]
diff --git a/src/app/pages/maps/map-lines/map-lines.html b/src/app/pages/maps/map-lines/map-lines.html
index 7bce7e7c6..8f32ce6c3 100644
--- a/src/app/pages/maps/map-lines/map-lines.html
+++ b/src/app/pages/maps/map-lines/map-lines.html
@@ -1,4 +1,4 @@
-
Title of section 7
Vivamus ut laoreet erat, vitae eleifend eros. Sed varius id tellus non lobortis. Sed dolor ante, cursus non diff --git a/src/app/pages/dashboard/dashboardLineChart/DashboardLineChartCtrl.js b/src/app/pages/dashboard/dashboardLineChart/DashboardLineChartCtrl.js index 8fc4960ea..eaa34550d 100644 --- a/src/app/pages/dashboard/dashboardLineChart/DashboardLineChartCtrl.js +++ b/src/app/pages/dashboard/dashboardLineChart/DashboardLineChartCtrl.js @@ -9,7 +9,7 @@ .controller('DashboardLineChartCtrl', DashboardLineChartCtrl); /** @ngInject */ - function DashboardLineChartCtrl($scope, tplSkinManager, tplSkinChartWatcherHelper, layoutColors, layoutPaths) { + function DashboardLineChartCtrl(layoutColors, layoutPaths) { var chartData = [ { date: new Date(2012, 11), value: 0, value0: 0 }, { date: new Date(2013, 0), value: 15000, value0: 19000}, @@ -43,8 +43,6 @@ { date: new Date(2015, 1), value: 49800, value0: 13000} ]; - var chartColorProfile = tplSkinManager.getChartColorProfile(); - var chart = AmCharts.makeChart('amchart', { type: 'serial', theme: 'blur', @@ -55,15 +53,15 @@ categoryAxis: { parseDates: true, gridAlpha: 0, - color: chartColorProfile.fontColors, - axisColor: chartColorProfile.axisColors + color: layoutColors.defaultText, + axisColor: layoutColors.defaultText }, valueAxes: [ { minVerticalGap: 50, gridAlpha: 0, - color: chartColorProfile.fontColors, - axisColor: chartColorProfile.axisColors + color: layoutColors.defaultText, + axisColor: layoutColors.defaultText } ], graphs: [ @@ -71,24 +69,24 @@ id: 'g0', bullet: 'none', useLineColorForBulletBorder: true, - lineColor: 'rgba(0,0,0,0.3)', + lineColor: layoutColors.primary, lineThickness: 1, negativeLineColor: layoutColors.danger, type: 'smoothedLine', valueField: 'value0', - fillAlphas: 1, + fillAlphas: 0.5, fillColorsField: 'lineColor' }, { id: 'g1', bullet: 'none', useLineColorForBulletBorder: true, - lineColor: 'rgba(0,0,0,0.4)', + lineColor: layoutColors.primary, lineThickness: 1, negativeLineColor: layoutColors.danger, type: 'smoothedLine', valueField: 'value', - fillAlphas: 1, + fillAlphas: 0.3, fillColorsField: 'lineColor' } ], @@ -114,8 +112,6 @@ pathToImages: layoutPaths.images.amChart }); - tplSkinChartWatcherHelper.watchAxisChartStyleChanges($scope, chart); - function zoomChart() { chart.zoomToDates(new Date(2013, 3), new Date(2014, 0)); } diff --git a/src/app/pages/dashboard/dashboardMap/DashboardMapCtrl.js b/src/app/pages/dashboard/dashboardMap/DashboardMapCtrl.js index 014d7d08e..7203711c6 100644 --- a/src/app/pages/dashboard/dashboardMap/DashboardMapCtrl.js +++ b/src/app/pages/dashboard/dashboardMap/DashboardMapCtrl.js @@ -53,10 +53,11 @@ }, areasSettings: { - rollOverOutlineColor: '#FFFFFF', + rollOverOutlineColor: layoutColors.border, rollOverColor: layoutColors.primaryDark, alpha: 0.8, - unlistedAreasAlpha: 0.1, + unlistedAreasAlpha: 0.2, + unlistedAreasColor: layoutColors.defaultText, balloonText: '[[title]]: [[customData]] users' }, @@ -66,9 +67,9 @@ marginRight: 27, marginLeft: 27, equalWidths: false, - backgroundAlpha: 0.5, - backgroundColor: '#FFFFFF', - borderColor: '#ffffff', + backgroundAlpha: 0.3, + backgroundColor: layoutColors.border, + borderColor: layoutColors.border, borderAlpha: 1, top: 362, left: 0, diff --git a/src/app/pages/dashboard/dashboardPieChart/DashboardPieChartCtrl.js b/src/app/pages/dashboard/dashboardPieChart/DashboardPieChartCtrl.js index 4b6af89ad..986c83cd5 100644 --- a/src/app/pages/dashboard/dashboardPieChart/DashboardPieChartCtrl.js +++ b/src/app/pages/dashboard/dashboardPieChart/DashboardPieChartCtrl.js @@ -9,24 +9,24 @@ .controller('DashboardPieChartCtrl', DashboardPieChartCtrl); /** @ngInject */ - function DashboardPieChartCtrl($scope, $element, $window, $timeout) { + function DashboardPieChartCtrl($scope, $element, $window, $timeout, layoutColors) { $scope.charts = [{ - color: 'rgba(255,255,255,0.4)', + color: layoutColors.border, description: 'New Visits', stats: '57,820', icon: 'person', }, { - color: 'rgba(255,255,255,0.4)', + color: layoutColors.border, description: 'Purchases', stats: '$ 89,745', icon: 'money', }, { - color: 'rgba(255,255,255,0.4)', + color: layoutColors.border, description: 'Active Users', stats: '178,391', icon: 'face', }, { - color: 'rgba(255,255,255,0.4)', + color: layoutColors.border, description: 'Returned', stats: '32,592', icon: 'refresh', diff --git a/src/app/pages/dashboard/dashboardTodo/DashboardTodoCtrl.js b/src/app/pages/dashboard/dashboardTodo/DashboardTodoCtrl.js index 8b109740b..bfd9de7bb 100644 --- a/src/app/pages/dashboard/dashboardTodo/DashboardTodoCtrl.js +++ b/src/app/pages/dashboard/dashboardTodo/DashboardTodoCtrl.js @@ -9,99 +9,35 @@ .controller('DashboardTodoCtrl', DashboardTodoCtrl); /** @ngInject */ - function DashboardTodoCtrl($scope) { - $scope.marks = [ - { - id: 0, - color: 'default' - }, - { - id: 1, - color: 'primary' - }, - { - id: 2, - color: 'success' - }, - { - id: 3, - color: 'warning' - }, - { - id: 4, - color: 'danger' - } - ]; + function DashboardTodoCtrl($scope, layoutColors) { - $scope.todoList = [ - { - text: 'Check me out', - edit: false, // todo: remove edit - markId: 4 - }, - { - text: 'Lorem ipsum dolor sit amet, possit denique oportere at his, etiam corpora deseruisse te pro', - edit: false, - markId: 3 - }, - { - text: 'Ex has semper alterum, expetenda dignissim', - edit: false, - markId: 2 - }, - { - text: 'Vim an eius ocurreret abhorreant, id nam aeque persius ornatus.', - edit: false, - markId: 1 - }, - { - text: 'Simul erroribus ad usu', - edit: false, - markId: 0 - }, - { - text: 'Ei cum solet appareat, ex est graeci mediocritatem', - edit: false, - markId: 4 - }, - { - text: 'Get in touch with akveo team', - edit: false, - markId: 1 - }, - { - text: 'Write email to business cat', - edit: false, - markId: 3 - }, - { - text: 'Have fun with blur admin', - edit: false, - markId: 2 - }, - ]; + var palette = layoutColors.bgColorPalette; + var colors = []; + for (var key in palette) { + colors.push(palette[key]); + } - $scope.getMarkColor = function (id) { - return $scope.marks.filter(function (item) { - return item.id === id; - })[0].color || ''; - }; + function getRandomColor() { + var i = Math.floor(Math.random() * (colors.length - 1)); + return colors[i]; + } - $scope.changeColor = function (todo) { - for (var i = 0; i < $scope.marks.length; ++i) { - if ($scope.marks[i].id === todo.markId) { - var next = (i + 1 !== $scope.marks.length) ? i + 1 : 0; - todo.markId = $scope.marks[next].id; - return false; - } - } - }; + $scope.todoList = [ + { text: 'Check me out' }, + { text: 'Lorem ipsum dolor sit amet, possit denique oportere at his, etiam corpora deseruisse te pro' }, + { text: 'Ex has semper alterum, expetenda dignissim' }, + { text: 'Vim an eius ocurreret abhorreant, id nam aeque persius ornatus.' }, + { text: 'Simul erroribus ad usu' }, + { text: 'Ei cum solet appareat, ex est graeci mediocritatem' }, + { text: 'Get in touch with akveo team' }, + { text: 'Write email to business cat' }, + { text: 'Have fun with blur admin' }, + { text: 'What do you think?' }, + ]; - $scope.blurOnEnter = function (event, item) { - if (event.which === 13) { - item.edit = false; - } - }; + $scope.todoList.forEach(function(item) { + item.color = getRandomColor(); + }); $scope.newTodoText = ''; @@ -109,8 +45,7 @@ if (clickPlus || event.which === 13) { $scope.todoList.unshift({ text: $scope.newTodoText, - edit: false, - markId: 0 + color: getRandomColor(), }); $scope.newTodoText = ''; } diff --git a/src/app/pages/dashboard/dashboardTodo/dashboardTodo.html b/src/app/pages/dashboard/dashboardTodo/dashboardTodo.html index a347c5670..fd61eb902 100644 --- a/src/app/pages/dashboard/dashboardTodo/dashboardTodo.html +++ b/src/app/pages/dashboard/dashboardTodo/dashboardTodo.html @@ -3,10 +3,10 @@
-
- +
+
diff --git a/src/app/theme/amChartConfig.js b/src/app/theme/amChartConfig.js
index 028cc5d57..6994f3ea6 100644
--- a/src/app/theme/amChartConfig.js
+++ b/src/app/theme/amChartConfig.js
@@ -20,15 +20,15 @@
},
AmCoordinateChart: {
- colors: [layoutColors.primary, layoutColors.danger, layoutColors.warning, layoutColors.success, layoutColors.info, layoutColors.default, layoutColors.primaryDark, layoutColors.warningLight, layoutColors.successDark, layoutColors.successLight, layoutColors.successBg]
+ colors: [layoutColors.primary, layoutColors.danger, layoutColors.warning, layoutColors.success, layoutColors.info, layoutColors.primaryDark, layoutColors.warningLight, layoutColors.successDark, layoutColors.successLight, layoutColors.successBg, layoutColors.warningDark]
},
AmStockChart: {
- colors: [layoutColors.primary, layoutColors.danger, layoutColors.warning, layoutColors.success, layoutColors.info, layoutColors.default, layoutColors.primaryDark, layoutColors.warningLight, layoutColors.successDark, layoutColors.successLight, layoutColors.successBg]
+ colors: [layoutColors.primary, layoutColors.danger, layoutColors.warning, layoutColors.success, layoutColors.info, layoutColors.primaryDark, layoutColors.warningLight, layoutColors.successDark, layoutColors.successLight, layoutColors.successBg, layoutColors.warningDark]
},
AmSlicedChart: {
- colors: [layoutColors.primary, layoutColors.danger, layoutColors.warning, layoutColors.success, layoutColors.info, layoutColors.default, layoutColors.primaryDark, layoutColors.warningLight, layoutColors.successDark, layoutColors.successLight, layoutColors.successBg],
+ colors: [layoutColors.primary, layoutColors.danger, layoutColors.warning, layoutColors.success, layoutColors.info, layoutColors.primaryDark, layoutColors.warningLight, layoutColors.successDark, layoutColors.successLight, layoutColors.successBg, layoutColors.warningDark],
labelTickColor: "#FFFFFF",
labelTickAlpha: 0.3
},
@@ -128,7 +128,7 @@
ZoomControl: {
buttonFillAlpha: 0.8,
- buttonIconColor: layoutColors.default,
+ buttonIconColor: layoutColors.defaultText,
buttonRollOverColor: layoutColors.danger,
buttonFillColor: layoutColors.primaryDark,
buttonBorderColor: layoutColors.primaryDark,
diff --git a/src/app/theme/chartJsConfig.js b/src/app/theme/chartJsConfig.js
index de5f0b4e4..2dcae043e 100644
--- a/src/app/theme/chartJsConfig.js
+++ b/src/app/theme/chartJsConfig.js
@@ -14,9 +14,9 @@
ChartJsProvider.setOptions({
colours: [ layoutColors.primary, layoutColors.danger, layoutColors.warning, layoutColors.success, layoutColors.info, layoutColors.default, layoutColors.primaryDark, layoutColors.successDark, layoutColors.warningLight, layoutColors.successLight, layoutColors.successBg],
responsive: true,
- scaleFontColor: "rgba(255,255,255,.7)",
- scaleLineColor: "rgba(255,255,255,.7)",
- pointLabelFontColor: "rgba(255,255,255,.7)"
+ scaleFontColor: layoutColors.defaultText,
+ scaleLineColor: layoutColors.border,
+ pointLabelFontColor: layoutColors.defaultText
});
// Configure all line charts
ChartJsProvider.setOptions('Line', {
diff --git a/src/app/theme/components/baPanel/baPanel.directive.js b/src/app/theme/components/baPanel/baPanel.directive.js
index 98deb0695..e2f5d69e3 100644
--- a/src/app/theme/components/baPanel/baPanel.directive.js
+++ b/src/app/theme/components/baPanel/baPanel.directive.js
@@ -12,14 +12,8 @@
.directive('baPanel', baPanel);
/** @ngInject */
- function baPanel(baPanel, $document, $window, tplSkinManager) {
+ function baPanel(baPanel) {
return angular.extend({}, baPanel, {
- link: function($scope){
- $scope.panelType = tplSkinManager.getActiveSkin().panelType;
- $scope.$on('tplSkinChanged', function(){
- $scope.panelType = tplSkinManager.getActiveSkin().panelType;
- });
- },
template: function(el, attrs) {
var res = '
';
res += baPanel.template(el, attrs);
@@ -28,5 +22,4 @@
}
});
}
-
})();
diff --git a/src/app/theme/theme.constants.js b/src/app/theme/theme.constants.js
index b24884264..12c999194 100644
--- a/src/app/theme/theme.constants.js
+++ b/src/app/theme/theme.constants.js
@@ -7,7 +7,14 @@
var IMAGES_ROOT = 'assets/img/';
- // main color scheme
+ var basic = {
+ default: '#ffffff',
+ defaultText: '#666666',
+ border: '#dddddd',
+ borderDark: '#aaaaaa',
+ };
+
+ // main functional color scheme
var colorScheme = {
primary: '#209e91',
info: '#2dacd1',
@@ -22,11 +29,16 @@
surfieGreen: '#0e8174',
silverTree: '#6eba8c',
gossip: '#b9f2a1',
- white: '#ffffff',
+ white: '#10c4b5',
};
angular.module('BlurAdmin.theme')
.constant('layoutColors', {
+ default: basic.default,
+ defaultText: basic.defaultText,
+ border: basic.border,
+ borderDark: basic.borderDark,
+
primary: colorScheme.primary,
info: colorScheme.info,
success: colorScheme.success,
@@ -51,9 +63,6 @@
warningBg: tint(colorScheme.warning, 20),
dangerBg: tint(colorScheme.danger, 20),
- default: '#ffffff',
- defaultText: '#ffffff',
-
bgColorPalette: {
blueStone: bgColorPalette.blueStone,
surfieGreen: bgColorPalette.surfieGreen,
diff --git a/src/app/tplSkin/tplSkin.constants.js b/src/app/tplSkin/tplSkin.constants.js
deleted file mode 100644
index 6c713645c..000000000
--- a/src/app/tplSkin/tplSkin.constants.js
+++ /dev/null
@@ -1,71 +0,0 @@
-/**
- * @author v.lugovsky
- * created on 18.11.2015
- */
-(function() {
- 'use strict';
-
- var SKIN_CLASS_PREFIX = 'badmin';
-
- var ADMIN_STYLES = [
- {
- name: 'Transparent (beta)',
- bodyClass: SKIN_CLASS_PREFIX + '-transparent',
- panelType: "panel-blur",
- thumbnailUrl: 'assets/img/app/skin-thumbnails/02_transparent.jpg',
- chartColorProfile: 'transparent'
- },
- {
- name: 'Default',
- bodyClass: '',
- thumbnailUrl: 'assets/img/app/skin-thumbnails/01_default.jpg',
- panelType: "panel-white",
- chartColorProfile: 'whitePanel'
- },
- {
- name: 'Peachy',
- bodyClass: SKIN_CLASS_PREFIX + '-peachy',
- thumbnailUrl: 'assets/img/app/skin-thumbnails/04_peachy.jpg',
- panelType: "panel-white",
- chartColorProfile: 'whitePanel'
- },
- {
- name: 'Blue',
- bodyClass: SKIN_CLASS_PREFIX + '-blue',
- thumbnailUrl: 'assets/img/app/skin-thumbnails/03_blue.jpg',
- panelType: "panel-white",
- chartColorProfile: 'whitePanel'
- },
- {
- name: 'Material',
- bodyClass: SKIN_CLASS_PREFIX + '-material',
- thumbnailUrl: 'assets/img/app/skin-thumbnails/05_material.jpg',
- panelType: "panel-white",
- chartColorProfile: 'whitePanel'
- },
- {
- name: 'Transblue (beta)',
- bodyClass: SKIN_CLASS_PREFIX + '-transblue',
- panelType: "panel-blur",
- thumbnailUrl: 'assets/img/app/skin-thumbnails/06_transblue.jpg',
- chartColorProfile: 'transparent'
- }
- ];
-
- var SKIN_CHART_COLORS = {
- whitePanel: {
- fontColors: undefined,
- axisColors: '#7b7b7b'
- },
- transparent: {
- fontColors: '#FFFFFF',
- axisColors: '#FFFFFF'
- }
- };
-
- angular.module('BlurAdmin.tplSkin')
- .constant('tplSkinClassPrefix', SKIN_CLASS_PREFIX)
- .constant('tplSkinEnum', ADMIN_STYLES)
- .constant('tplSkinChartColors', SKIN_CHART_COLORS);
-
-})();
diff --git a/src/app/tplSkin/tplSkin.module.js b/src/app/tplSkin/tplSkin.module.js
deleted file mode 100644
index fe48b37a0..000000000
--- a/src/app/tplSkin/tplSkin.module.js
+++ /dev/null
@@ -1,14 +0,0 @@
-/**
- * @author v.lugovksy
- * created on 16.12.2015
- */
-/**
- * @author v.lugovsky
- * created on 16.12.2015
- */
-(function () {
- 'use strict';
-
- angular.module('BlurAdmin.tplSkin', []);
-
-})();
diff --git a/src/app/tplSkin/tplSkinChartWatcherHelper.service.js b/src/app/tplSkin/tplSkinChartWatcherHelper.service.js
deleted file mode 100644
index 40e5e9d8d..000000000
--- a/src/app/tplSkin/tplSkinChartWatcherHelper.service.js
+++ /dev/null
@@ -1,67 +0,0 @@
-/**
- * @author v.lugovsky
- * created on 27.11.2015
- */
-(function() {
- 'use strict';
-
- angular.module('BlurAdmin.tplSkin')
- .service('tplSkinChartWatcherHelper', tplSkinChartWatcherHelper);
-
- tplSkinChartWatcherHelper.$inject = ['tplSkinManager'];
- function tplSkinChartWatcherHelper(tplSkinManager) {
-
- this.watchAxisChartStyleChanges = function(scope, chart) {
- _doUpdateStyles();
- scope.$on('tplSkinChanged', _doUpdateStyles);
-
- function _doUpdateStyles() {
- var chartColorProfile = tplSkinManager.getChartColorProfile();
- chart.color = chartColorProfile.fontColors;
- chart.categoryAxis.color = chartColorProfile.fontColors;
- chart.categoryAxis.axisColor = chartColorProfile.axisColors;
- chart.valueAxes[0].color = chartColorProfile.fontColors;
- chart.valueAxes[0].axisColor = chartColorProfile.axisColors;
- chart.validateNow();
- }
- };
-
- this.watchChartColorChanges = function(scope, chart) {
- _doUpdateStyles();
- scope.$on('tplSkinChanged', _doUpdateStyles);
-
- function _doUpdateStyles() {
- var chartColorProfile = tplSkinManager.getChartColorProfile();
- chart.color = chartColorProfile.fontColors;
- chart.validateNow();
- }
- };
-
- this.watchDonutChanges = function(scope, chart) {
- _doUpdateStyles();
- scope.$on('tplSkinChanged', _doUpdateStyles);
-
- function _doUpdateStyles() {
- var chartColorProfile = tplSkinManager.getChartColorProfile();
- chart.color = chartColorProfile.fontColors;
- chart.legend.color = chartColorProfile.fontColors;
- chart.labelTickColor = chartColorProfile.axisColors;
- chart.validateNow();
- }
- };
-
- this.watchFunnelChanges = function(scope, chart) {
- _doUpdateStyles();
- scope.$on('tplSkinChanged', _doUpdateStyles);
-
- function _doUpdateStyles() {
- var chartColorProfile = tplSkinManager.getChartColorProfile();
- chart.color = chartColorProfile.fontColors;
- chart.labelTickColor = chartColorProfile.axisColors;
- chart.validateNow();
- }
- };
-
- }
-
-})();
diff --git a/src/app/tplSkin/tplSkinManager.service.js b/src/app/tplSkin/tplSkinManager.service.js
deleted file mode 100644
index 74f1dec0d..000000000
--- a/src/app/tplSkin/tplSkinManager.service.js
+++ /dev/null
@@ -1,50 +0,0 @@
-/**
- * @author v.lugovsky
- * created on 18.11.2015
- */
-(function() {
- 'use strict';
-
- angular.module('BlurAdmin.tplSkin')
- .service('tplSkinManager', tplSkinManager);
-
- tplSkinManager.$inject = ['$rootScope', '$document', 'tplSkinClassPrefix', 'tplSkinChartColors', 'tplSkinEnum'];
- function tplSkinManager($rootScope, $document, tplSkinClassPrefix, tplSkinChartColors, tplSkinEnum) {
-
- var activeSkin = tplSkinEnum[0];
-
- this.setActiveSkin = function(skin) {
- activeSkin = skin;
- if (activeSkin) {
- _removeSkinBodyClassIfPresent();
- _addSkinBodyClass(activeSkin);
- $rootScope.$broadcast('tplSkinChanged');
- }
- };
-
- this.getActiveSkin = function(){
- return activeSkin;
- };
-
- this.getChartColorProfile = function() {
- return tplSkinChartColors[activeSkin.chartColorProfile];
- };
-
- function _removeSkinBodyClassIfPresent() {
- var body = $document[0].body;
- var $body = angular.element(body);
- body.className.split(/\s+/).forEach(function(className) {
- if (className.indexOf(tplSkinClassPrefix) === 0) {
- $body.removeClass(className);
- }
- });
- }
-
- function _addSkinBodyClass(skin) {
- angular.element($document[0].body).addClass(skin.bodyClass);
- }
-
- this.setActiveSkin(activeSkin);
- }
-
-})();
diff --git a/src/app/tplSkin/tplSkinPanel.directive.js b/src/app/tplSkin/tplSkinPanel.directive.js
deleted file mode 100644
index 961e79db1..000000000
--- a/src/app/tplSkin/tplSkinPanel.directive.js
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * @author v.lugovsky
- * created on 18.11.2015
- */
-(function() {
- 'use strict';
-
- angular.module('BlurAdmin.tplSkin')
- .directive('tplSkinPanel', tplSkinPanel);
-
- tplSkinPanel.$inject = ['tplSkinEnum', 'tplSkinManager'];
- function tplSkinPanel(tplSkinEnum, tplSkinManager) {
- return {
- templateUrl: 'app/tplSkin/tplSkinPanel.html',
- link: function(scope) {
- scope.skins = tplSkinEnum;
-
- scope.setActiveSkin = function(option) {
- tplSkinManager.setActiveSkin(option);
- };
- }
- };
- }
-
-})();
diff --git a/src/app/tplSkin/tplSkinPanel.html b/src/app/tplSkin/tplSkinPanel.html
deleted file mode 100644
index 76906f8ce..000000000
--- a/src/app/tplSkin/tplSkinPanel.html
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
\ No newline at end of file
diff --git a/src/assets/img/app/my-app-logo.png b/src/assets/img/app/my-app-logo.png
index 1330932db..4b4f1c7ef 100644
Binary files a/src/assets/img/app/my-app-logo.png and b/src/assets/img/app/my-app-logo.png differ
diff --git a/src/sass/404.scss b/src/sass/404.scss
index 7ab7f6495..e3b7a5bc0 100644
--- a/src/sass/404.scss
+++ b/src/sass/404.scss
@@ -13,7 +13,7 @@ html, body {
body {
font: 12px/16px $font-family;
color: $default-text;
- @include main-background();
+ background-color: $default;
display: flex;
align-items: center;
}
@@ -21,10 +21,9 @@ body {
.page-not-found-modal {
width: 638px;
margin: 0 auto;
- @include bg-translucent-dark(0.5);
border-radius: 5px;
font-weight: $font-light;
- color: #ffffff;
+ color: $default-text;
padding: 32px;
text-align: center;
diff --git a/src/sass/app/_alerts.scss b/src/sass/app/_alerts.scss
index 87cffd15a..cbef7e4b6 100644
--- a/src/sass/app/_alerts.scss
+++ b/src/sass/app/_alerts.scss
@@ -1,4 +1,5 @@
.alert{
+ color: $default;
font-size: 13px;
font-weight: $font-light;
strong{
@@ -27,36 +28,36 @@
.bg-success {
background-color: rgba($success,0.85);
a{
- color: $danger;
+ color: $danger-dark;
&:hover{
- color: $danger-dark;
+ color: $danger;
}
}
}
.bg-info {
background-color: rgba($info,0.85);
a{
- color: $warning;
+ color: $warning-light;
&:hover{
- color: $warning-dark;
+ color: $warning;
}
}
}
.bg-warning {
background-color: rgba($warning,0.85);
a{
- color: $danger;
+ color: $danger-dark;
&:hover{
- color: $danger-dark;
+ color: $danger;
}
}
}
.bg-danger {
background-color: rgba($danger,0.85);
a{
- color: $primary-light;
+ color: $warning-light;
&:hover{
- color: $primary;
+ color: $warning;
}
}
}
\ No newline at end of file
diff --git a/src/sass/app/_chartsPage.scss b/src/sass/app/_chartsPage.scss
index bb0243505..71491e37b 100644
--- a/src/sass/app/_chartsPage.scss
+++ b/src/sass/app/_chartsPage.scss
@@ -33,7 +33,7 @@
.amChartsButtonSelected {
background-color: #CC0000;
border: 1px solid #CC0000;
- color: #FFFFFF;
+ color: $default-text;
-moz-border-radius: 5px;
border-radius: 5px;
margin: 1px;
@@ -47,6 +47,16 @@
margin: 1px;
}
+.ct-area {
+ fill-opacity: .5;
+}
+
+.ct-label{
+ color: $default-text;
+ opacity: 0.9;
+ fill: rgba(255,255,255,.9);
+}
+
.ct-chart .ct-label{
font-size: 1em;
}
@@ -102,16 +112,6 @@
}
}
-body.badmin-transparent{
- .ct-area {
- fill-opacity: .5;
- }
- .ct-label{
- color: $default;
- opacity: 0.9;
- fill: rgba(255,255,255,.9);
- }
-}
@media screen and (min-width: 992px) {
.row.morris-up {
> div {
@@ -158,4 +158,8 @@ body.badmin-transparent{
.amcharts-cursor-fill {
filter: url(#shadow);
+}
+
+.chartist h5 {
+ font-weight: $font-normal;
}
\ No newline at end of file
diff --git a/src/sass/app/_email.scss b/src/sass/app/_email.scss
index 3c726858f..db60911a3 100644
--- a/src/sass/app/_email.scss
+++ b/src/sass/app/_email.scss
@@ -4,15 +4,13 @@
}
.mail-panel {
- .panel-body{
+ &.panel>.panel-body{
padding-left: 0;
}
- .panel-content {
- padding: 15px 22px 0 0;
- }
}
.mail-navigation-container {
+ color: $default-text;
width: 200px;
.mail-navigation {
cursor: pointer;
@@ -26,7 +24,6 @@
left: 150px;
padding: 1px 6px;
border: 1px solid;
- color: white;
background-color: $primary-light;
margin-top: -2px;
font-size: 12px;
@@ -36,13 +33,12 @@
}
&.active {
background-color: $primary-light;
- color: white;
&:hover {
background-color: $primary-light;
}
.new-mails {
color: $primary-light;
- background-color: white;
+ background-color: $default;
}
transition: background-color .2s ease, 0.8s padding ease;
}
@@ -54,19 +50,19 @@
margin: 7px 0;
.btn {
width: 140px;
- color: white;
font-weight: $font-light;
background-color: $dribble-color;
}
}
}
-.labels, .add-label-container {
- margin-top: 16px;
+.labels {
+ margin-top: 14px;
margin-left: 22px;
}
.labels-container {
+ margin-top: 16px;
text-align: center;
padding-right: 28px;
padding-left: 20px;
@@ -437,9 +433,6 @@
&:focus {
color: white;
}
- &.focus {
- color: white;
- }
}
.answer-container {
@@ -761,7 +754,7 @@
}
}
-body.badmin-transparent {
+.mail-client-container.transparent {
.mail-navigation-container {
overflow: hidden;
width: 200px;
@@ -772,7 +765,7 @@ body.badmin-transparent {
background-color: transparent;
}
&.active {
- background: rgba(255, 255, 255, 0.2);
+ background: rgba(black, 0.2);
color: white;
transition: background-color .5s ease;
.new-mails {
@@ -780,11 +773,11 @@ body.badmin-transparent {
color: $default;
}
&:hover {
- background-color: rgba(255, 255, 255, 0.3);
+ background-color: rgba(black, 0.3);
}
}
&:hover {
- background-color: rgba(0, 0, 0, 0.1);
+ background-color: rgba(black, 0.1);
}
}
}
@@ -825,13 +818,13 @@ body.badmin-transparent {
.compose-button {
text-align: center;
.btn {
- border: $default 2px solid;
+ border: $border 2px solid;
background-color: transparent;
}
}
.side-message-navigation .side-message-navigation-item {
- border-bottom: 1px solid rgba(255, 255, 255, 0.12);
+ border-bottom: 1px solid $border;
&.work, &.study, &.family, &.friend {
border-left: none;
}
@@ -845,7 +838,7 @@ body.badmin-transparent {
border: none;
width: auto;
&:focus, &:hover {
- color:$default;
+ color:$default-text;
opacity: 0.8;
box-shadow: none;
}
@@ -859,8 +852,8 @@ body.badmin-transparent {
font-weight: $font-light;
transition: background-color .5s;
&:hover {
- color: $default;
- background-color: rgba(255, 255, 255, 0.12);
+ color: $default-text;
+ background-color: rgba(black, 0.05);
}
.subject {
font-weight: $font-light;
@@ -1022,12 +1015,5 @@ body.badmin-transparent {
font-size: 13px;
font-weight: $font-light;
}
-
}
-
}
-
-
-
-
-
diff --git a/src/sass/app/_form.scss b/src/sass/app/_form.scss
index de8b87201..35b7fe04d 100644
--- a/src/sass/app/_form.scss
+++ b/src/sass/app/_form.scss
@@ -40,14 +40,16 @@
}
.form-control {
- border-radius: 0;
+ color: $default-text;
+ @include placeholderStyle($default-text, 0.7);
+ border: 1px solid $input-border;
+ border-radius: 5px;
background: transparent;
box-shadow: none;
- border: none;
&:focus {
box-shadow: none;
border-color: $primary-bg;
- background: #ffffff;
+ background: $default;
}
}
@@ -103,9 +105,6 @@ textarea.form-control {
.switch-container {
display: inline-block;
- & {
- @include setSwitchBorder($default);
- }
&.primary {
@include setSwitchBorder($primary);
}
@@ -131,12 +130,12 @@ textarea.form-control {
outline: none;
}
&.bootstrap-switch-off {
- border-color: $input-border;
+ border-color: $border;
}
&.bootstrap-switch-focused {
box-shadow: none;
&.bootstrap-switch-off {
- border-color: $input-border;
+ border-color: $border;
}
}
.bootstrap-switch-container {
@@ -239,10 +238,10 @@ label.custom-checkbox {
font-family: fontAwesome;
font-weight: $font-light;
font-size: 12px;
- color: $default;
+ color: $default-text;
content: "\a0";
background-color: transparent;
- border: 1px solid $default;
+ border: 1px solid $input-border;
border-radius: 0;
display: inline-block;
text-align: center;
@@ -361,7 +360,7 @@ label.custom-input-danger {
}
.input-group-addon {
background-color: $color;
- color: #ffffff;
+ color: $default;
}
}
@@ -394,7 +393,7 @@ label.custom-input-danger {
background: transparent;
color: $disabled;
border-color: $disabled-bg;
- @include placeholderStyle($disabled, 1);
+ @include placeholderStyle($default-text, 0.5);
}
.form-control-rounded {
@@ -414,7 +413,7 @@ label.custom-input-danger {
@mixin groupAddon($color) {
background: $color;
- color: #ffffff;
+ color: $default;
border-color: $color;
}
@@ -442,42 +441,31 @@ label.custom-input-danger {
border-radius: 5px;
}
-.bootstrap-select {
- .btn-default {
+.bootstrap-select.btn-group {
+ button.btn.btn-default {
background: transparent;
- color: $default;
- &:focus {
- background: #ffffff;
+ color: $default-text;
+ border-color: $input-border;
+ &:focus, &:hover {
+ background: $default;
box-shadow: none;
outline: 0 !important;
}
&:active {
- border-color: $default;
+ border-color: $input-border;
box-shadow: none;
- background: #ffffff;
+ background: $default;
}
}
&.open {
- .btn-default.dropdown-toggle {
- box-shadow: none;
- background-color: #ffffff;
- border-color: $default;
- color: $default;
- }
- .dropdown-menu {
- border-left: 1px solid $default;
- border-right: 1px solid $default;
- border-bottom-color: $default;
- border-radius: 0 0 5px 5px;
- }
- > .btn.dropdown-toggle {
- border-bottom-left-radius: 0;
- border-bottom-right-radius: 0;
- border-color: transparent;
+ > .btn.btn-default.dropdown-toggle {
box-shadow: none;
+ border-radius: 5px 5px 0 0;
}
.dropdown-menu {
border-top: none;
+ border-radius: 0 0 5px 5px;
+ padding-top: 0;
}
}
&.with-search.open{
@@ -500,10 +488,12 @@ label.custom-input-danger {
}
.bootstrap-tagsinput {
+ color: $default-text;
+ @include placeholderStyle($default-text, 0.7);
background-color: transparent;
border: 1px solid $input-border;
+ border-radius: 5px;
box-shadow: none;
- color: #555555;
max-width: 100%;
font-size: 14px;
line-height: 26px;
@@ -560,4 +550,4 @@ label.custom-input-danger {
.sub-little-text{
font-size: 12px;
-}
\ No newline at end of file
+}
diff --git a/src/sass/app/_grid.scss b/src/sass/app/_grid.scss
index dedba4d30..eb5b96868 100644
--- a/src/sass/app/_grid.scss
+++ b/src/sass/app/_grid.scss
@@ -11,19 +11,9 @@
}
.grid-h{
- margin-top: 10px;
+ margin-top: 40px;
margin-bottom: 0;
&:first-child{
margin-top: 0;
}
}
-
-body.badmin-transparent {
- .show-grid div[class^=col-]{
- div {
- color: $default;
- background-color: rgba(255, 255, 255, 0.3);
- }
- }
-}
-
diff --git a/src/sass/app/_modals.scss b/src/sass/app/_modals.scss
index eb67f0c11..46d291d14 100644
--- a/src/sass/app/_modals.scss
+++ b/src/sass/app/_modals.scss
@@ -91,7 +91,7 @@
@mixin message-modal-color($color) {
.modal-header {
- color: #ffffff;
+ color: $default-text;
background: $color;
}
}
diff --git a/src/sass/app/_profile.scss b/src/sass/app/_profile.scss
index ed6460a51..70a41ca46 100644
--- a/src/sass/app/_profile.scss
+++ b/src/sass/app/_profile.scss
@@ -16,7 +16,7 @@ h3.with-line {
}
.profile-block {
- background: #fff;
+ background: $default;
.nav-tabs > li {
& > a {
@@ -86,7 +86,7 @@ h3.with-line {
display: none;
position: absolute;
font-size: 32px;
- background: #ffffff;
+ background: $default;
cursor: pointer;
color: $primary;
top: -11px;
@@ -105,7 +105,7 @@ h3.with-line {
width: 202px;
background: rgba(0, 0, 0, 0.7);
transition: all 200ms ease-in-out;
- color: #ffffff;
+ color: $default-text;
text-decoration: none;
position: absolute;
bottom: -1px;
@@ -133,9 +133,9 @@ a.sn-link {
transition: none;
display: block;
border-radius: 5px;
- background-color: rgba(0, 0, 0, .15);
+ background-color: transparent;
padding: $snPadding;
- color: $default;
+ color: $default-text;
border: 1px solid transparent;
margin-bottom: 23px;
width: 100%;
@@ -149,7 +149,7 @@ a.sn-link {
font-size: 17px;
margin-right: 8px;
background-color: rgba(0,0,0,.15);
- color: #fff;
+ color: $default;
}
span {
@@ -165,7 +165,7 @@ a.sn-link {
border-width: 2px;
padding: $snPadding - 1;
span {
- color: $default;
+ color: $primary;
}
i {
background: $snColor;
diff --git a/src/sass/app/_typography.scss b/src/sass/app/_typography.scss
index a88d05ae4..ccd4acbe1 100644
--- a/src/sass/app/_typography.scss
+++ b/src/sass/app/_typography.scss
@@ -138,11 +138,11 @@ h5 {
}
.yellow-text p {
- color: $warning-bg;
+ color: $warning;
}
.red-text p {
- color: $danger-bg;
+ color: $danger;
}
.links {
@@ -263,7 +263,7 @@ h5 {
}
.columns-section {
- background-color: white;
+ background-color: $default;
}
p {
@@ -349,16 +349,15 @@ a.learn-more {
padding: 85px 90px 60px;
display: inline-block;
margin: 67px auto;
- background: #fff;
+ background: $default;
min-width: 432px;
overflow: hidden;
background: rgba(0, 0, 0, 0.75);
- color: #ffffff;
h1 {
font-weight: $font-bold;
width: 100%;
- color: #ffffff;
+ color: $default;
margin-bottom: 10px;
}
p {
diff --git a/src/sass/app/maps/_leaflet.scss b/src/sass/app/maps/_leaflet.scss
index 0d290cee1..86a5e77cf 100644
--- a/src/sass/app/maps/_leaflet.scss
+++ b/src/sass/app/maps/_leaflet.scss
@@ -243,7 +243,7 @@
text-align: center;
text-decoration: none;
opacity: 0.8;
- color: #fff;
+ color: $default-text;
font-size: 17px;
width: 20px;
height: 20px;
@@ -295,7 +295,7 @@
.leaflet-control-layers {
box-shadow: 0 1px 5px rgba(0, 0, 0, 0.4);
- background: #fff;
+ background: $default;
}
.leaflet-control-layers-toggle {
@@ -327,7 +327,7 @@
.leaflet-control-layers-expanded {
padding: 6px 10px 6px 6px;
color: #333;
- background: #fff;
+ background: $default;
}
.leaflet-control-layers-selector {
@@ -349,7 +349,7 @@
/* attribution and scale controls */
.leaflet-container .leaflet-control-attribution {
- background: #fff;
+ background: $default;
background: rgba(255, 255, 255, 0.7);
margin: 0;
}
@@ -392,7 +392,7 @@
-moz-box-sizing: content-box;
box-sizing: content-box;
- background: #fff;
+ background: $default;
background: rgba(255, 255, 255, 0.5);
}
@@ -513,6 +513,6 @@
/* div icon */
.leaflet-div-icon {
- background: #fff;
+ background: $default;
border: 1px solid #666;
}
\ No newline at end of file
diff --git a/src/sass/auth.scss b/src/sass/auth.scss
index 8b141f20d..d471b0306 100644
--- a/src/sass/auth.scss
+++ b/src/sass/auth.scss
@@ -13,13 +13,13 @@ html {
}
.form-control, .form-control:focus {
- @include placeholderStyle($default, 0.9);
- background-color: rgba(0, 0, 0, .4);
+ @include placeholderStyle($default-text, 0.7);
border-radius: 5px;
- color: $default;
+ border: 1px solid $border;
+ color: $default-text;
}
.form-control[disabled], .form-control[readonly], fieldset[disabled] .form-control {
- @include placeholderStyle($default, 0.6);
+ @include placeholderStyle($default, 0.7);
}
.auth-main {
@@ -33,8 +33,8 @@ html {
width: 540px;
margin: 0 auto;
border-radius: 5px;
- @include bg-translucent-dark(0.55);
- color: #fff;
+ background-color: $default;
+ color: $default-text;
padding: 32px;
h1 {
font-weight: $font-light;
@@ -56,7 +56,7 @@ html {
.control-label {
padding-top: 11px;
- color: $default;
+ color: $default-text;
}
.form-group {
@@ -106,7 +106,7 @@ a.forgot-pass {
width: 30%;
white-space: nowrap;
padding: 0 24px;
- color: $default;
+ color: $default-text;
& > span {
margin-top: -12px;
display: block;
@@ -142,13 +142,13 @@ a.forgot-pass {
.btn-auth {
background: $primary;
- color: #ffffff;
+ color: $default-text;
border-radius: 5px;
border-color: $primary;
padding: 7px 12px;
transition: all 0.1s ease;
&:hover {
- color: #ffffff;
+ color: $default-text;
background: $primary;
border-color: $primary;
transform: scale(1.2);
diff --git a/src/sass/theme/_buttons.scss b/src/sass/theme/_buttons.scss
index af24a34ed..0ed3c2169 100644
--- a/src/sass/theme/_buttons.scss
+++ b/src/sass/theme/_buttons.scss
@@ -43,13 +43,6 @@ $hover: 24;
background-color: $primary-dark;
border-color: $primary-dark;
}
- &.btn-default {
- @include styleButton(transparent, $default);
- &:focus, &:active:hover, &.active:hover, &:hover{
- background-color: rgba(0, 0, 0, 0.2);
- color: $default;
- }
- }
&.btn-success {
@include styleButton($success, $success - $hover);
}
@@ -64,22 +57,6 @@ $hover: 24;
}
}
-.dropdown button.btn.btn-default.dropdown-toggle {
- color: #fff;
-}
-
-.bootstrap-select {
- .dropdown-toggle:focus {
- outline: none !important;
- }
- button.btn-default:focus {
- color: $default;
- }
- .btn {
- transition: none;
- }
-}
-
button.btn.btn-primary {
@include buttonColor($primary, $primary);
&:active, &:target {
@@ -89,7 +66,8 @@ button.btn.btn-primary {
button.btn.btn-default {
border-width: 1px;
- @include buttonColor(transparent, $default);
+ color: $default-text;
+ @include buttonColor(transparent, $border);
&:active, &:target {
background-color: rgba(0, 0, 0, 0.2);
color: $default;
diff --git a/src/sass/theme/_layout.scss b/src/sass/theme/_layout.scss
index c026f502f..51583d6cc 100644
--- a/src/sass/theme/_layout.scss
+++ b/src/sass/theme/_layout.scss
@@ -14,11 +14,26 @@ html, body {
body {
font: 14px/16px $font-family;
- color: white;
- @include main-background();
+ color: $default-text;
+ background-color: $body-bg;
+ //@include main-background();
+}
+
+&.mobile{
+ background: none;
+ .body-bg{
+ display: block;
+ position: fixed;
+ top: 0;
+ left: 0;
+ bottom: 0;
+ right: 0;
+ background-attachment: inherit;
+ background-color: $body-bg;
+ //@include main-background();
+ }
}
-
@media screen and (-ms-high-contrast: active), (-ms-high-contrast: none)
{
html{
@@ -63,7 +78,7 @@ a {
display: block;
bottom: 0;
font-size: 13px;
- color: #ffffff;
+ color: $default-text;
transition: padding-left 0.5s ease;
}
@@ -81,14 +96,14 @@ a {
margin-right: 12px;
i {
margin: 0 4px;
- color: $warning;
+ color: $danger;
font-size: 12px;
}
a {
margin-left: 4px;
- color: #ffffff;
+ color: $default-text;
&:hover {
- color: $warning;
+ color: $danger;
}
}
}
@@ -105,7 +120,7 @@ a {
i {
cursor: pointer;
transition: all 0.1s ease;
- color: #ffffff;
+ color: white;
padding: 6px;
box-sizing: content-box;
font-size: 16px;
@@ -198,4 +213,8 @@ a {
* {
visibility: hidden!important;
}
+}
+
+.irs-grid-text {
+ color: $default-text;
}
\ No newline at end of file
diff --git a/src/sass/theme/_table.scss b/src/sass/theme/_table.scss
index 6501b72db..23e778bb1 100644
--- a/src/sass/theme/_table.scss
+++ b/src/sass/theme/_table.scss
@@ -3,7 +3,7 @@
& > thead {
& > tr {
& > th {
- border-bottom: 1px solid rgba(255, 255, 255, 0.1);
+ border-bottom: 1px solid $border;
white-space: nowrap;
&:first-child {
text-align: center;
@@ -22,7 +22,7 @@
& > td {
padding: 0px 8px;
line-height: 35px;
- border-top: 1px solid rgba(255, 255, 255, 0.1);
+ border-top: 1px solid $border;
&:first-child {
text-align: center;
}
@@ -32,12 +32,6 @@
}
}
}
- &.table-bordered {
- border-color: rgba(255, 255, 255, 0.2) !important;
- th, td {
- border-color: rgba(255, 255, 255, 0.2) !important;
- }
- }
}
.table-id {
@@ -148,7 +142,7 @@ tr.editable-row {
}
a.email-link {
- color: $default;
+ color: $default-text;
&:hover {
color: $danger;
}
@@ -209,62 +203,60 @@ input.search-input {
margin-left: 0;
}
-body.badmin-transparent {
- .table {
- & > thead {
- & > tr {
- & > th {
- border-bottom: none;
- }
+.table {
+ & > thead {
+ & > tr {
+ & > th {
+ border-bottom: none;
}
}
- & > tbody {
- & > tr.no-top-border {
- &:first-child > td {
- border-top: none;
- }
+ }
+ & > tbody {
+ & > tr.no-top-border {
+ &:first-child > td {
+ border-top: none;
}
}
}
+}
- .black-muted-bg {
- background-color: rgba(0, 0, 0, 0.1);
- }
-
- .table-hover {
- tr:hover {
- background-color: rgba(0, 0, 0, 0.1);
- }
- }
+.black-muted-bg {
+ background-color: rgba(0, 0, 0, 0.1);
+}
- .table-striped > tbody > tr:nth-of-type(odd) {
+.table-hover {
+ tr:hover {
background-color: rgba(0, 0, 0, 0.1);
}
- .table > tbody > tr.primary > td {
- background-color: rgba($primary,0.7);
- border: none;
- }
- .table > tbody > tr.success > td {
- background-color: rgba($success,0.7);
- border: none;
- }
- .table > tbody > tr.warning > td {
- background-color: rgba($warning,0.7);
- border: none;
- }
- .table > tbody > tr.danger > td {
- background-color: rgba($danger,0.7);
- border: none;
- }
- .table > tbody > tr.info > td {
- background-color: rgba($info,0.7);
- border: none;
- }
+}
- .editable-click, a.editable-click {
- color: $default;
- border-bottom: dashed 1px $default;
- }
+.table-striped > tbody > tr:nth-of-type(odd) {
+ background-color: rgba(0, 0, 0, 0.1);
+}
+.table > tbody > tr.primary > td {
+ background-color: rgba($primary,0.7);
+ border: none;
+}
+.table > tbody > tr.success > td {
+ background-color: rgba($success,0.7);
+ border: none;
+}
+.table > tbody > tr.warning > td {
+ background-color: rgba($warning,0.7);
+ border: none;
+}
+.table > tbody > tr.danger > td {
+ background-color: rgba($danger,0.7);
+ border: none;
+}
+.table > tbody > tr.info > td {
+ background-color: rgba($info,0.7);
+ border: none;
+}
+
+.editable-click, a.editable-click {
+ color: $default-text;
+ border-bottom: dashed 1px $border;
}
th {
@@ -284,8 +276,8 @@ th {
}
.pagination > li > a,
.pagination > li > span{
- color: $default;
- border-color: $default;
+ color: $default-text;
+ border-color: $border;
}
@@ -308,7 +300,7 @@ th {
.pagination > .active > a:focus,
.pagination > .active > span:focus {
background-color: $primary;
- border-color: $default;
+ border-color: $border;
}
.pagination > li > a:hover,
@@ -316,9 +308,13 @@ th {
.pagination > li > a:focus,
.pagination > li > span:focus{
background-color: rgba(0,0,0,.2);
- color: $default;
+ color: $default-text;
}
.editable-buttons .btn-with-icon i {
margin-right: 0;
-}
\ No newline at end of file
+}
+
+.table-responsive {
+ margin-top: 10px;
+}
diff --git a/src/sass/theme/bootstrap-overrides/_panel.scss b/src/sass/theme/bootstrap-overrides/_panel.scss
index 98b79685c..f82d79496 100644
--- a/src/sass/theme/bootstrap-overrides/_panel.scss
+++ b/src/sass/theme/bootstrap-overrides/_panel.scss
@@ -2,16 +2,14 @@ $panel-title-height: 44px;
$panel-heading-font-size: 16px;
.panel {
- border: none;
- background-color: $panel-bg;
+ @include scrollbars(.4em, rgba(0, 0, 0, 0.2), rgba(255, 255, 255, 0.5));
color: $default-text;
+ border: none;
+ border-radius: 5px;
+ background-color: $default;
position: relative;
- //transition: all 0.2s ease;
margin-bottom: 24px;
- box-shadow: 0 5px 5px 0 rgba(0, 0, 0, 0.25);
- /*&:hover {
- background: $panel-bg-hover;
- }*/
+ box-shadow: 0 2px 2px 0 rgba(0, 0, 0, 0.15);
&.animated {
animation-duration: 0.5s;
}
@@ -42,12 +40,18 @@ $panel-heading-font-size: 16px;
}
}
+.panel {
+ background-color: $default;
+}
+
.panel > .panel-body {
padding: 15px 22px;
height: 100%;
}
.panel-heading, .panel-footer {
+ border-bottom: 1px solid rgba(0, 0, 0, 0.12);
+ box-shadow: 0px 1px 0px 0px rgba(255, 255, 255, 0.12);
height: $panel-title-height;
font-size: $panel-heading-font-size;
@@ -63,25 +67,6 @@ $panel-heading-font-size: 16px;
//text-transform: uppercase;
}
-.panel-white, .panel-blur {
- background-size: cover;
- > .panel-heading {
- background-color: transparent;
- border: none;
- color: $default-text;
- }
-}
-
-.panel-white {
- background-color: $panel-bg;
-}
-
-.panel-blur {
- $blurredBgUrl: $images-root + 'blur-bg-blurred.jpg';
- background: url($blurredBgUrl);
- transition: none;
-}
-
.panel-primary {
> .panel-heading {
color: $primary;
diff --git a/src/sass/theme/bootstrap-overrides/_tabs.scss b/src/sass/theme/bootstrap-overrides/_tabs.scss
index 7494d940f..a9b3c44f0 100644
--- a/src/sass/theme/bootstrap-overrides/_tabs.scss
+++ b/src/sass/theme/bootstrap-overrides/_tabs.scss
@@ -119,9 +119,9 @@
.tab-content {
padding: 15px 15px 5px 15px;
background: transparent;
- color: $default;
+ color: $default-text;
.tab-pane p {
- color: $default;
+ color: $default-text;
}
}
@@ -129,7 +129,7 @@
border-top-left-radius: 5px;
border-top-right-radius: 5px;
border-bottom: 1px solid rgba(0, 0, 0, .01);
- background-color: rgba(0, 0, 0, .2);
+ background-color: $primary-light;
a {
color: $default;
&:hover {
@@ -145,7 +145,7 @@
&:hover {
border: none;
color: $default;
- background-color: rgba(0, 0, 0, .1);
+ background-color: rgba(0, 0, 0, .05);
}
}
& > li.active > a {
diff --git a/src/sass/theme/components/_contentTop.scss b/src/sass/theme/components/_contentTop.scss
index a3098a5c3..aeec36a6e 100644
--- a/src/sass/theme/components/_contentTop.scss
+++ b/src/sass/theme/components/_contentTop.scss
@@ -5,7 +5,7 @@
h1.al-title {
font-weight: $font-bold;
- color: #ffffff;
+ color: $default-text;
float: left;
width: auto;
margin: 0;
@@ -17,14 +17,14 @@ h1.al-title {
.al-breadcrumb {
background: none;
- color: #ffffff;
+ color: $default-text;
padding: 0;
margin: 0;
float: right;
padding-top: 11px;
li {
font-size: 18px;
- font-weight: $font-light;
+ font-weight: $font-normal;
}
}
diff --git a/src/sass/theme/components/_msgCenter.scss b/src/sass/theme/components/_msgCenter.scss
index 7459fa1e8..98a15c794 100644
--- a/src/sass/theme/components/_msgCenter.scss
+++ b/src/sass/theme/components/_msgCenter.scss
@@ -27,7 +27,7 @@
margin-left: 0;
}
& > a {
- color: #ffffff;
+ color: $default;
text-decoration: none;
font-size: 13px;
position: relative;
@@ -35,7 +35,7 @@
display: inline-block;
min-width: 10px;
padding: 2px 4px 2px 4px;
- color: #ffffff;
+ color: $default;
vertical-align: baseline;
white-space: nowrap;
text-align: center;
@@ -114,7 +114,7 @@
@include scrollbars(.4em, rgba(0,0,0,0.5), #fff);
.header {
padding: 10px 12px;
- border-bottom: 1px solid $border-light;
+ border-bottom: 1px solid $default;
font-size: 12px;
strong {
float: left;
@@ -133,7 +133,7 @@
overflow: scroll;
overflow-x: hidden;
& > a {
- border-top: 1px solid $border-light;
+ border-top: 1px solid $default;
padding: 10px 12px;
display: block;
text-decoration: none;
@@ -191,7 +191,7 @@
}
}
& > a {
- border-top: 1px solid $border-light;
+ border-top: 1px solid $default;
display: block;
text-align: center;
padding: 10px;
@@ -213,7 +213,7 @@
color: $default-text;
padding: 4px 16px 4px 20px;
&.signout {
- border-top: 1px solid $border-light;
+ border-top: 1px solid $default;
}
i {
margin-right: 10px;
@@ -246,7 +246,7 @@
width: 0;
height: 0;
border: 10px solid transparent;
- border-bottom-color: #ffffff;
+ border-bottom-color: $default;
}
}
}
diff --git a/src/sass/theme/components/_pageTop.scss b/src/sass/theme/components/_pageTop.scss
index 65770fe27..ac3118e34 100644
--- a/src/sass/theme/components/_pageTop.scss
+++ b/src/sass/theme/components/_pageTop.scss
@@ -1,5 +1,5 @@
.page-top {
- @include bg-translucent-dark(0.5);
+ background-color: $sidebar;
position: fixed;
z-index: 904;
box-shadow: 2px 0px 3px rgba(0, 0, 0, 0.5);
@@ -9,12 +9,12 @@
padding: 0 32px 0 40px;
&.scrolled {
- @include bg-translucent-dark(0.85);
+ //background-color: rgba($sidebar, 0.9)
}
}
a.al-logo {
- color: #ffffff;
+ color: $default;
display: block;
font-size: 24px;
font-family: $font-family;
@@ -55,7 +55,7 @@ a.al-logo {
}
a.refresh-data {
- color: #ffffff;
+ color: $default;
font-size: 13px;
text-decoration: none;
font-weight: $font-normal;
@@ -74,7 +74,7 @@ a.collapse-menu-link {
display: block;
text-decoration: none;
line-height: 42px;
- color: #fff;
+ color: $default;
padding: 0;
float: left;
margin: 11px 0 0 25px;
@@ -107,7 +107,7 @@ a.collapse-menu-link {
.search {
text-shadow: none;
- color: #fff;
+ color: $default;
font-size: 13px;
line-height: 25px;
transition: all 0.5s ease;
diff --git a/src/sass/theme/components/_sidebar.scss b/src/sass/theme/components/_sidebar.scss
index 0d3a58d2f..8b6b51cd1 100644
--- a/src/sass/theme/components/_sidebar.scss
+++ b/src/sass/theme/components/_sidebar.scss
@@ -9,7 +9,7 @@ $angle-right: "\f101";
z-index: 904;
display: block;
min-height: 100%;
- @include bg-translucent-dark(0.5);
+ background-color: $sidebar;
height: 100%;
position: fixed;
}
@@ -53,7 +53,7 @@ a.al-sidebar-list-link {
text-shadow: none;
font-size: 13px;
text-decoration: none;
- color: #ffffff;
+ color: $default;
line-height: 42px;
white-space: nowrap;
overflow: hidden;
@@ -121,7 +121,7 @@ a.al-sidebar-list-link {
text-shadow: none;
font-size: 13px;
text-decoration: none;
- color: #ffffff;
+ color: $default;
padding-left: 52px;
height: auto;
line-height: 29px;
diff --git a/src/sass/theme/conf/_colorScheme.scss b/src/sass/theme/conf/_colorScheme.scss
index eb75f8e11..8c3fe80ee 100644
--- a/src/sass/theme/conf/_colorScheme.scss
+++ b/src/sass/theme/conf/_colorScheme.scss
@@ -1,3 +1,14 @@
+$default: #ffffff;
+$body-bg: #F0F3F4;
+$default-text: #666666;
+$help-text: #949494;
+$disabled: #dddddd;
+$disabled-bg: tint($disabled, 15%);
+$border: #d6d6d6;
+$border-light: tint($border, 15%);
+$input-border: shade($border, 5%);
+$sidebar: #1C2B36;
+
$primary: #209e91 !default;
$info: #2dacd1 !default;
$success: #90b900 !default;
@@ -21,3 +32,12 @@ $info-bg: tint($info, 20%);
$success-bg: tint($success, 20%);
$warning-bg: tint($warning, 20%);
$danger-bg: tint($danger, 20%);
+
+$facebook-color: #3b5998;
+$twitter-color: #55acee;
+$google-color: #dd4b39;
+$linkedin-color: #0177B5;
+$github-color: #6b6b6b;
+$stackoverflow-color: #2F96E8;
+$dribble-color: #F26798;
+$behace-color: #0093FA;
diff --git a/src/sass/theme/conf/_variables.scss b/src/sass/theme/conf/_variables.scss
index 5806bded0..6d4fdbd51 100644
--- a/src/sass/theme/conf/_variables.scss
+++ b/src/sass/theme/conf/_variables.scss
@@ -1,34 +1,8 @@
$font-family: 'Roboto', sans-serif;
-$view-total :rgba(0,0,0,.4);
-
$activelink: $primary;
$hoverlink: $primary-dark;
-$default: #ffffff !default;
-
-$facebook-color: #3b5998;
-$twitter-color: #55acee;
-$google-color: #dd4b39;
-$linkedin-color: #0177B5;
-$github-color: #6b6b6b;
-$stackoverflow-color: #2F96E8;
-$dribble-color: #F26798;
-$behace-color: #0093FA;
-
-$panel-bg: #f8f8f8;
-$panel-bg-hover: #fff;
-
-$disabled: #bdbdbd;
-$disabled-bg: #e6e6e6;
-
-$default-text: #7b7b7b;
-$help-text: #949494;
-
-$border: #dddddd;
-$border-light: #eeeeee;
-$input-border: #cccccc;
-
$resXXL: 1280px;
$resXL: 1170px;
$resL: 991px;
diff --git a/src/sass/theme/dashboard/_blurFeed.scss b/src/sass/theme/dashboard/_blurFeed.scss
index 0774e0592..3ae33dec7 100644
--- a/src/sass/theme/dashboard/_blurFeed.scss
+++ b/src/sass/theme/dashboard/_blurFeed.scss
@@ -3,7 +3,7 @@
}
.feed-message {
- $text-message-color: $default;
+ $text-message-color: $default-text;
$video-message-color: $danger;
$image-message-color: $success;
$geo-message-color: $primary;
@@ -80,7 +80,7 @@
border-radius: 5px;
margin: 0 0 0 80px;
padding: 5px 20px;
- color: #fff;
+ color: $default-text;
width: 280px;
height: 70px;
diff --git a/src/sass/theme/dashboard/_calendar.scss b/src/sass/theme/dashboard/_calendar.scss
index 366d924da..e8de68002 100644
--- a/src/sass/theme/dashboard/_calendar.scss
+++ b/src/sass/theme/dashboard/_calendar.scss
@@ -98,7 +98,7 @@ div.blurCalendar{
}
.fc-popover {
- background-color: #ffffff;
+ background-color: $default;
border: 1px solid;
.fc-header {
@@ -330,7 +330,7 @@ div.blurCalendar{
.fc-event,
.fc-event:hover,
.ui-widget .fc-event {
- color: #ffffff;
+ color: $default;
text-decoration: none;
}
@@ -663,7 +663,7 @@ a.fc-more {
.fc-bg {
z-index: 1;
- background: #fff;
+ background: $default;
opacity: .25;
filter: alpha(opacity=25);
}
@@ -720,51 +720,49 @@ a.fc-more {
.fc-day-grid-container.fc-scroller {
height: auto!important;
}
-body.badmin-transparent{
- .calendar-panel.panel .panel-body{
- padding: 0;
- }
+.calendar-panel.panel .panel-body{
+ padding: 0;
+}
- .fc-body > tr > .fc-widget-content{
- border: none;
- }
+.fc-body > tr > .fc-widget-content{
+ border: none;
+}
- .fc-head{
- color: $default;
- background-color: $primary;
- td, th{
- border:none;
- }
- div.fc-widget-header{
- padding: 5px 0;
- }
+.fc-head{
+ color: $default;
+ background-color: $primary;
+ td, th{
+ border:none;
}
-
- .fc td{
- border-color: rgba(255,255,255,0.1);
+ div.fc-widget-header{
+ padding: 5px 0;
}
+}
- .fc-today-button, .fc-month-button, .fc-agendaWeek-button, .fc-agendaDay-button {
- display: none;
- }
- .blurCalendar{
- margin-top: 15px;
- }
- .fc-prev-button, .fc-next-button{
- position: absolute;
- background: transparent;
- box-shadow: none;
- border: none;
- color: $default;
- }
- .fc-next-button {
- left: 30px;
- }
- .fc-prev-button {
- }
- .fc-day-number{
- color: $default;
- opacity: 0.9;
- }
-}
\ No newline at end of file
+.fc td{
+ border-color: $border;
+}
+
+.fc-today-button, .fc-month-button, .fc-agendaWeek-button, .fc-agendaDay-button {
+ display: none;
+}
+.blurCalendar{
+ margin-top: 15px;
+}
+.fc-prev-button, .fc-next-button{
+ position: absolute;
+ background: transparent;
+ box-shadow: none;
+ border: none;
+ color: $default-text;
+}
+.fc-next-button {
+ left: 30px;
+}
+.fc-prev-button {
+}
+.fc-day-number{
+ color: $default-text;
+ opacity: 0.9;
+}
diff --git a/src/sass/theme/dashboard/_popularApp.scss b/src/sass/theme/dashboard/_popularApp.scss
index ebda34de0..9b52f84bb 100644
--- a/src/sass/theme/dashboard/_popularApp.scss
+++ b/src/sass/theme/dashboard/_popularApp.scss
@@ -5,14 +5,13 @@
.popular-app-img {
position: relative;
- background: rgba(0, 0, 0, 0.5);
padding: 30px 0;
height: 260px;
border-top-right-radius: 5px;
border-top-left-radius: 5px;
+ border-bottom: 1px solid $border;
img {
- max-width: 60%;
- max-height: 70%;
+ max-width: 85%;
position: absolute;
transform: translateY(-50%) translate(-50%);
top: 50%;
@@ -22,7 +21,8 @@
.popular-app-cost {
font-size: 20px;
padding: 20px 22px;
- border-bottom: 1px solid $border;
+ border-bottom: 1px solid rgba(0, 0, 0, 0.12);
+ box-shadow: 0 1px 0 0 rgba(255, 255, 255, 0.12);
}
.popular-app-info {
padding: 20px 22px;
@@ -39,14 +39,3 @@
}
}
}
-
-body.badmin-transparent {
- .popular-app-img {
- border-top-right-radius: 5px;
- border-top-left-radius: 5px;
- }
- .popular-app-cost {
- border-bottom: 1px solid rgba(0, 0, 0, 0.12);
- box-shadow: 0px 1px 0px 0px rgba(255, 255, 255, 0.12);
- }
-}
\ No newline at end of file
diff --git a/src/sass/theme/dashboard/_timeline.scss b/src/sass/theme/dashboard/_timeline.scss
index 45ca39f15..ab474112e 100644
--- a/src/sass/theme/dashboard/_timeline.scss
+++ b/src/sass/theme/dashboard/_timeline.scss
@@ -132,25 +132,19 @@
@mixin cd-timeline-color($color) {
background: $color;
- &:before {
- border-right-color: $color;
- }
}
-
-.cd-timeline-content-yellow {
- @include cd-timeline-color(rgba(0,0,0,.2));
+.cd-timeline-content.warning {
+ @include cd-timeline-color(rgba($warning, 0.2));
}
-
-.cd-timeline-content-red {
- @include cd-timeline-color(rgba(0,0,0,.2));
+.cd-timeline-content.danger {
+ @include cd-timeline-color(rgba($danger, 0.2));
}
-
-.cd-timeline-content-blue {
- @include cd-timeline-color(rgba(0,0,0,.2));
+.cd-timeline-content.primary {
+ @include cd-timeline-color(rgba($primary, 0.2));
}
.no-touch .cd-timeline-content .cd-read-more:hover {
- background-color: #bac4cb;
+ background-color: $border;
}
@media only screen and (min-width: $resXL) {
@@ -198,17 +192,14 @@
border-left-color: $color;
}
}
-
- .cd-timeline-content-yellow {
- @include cd-timeline-left-color(rgba(0,0,0,.2));
+ .cd-timeline-content.warning {
+ @include cd-timeline-left-color(rgba($warning, 0.2));
}
-
- .cd-timeline-content-red {
- @include cd-timeline-left-color(rgba(0,0,0,.2));
+ .cd-timeline-content.danger {
+ @include cd-timeline-left-color(rgba($danger, 0.2));
}
-
- .cd-timeline-content-blue {
- @include cd-timeline-left-color(rgba(0,0,0,.2));
+ .cd-timeline-content.primary {
+ @include cd-timeline-left-color(rgba($primary, 0.2));
}
.cd-timeline-block:nth-child(even) .cd-timeline-content {
@@ -230,14 +221,14 @@
border-right-color: $color;
}
}
- &.cd-timeline-content-yellow {
- @include cd-timeline-right-color(rgba(0,0,0,.2));
+ &.cd-timeline-content.warning {
+ @include cd-timeline-right-color(rgba($warning, 0.2));
}
- &.cd-timeline-content-red {
- @include cd-timeline-right-color(rgba(0,0,0,.2));
+ &.cd-timeline-content.danger {
+ @include cd-timeline-right-color(rgba($danger, 0.2));
}
- &.cd-timeline-content-blue {
- @include cd-timeline-right-color(rgba(0,0,0,.2));
+ &.cd-timeline-content.primary {
+ @include cd-timeline-right-color(rgba($primary, 0.2));
}
}
}
diff --git a/src/sass/theme/dashboard/_todo.scss b/src/sass/theme/dashboard/_todo.scss
index 95d8233b3..c5027468f 100644
--- a/src/sass/theme/dashboard/_todo.scss
+++ b/src/sass/theme/dashboard/_todo.scss
@@ -22,11 +22,11 @@ ul.todo-list {
right: 12px;
font-size: 32px;
transition: color 0.2s;
- color: $input-border;
+ color: rgba($input-border, 0.5);
visibility: hidden;
line-height: 42px;
&:hover {
- color: $danger-dark;
+ color: $input-border;
}
}
&:hover {
@@ -37,34 +37,13 @@ ul.todo-list {
&.checked {
.todo-text {
- color: #BFBFBF;
+ color: $default-text;
}
&:before {
background: $input-border !important;
}
}
- @mixin mark($color) {
- i.mark {
- background: $color;
- }
- }
- &.primary {
- @include mark($primary);
- }
- &.danger {
- @include mark($danger);
- }
- &.success {
- @include mark($success);
- }
- &.info {
- @include mark($info);
- }
- &.warning {
- @include mark($warning);
- }
-
i.mark {
display: block;
position: absolute;
@@ -117,104 +96,3 @@ label.todo-checkbox {
.add-item-icon {
display: none;
}
-
-body.badmin-transparent {
- .todo-panel.panel {
- color: white;
- opacity: 0.9;
- }
- input.task-todo {
- color: white;
- width: calc(100% - 25px);
- border-radius: 0;
- border: none;
- background: transparent;
- &:focus {
- outline: none;
- background-color: transparent;
- border-bottom: 1px solid rgba(0, 0, 0, 0.12);
- box-shadow: 0px 1px 0px 0px rgba(255, 255, 255, 0.12);
- }
- }
- .add-item-icon {
- display: block;
- float: right;
- margin-top: -45px;
- margin-right: 5px;
- font-size: 25px;
- cursor: pointer;
- }
-
- ul.todo-list {
- li {
- margin: 0;
- border: none;
- font-weight: $font-light;
-
- .blur-container{
- height: 40px;
- position: absolute;
- width: calc(100% + 40px);;
- top: 0;
- left: -25px;
- overflow-y: hidden;
- }
- &:hover{
- .blur-container{
- box-shadow: 0px 1px 0px 0px rgba(255, 255, 255, 0.12);
- }
- .blur-box {
- height: 100%;
- background: linear-gradient(to right, rgba(255,255,255,0.3) 0%,rgba(255,255,255,0) 100%);
- -webkit-filter: blur(3px);
- }
- }
- &.primary, &.danger,&.success, &.info, &.warning {
- i.mark {
- background-color: transparent;
- }
- }
- i.remove-todo {
- color: white;
- opacity: 0.4;
- &:hover {
- color: white;
- opacity: 0.95;
- }
- }
- i.mark {
- min-width: 40px;
- background-color: transparent;
- }
- label.todo-checkbox > span {
- &:before {
- position: absolute;
- color: white;
- content: '\f10c';
- float: none;
- margin-right: 6px;
- transition: none;
- }
- }
- &.checked {
- label.todo-checkbox > span {
- &:before {
- margin-right: 0;
- position: absolute;
- content: '';
- background-size: contain;
- background: url($images-root + "app/todo/check-icon.png") no-repeat;
- }
- }
- }
- }
- }
-
- .box-shadow-border{
- border-bottom: 1px solid rgba(0, 0, 0, 0.12);
- box-shadow: 0px 1px 0px 0px rgba(255, 255, 255, 0.12);
- width: calc(100% + 44px);
- margin-left: -22px;
- }
-
-}
\ No newline at end of file
diff --git a/src/sass/theme/dashboard/_trafficChart.scss b/src/sass/theme/dashboard/_trafficChart.scss
index 97426bf32..1c74778cd 100644
--- a/src/sass/theme/dashboard/_trafficChart.scss
+++ b/src/sass/theme/dashboard/_trafficChart.scss
@@ -101,10 +101,12 @@
border-radius: 0;
width: 100%;
margin-bottom: 0;
- background-color: rgba(0, 0, 0, 0.25);
+ background-color: $border-light;
+ box-shadow: none;
.progress-bar{
height: 4px;
- background-color: white;
+ background-color: $input-border;
+ box-shadow: none;
}
}
@@ -119,12 +121,11 @@
}
.traffic-chart canvas{
- border: 10px solid rgba(0,0,0,0.0);
+ border: 10px solid $default;
border-radius: 150px;
}
.chart-bg{
- background-color: $view-total;
position: absolute;
border-radius: 100px;
width: 180px;
@@ -190,13 +191,4 @@
width: 142px;
height: 142px;
}
-}
-
-
-body.badmin-transparent{
- .traffic-chart canvas{
- border: 10px solid rgba(0,0,0,0.35);
- box-shadow: 0 0 5px 0 rgb(0, 0, 0) inset;
- border-radius: 150px;
- }
}
\ No newline at end of file
diff --git a/src/sass/theme/skins/_02_transparent.scss b/src/sass/theme/skins/_02_transparent.scss
deleted file mode 100644
index 8cec40a0e..000000000
--- a/src/sass/theme/skins/_02_transparent.scss
+++ /dev/null
@@ -1,52 +0,0 @@
-body.badmin-transparent {
- &.mobile{
- background: none;
- .body-bg{
- display: block;
- position: fixed;
- top: 0;
- left: 0;
- bottom: 0;
- right: 0;
- @include main-background();
- background-attachment: inherit;
- }
- .panel-blur {
- background: transparent;
- }
- }
- @include overrideColors(#fff);
- @include overridePanelBg(rgba(0, 0, 0, 0.15), rgba(0, 0, 0, 0.5), rgba(0, 0, 0, 0.9));
- .default-color {
- color: $default-text !important;;
- }
- .panel.panel-blur {
- background-attachment: fixed;
- @include scrollbars(.4em, rgba(0, 0, 0, 0.7), rgba(255, 255, 255, 0.8));
- border-radius: 5px;
- color: $default;
- .panel-heading {
- border-bottom: 1px solid rgba(0, 0, 0, 0.12);
- box-shadow: 0px 1px 0px 0px rgba(255, 255, 255, 0.12);
- transform: translate3d(0,0,0);
- }
- .panel-body {
- transform: translate3d(0,0,0);
- }
- }
- .btn-default {
- color: $default;
- }
- .form-control, .bootstrap-tagsinput input {
- @include placeholderStyle($default, 0.7);
- background-color: rgba(0, 0, 0, .15);
- border-radius: 5px;
- color: $default;
- }
- .form-control[disabled], .form-control[readonly], fieldset[disabled] .form-control {
- @include placeholderStyle($default, 0.5);
- }
- .irs-grid-text {
- color: $default;
- }
-}
\ No newline at end of file
diff --git a/src/sass/theme/skins/_03_blue.scss b/src/sass/theme/skins/_03_blue.scss
deleted file mode 100644
index 8d346f0c1..000000000
--- a/src/sass/theme/skins/_03_blue.scss
+++ /dev/null
@@ -1,3 +0,0 @@
-body.badmin-blue {
- background-image: url(../../../assets/img/blue-bg.jpg);
-}
\ No newline at end of file
diff --git a/src/sass/theme/skins/_04_peachy.scss b/src/sass/theme/skins/_04_peachy.scss
deleted file mode 100644
index 4d5aaa889..000000000
--- a/src/sass/theme/skins/_04_peachy.scss
+++ /dev/null
@@ -1,3 +0,0 @@
-body.badmin-peachy {
- background-image: url(../../../assets/img/peachy-bg.jpg);
-}
\ No newline at end of file
diff --git a/src/sass/theme/skins/_05_material.scss b/src/sass/theme/skins/_05_material.scss
deleted file mode 100644
index 61696442c..000000000
--- a/src/sass/theme/skins/_05_material.scss
+++ /dev/null
@@ -1,3 +0,0 @@
-body.badmin-material {
- background: #039be6;
-}
\ No newline at end of file
diff --git a/src/sass/theme/skins/_06_transblue.scss b/src/sass/theme/skins/_06_transblue.scss
deleted file mode 100644
index 733af1052..000000000
--- a/src/sass/theme/skins/_06_transblue.scss
+++ /dev/null
@@ -1,6 +0,0 @@
-body.badmin-transblue {
- background-image: url(../../../assets/img/transblue-bg.jpg);
-
- @include overrideColors(#fff);
- @include overridePanelBg(rgba(0, 0, 0, 0.5), rgba(0, 0, 0, 0.5), rgba(0, 0, 0, 0.9));
-}
\ No newline at end of file
diff --git a/src/sass/theme/skins/_07_grey.scss b/src/sass/theme/skins/_07_grey.scss
deleted file mode 100644
index c36b69055..000000000
--- a/src/sass/theme/skins/_07_grey.scss
+++ /dev/null
@@ -1,3 +0,0 @@
-body.badmin-grey {
- background: #bdbdbd;
-}
\ No newline at end of file
-
-
-
-
- ![]()
-
-
-