jinql
/
blur-admin
mirror of https://github.com/akveo/blur-admin
1
0
Fork 0
Code Issues Releases Wiki Activity

use new color scheme

pull/3/head
alex 2016-02-05 18:19:26 +03:00
parent 7333ec856b
commit e48807da86
5 changed files with 43 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/app/pages/dashboard/trafficChart/TrafficChartCtrl.js
View File

@ -13,32 +13,32 @@
var doughnutData = [ var doughnutData = [
{ {
value: 2000, value: 2000,
color: layoutColors.primary, color: layoutColors.default,
highlight: layoutColors.primaryDark, highlight: layoutColors.primaryDark,
label: 'Ad Campaigns' label: 'Ad Campaigns'
}, },
{ {
value: 1500, value: 1500,
color: layoutColors.danger, color: layoutColors.primary,
highlight: layoutColors.dangerDark, highlight: layoutColors.primaryBg,
label: 'Search engines' label: 'Search engines'
}, },
{ {
value: 1000, value: 1000,
color: layoutColors.successLight, color: layoutColors.info,
highlight: '#6c9c3f', highlight: layoutColors.infoBg,
label: 'Direct Traffic' label: 'Direct Traffic'
}, },
{ {
value: 1200, value: 1200,
color: layoutColors.success, color: layoutColors.success,
highlight: layoutColors.successDark, highlight: layoutColors.successBg,
label: 'Referral Traffic' label: 'Referral Traffic'
}, },
{ {
value: 400, value: 400,
color: layoutColors.warning, color: layoutColors.warning,
highlight: layoutColors.warningDark, highlight: layoutColors.warningBg,
label: 'Other' label: 'Other'
} }
]; ];

8
src/app/pages/dashboard/trafficChart/trafficChart.html
View File

@ -15,7 +15,7 @@
<div class="channels-info"> <div class="channels-info">
<div> <div>
<div class="channels-info-item"> <div class="channels-info-item">
<div class="legend-color successLight"></div> <div class="legend-color info"></div>
<p>Direct Traffic<span class="channel-number">+70%</span></p> <p>Direct Traffic<span class="channel-number">+70%</span></p>
<div class="progress progress-sm channel-progress"> <div class="progress progress-sm channel-progress">
<div class="progress-bar " role="progressbar" <div class="progress-bar " role="progressbar"
@ -25,7 +25,7 @@
</div> </div>
<div class="channels-info-item"> <div class="channels-info-item">
<div class="legend-color danger"></div> <div class="legend-color primary"></div>
<p>Search engines<span class="channel-number">+22%</span></p> <p>Search engines<span class="channel-number">+22%</span></p>
<div class="progress progress-sm channel-progress"> <div class="progress progress-sm channel-progress">
<div class="progress-bar " role="progressbar" <div class="progress-bar " role="progressbar"
@ -35,7 +35,7 @@
</div> </div>
<div class="channels-info-item"> <div class="channels-info-item">
<div class="legend-color primary"></div> <div class="legend-color default"></div>
<p>Ad Campaigns<span class="channel-number">+87%</span></p> <p>Ad Campaigns<span class="channel-number">+87%</span></p>
<div class="progress progress-sm channel-progress"> <div class="progress progress-sm channel-progress">
<div class="progress-bar " role="progressbar" <div class="progress-bar " role="progressbar"
@ -45,7 +45,7 @@
</div> </div>
<div class="channels-info-item"> <div class="channels-info-item">
<div class="legend-color successDark"></div> <div class="legend-color success"></div>
<p>Referral<span class="channel-number">+38%</span></p> <p>Referral<span class="channel-number">+38%</span></p>
<div class="progress progress-sm channel-progress"> <div class="progress progress-sm channel-progress">
<div class="progress-bar " role="progressbar" <div class="progress-bar " role="progressbar"

28
src/app/theme/theme.constants.js
View File

@ -9,23 +9,25 @@
angular.module('BlurAdmin.theme') angular.module('BlurAdmin.theme')
.constant('layoutColors', { .constant('layoutColors', {
primary: '#41bee9', primary: '#005562',
info: '#5bc0de', info: '#6eba8c',
danger: '#9d498c', success: '#0e8174',
success: '#348779', warning: '#b9f2a1',
warning: '#bbcb50', danger: '#ffa76d',
default: '#e1e1e1', default: '#ffffff',
successLight: '#85BA54', successLight: '#85BA54',
primaryLight: '#5FBCBB', primaryLight: '#5FBCBB',
warningLight: '#c5d36a', warningLight: '#c5d36a',
primaryDark: '#1488b0', primaryDark: '#001d21',
dangerDark: '#632e58', dangerDark: '#573925',
successDark: '#1c4a42', successDark: '#052c27',
warningDark: '#8b992d', warningDark: '#3f5237',
primaryBg: '#C5ECF9', primaryBg: '#b3ccd0',
successBg: '#C1DBD7', successBg: '#b7d9d5',
dangerBg: '#E1C8DD', dangerBg: '#ffe5d3',
infoBg: '#d4eadd',
warningBg: '#eafbe3',
defaultText: '#585858' defaultText: '#585858'
}) })

12
src/sass/theme/conf/_variables.scss
View File

@ -1,11 +1,11 @@
$font-family: 'Roboto', sans-serif; $font-family: 'Roboto', sans-serif;
$primary: #41bee9!default; $primary: #005562!default;
$info: #5bc0de!default; $info: #6eba8c!default;
$success: #348779!default; $success: #0e8174!default;
$warning: #bbcb50!default; $warning: #b9f2a1!default;
$danger: #9d498c!default; $danger: #ffa76d!default;
$default: #e9e9e9!default; $default: #ffffff!default;
$primary-dark: shade($primary, 66%); $primary-dark: shade($primary, 66%);
$success-dark: shade($success, 66%); $success-dark: shade($success, 66%);

19
src/sass/theme/dashboard/_trafficChart.scss
View File

@ -116,20 +116,23 @@
top: 27px; top: 27px;
border-radius: 15px; border-radius: 15px;
left: -45px; left: -45px;
&.successDark{ &.info{
background-color: $success-dark; background-color: $info;
} }
&.successLight{ &.success{
background-color: $success-light; background-color: $success;
} }
&.danger{ &.danger{
background-color: $danger-bg; background-color: $danger;
} }
&.primary{ &.default{
background-color: $primary-bg; background-color: $default;
} }
&.warning{ &.warning{
background-color: $warning-bg; background-color: $warning;
}
&.primary{
background-color: $primary;
} }
} }