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

refactor(colors): apply new colors

pull/3/head
alex 2016-02-12 12:37:04 +03:00
parent 3b0e78337c
commit cf01569215
7 changed files with 96 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -19,25 +19,25 @@
}, },
{ {
value: 1500, value: 1500,
color: layoutColors.primary, color: layoutColors.primaryCharts,
highlight: layoutColors.primaryBg, highlight: layoutColors.primaryLight,
label: 'Search engines' label: 'Search engines'
}, },
{ {
value: 1000, value: 1000,
color: layoutColors.success, color: layoutColors.successCharts,
highlight: layoutColors.successBg, highlight: layoutColors.successBg,
label: 'Direct Traffic' label: 'Direct Traffic'
}, },
{ {
value: 1200, value: 1200,
color: layoutColors.info, color: layoutColors.infoCharts,
highlight: layoutColors.infoBg, highlight: layoutColors.infoBg,
label: 'Referral Traffic' label: 'Referral Traffic'
}, },
{ {
value: 400, value: 400,
color: layoutColors.warning, color: layoutColors.warningCharts,
highlight: layoutColors.warningBg, highlight: layoutColors.warningBg,
label: 'Other' label: 'Other'
} }

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

@ -8,39 +8,48 @@
var IMAGES_ROOT = 'assets/img/'; var IMAGES_ROOT = 'assets/img/';
angular.module('BlurAdmin.theme') angular.module('BlurAdmin.theme')
.constant('layoutColors', { .constant('layoutColors', {
primary: '#005562', primary: '#209e91',
info: '#6eba8c', info: '#2dacd1',
success: '#0e8174', success: '#90b900',
warning: '#b9f2a1', warning: '#dfb81c',
danger: '#ffa76d', danger: '#e85656',
default: '#ffffff', default: '#ffffff',
successLight: '#85BA54', successLight: '#85BA54',
primaryLight: '#5FBCBB', primaryLight: '#5FBCBB',
warningLight: '#c5d36a', warningLight: '#c5d36a',
primaryDark: '#003e4b',
dangerDark: '#c37350',
successDark: '#18524b',
warningDark: '#8adc68',
primaryBg: '#0d8da2', primaryDark: '#17857a',
successBg: '#02b6a2', dangerDark: '#c24848',
dangerBg: '#ffcd92', successDark: '#7b9e00',
infoBg: '#a8e6b3', warningDark: '#c6a315',
warningBg: '#e4fbd3', infoDark: '#258ead',
defaultText: '#ffffff' primaryBg: '#63cec3',
}) infoBg: '#5abfdd',
.constant('layoutSizes', { successBg: '#b5d448',
resWidthCollapseSidebar: 1200, warningBg: '#e8ca52',
resWidthHideSidebar: 500 dangerBg: '#f67171',
})
.constant('layoutPaths', { primaryCharts: '#218d9d',
images: { successCharts: '#c2eb70',
root: IMAGES_ROOT, infoCharts: '#59c3b8',
profile: IMAGES_ROOT + 'app/profile/', warningCharts: '#f9d673',
amChart: 'bower_components/ammap/dist/ammap/images/' dangerCharts: '#faad74',
} defaultCharts: '#ffffff',
});
defaultText: '#ffffff'
})
.constant('layoutSizes', {
resWidthCollapseSidebar: 1200,
resWidthHideSidebar: 500
})
.constant('layoutPaths', {
images: {
root: IMAGES_ROOT,
profile: IMAGES_ROOT + 'app/profile/',
amChart: 'bower_components/ammap/dist/ammap/images/'
}
});
})(); })();

2
src/sass/app/_email.scss
View File

@ -248,7 +248,7 @@
} }
&.study { &.study {
background-color: $warning-btn; background-color: $warning;
} }
&.family { &.family {

30
src/sass/theme/_buttons.scss
View File

@ -36,22 +36,22 @@ $hover: 24;
.open > .dropdown-toggle { .open > .dropdown-toggle {
&.btn-primary { &.btn-primary {
@include styleButton($primary-btn, $primary-btn - $hover); @include styleButton($primary, $primary - $hover);
} }
&.btn-default { &.btn-default {
@include styleButton(transparent, $default); @include styleButton(transparent, $default);
} }
&.btn-success { &.btn-success {
@include styleButton($success-btn, $success-btn - $hover); @include styleButton($success, $success - $hover);
} }
&.btn-info { &.btn-info {
@include styleButton($info-btn, $info-btn - $hover); @include styleButton($info, $info - $hover);
} }
&.btn-warning { &.btn-warning {
@include styleButton($warning-btn, $warning-btn - $hover); @include styleButton($warning, $warning - $hover);
} }
&.btn-danger { &.btn-danger {
@include styleButton($danger-btn, $danger-btn - $hover); @include styleButton($danger, $danger - $hover);
} }
} }
@ -60,7 +60,7 @@ $hover: 24;
} }
.btn-primary { .btn-primary {
@include buttonColor($primary-btn, $primary-btn); @include buttonColor($primary, $primary);
} }
.btn-default { .btn-default {
@ -69,19 +69,19 @@ $hover: 24;
} }
.btn-success { .btn-success {
@include buttonColor($success-btn, $success-btn); @include buttonColor($success, $success);
} }
.btn-info { .btn-info {
@include buttonColor($info-btn, $info-btn); @include buttonColor($info, $info);
} }
.btn-warning { .btn-warning {
@include buttonColor($warning-btn, $warning-btn); @include buttonColor($warning, $warning);
} }
.btn-danger { .btn-danger {
@include buttonColor($danger-btn, $danger-btn); @include buttonColor($danger, $danger);
} }
.btn-with-icon { .btn-with-icon {
@ -154,7 +154,7 @@ $hover: 24;
} }
&.btn-primary { &.btn-primary {
@include progressButtonColor($primary-btn); @include progressButtonColor($primary);
} }
&.btn-default { &.btn-default {
@ -162,19 +162,19 @@ $hover: 24;
} }
&.btn-success { &.btn-success {
@include progressButtonColor($success-btn); @include progressButtonColor($success);
} }
&.btn-info { &.btn-info {
@include progressButtonColor($info-btn); @include progressButtonColor($info);
} }
&.btn-warning { &.btn-warning {
@include progressButtonColor($warning-btn); @include progressButtonColor($warning);
} }
&.btn-danger { &.btn-danger {
@include progressButtonColor($danger-btn); @include progressButtonColor($danger);
} }
} }

10
src/sass/theme/_table.scss
View File

@ -210,18 +210,18 @@ body.badmin-transparent {
background-color: rgba(0, 0, 0, 0.25); background-color: rgba(0, 0, 0, 0.25);
} }
.table > tbody > tr.primary > td{ .table > tbody > tr.primary > td{
background-color: $primary-btn; background-color: $primary;
} }
.table > tbody > tr.success > td{ .table > tbody > tr.success > td{
background-color: $success-btn; background-color: $success;
} }
.table > tbody > tr.warning > td{ .table > tbody > tr.warning > td{
background-color: $warning-btn; background-color: $warning;
} }
.table > tbody > tr.danger > td{ .table > tbody > tr.danger > td{
background-color: $danger-btn; background-color: $danger;
} }
.table > tbody > tr.info > td{ .table > tbody > tr.info > td{
background-color: $info-btn; background-color: $info;
} }
} }

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

@ -1,32 +1,34 @@
$font-family: 'Roboto', sans-serif; $font-family: 'Roboto', sans-serif;
$primary: #005562 !default;
$info: #6eba8c !default;
$success: #0e8174 !default;
$warning: #b9f2a1 !default;
$danger: #ffa76d !default;
$default: #ffffff !default; $default: #ffffff !default;
$primary: #209e91 !default;
$primary-dark: #003e4b; $info: #2dacd1 !default;
$danger-dark: #c37350; $success: #90b900 !default;
$success-dark: #18524b; $warning: #dfb81c !default;
$warning-dark: #8adc68; $danger: #e85656 !default;
$primary-bg: #0d8da2;
$success-bg: #02b6a2;
$danger-bg: #ffcd92;
$info-bg: #a8e6b3;
$warning-bg: #e4fbd3;
$primary-light: #5FBCBB; $primary-light: #5FBCBB;
$success-light: #85BA54; $success-light: #85BA54;
$primary-btn: #209e91; $primary-dark: #17857a;
$info-btn: #2dacd1; $info-dark: #258ead;
$success-btn: #90b900; $success-dark: #7b9e00;
$primary-btn: #209e91; $warning-dark: #c6a315;
$warning-btn: #dfb81c; $danger-dark: #c24848;
$danger-btn: #e85656;
$primary-bg: #63cec3;
$info-bg: #5abfdd;
$success-bg: #b5d448;
$warning-bg: #e8ca52;
$danger-bg: #f67171;
$primary-charts :#218d9d;
$success-charts :#c2eb70;
$info-charts :#59c3b8;
$warning-charts :#f9d673;
$danger-charts :#faad74;
$default-charts :#ffffff;
$accent: #E3FF53; $accent: #E3FF53;
$activelink: #D6FF8A; $activelink: #D6FF8A;

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

@ -117,22 +117,22 @@
border-radius: 15px; border-radius: 15px;
left: -45px; left: -45px;
&.info{ &.info{
background-color: $info; background-color: $info-charts;
} }
&.success{ &.success{
background-color: $success; background-color: $success-charts;
} }
&.danger{ &.danger{
background-color: $danger; background-color: $danger-charts;
} }
&.default{ &.default{
background-color: $default; background-color: $default;
} }
&.warning{ &.warning{
background-color: $warning; background-color: $warning-charts;
} }
&.primary{ &.primary{
background-color: $primary; background-color: $primary-charts;
} }
} }