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

fix(dashboard): move progress bar colors to variables

pull/46/head
KostyaDanovsky 2016-05-11 11:52:26 +03:00 committed by kostya.danovsky
parent 72c112be4b
commit f0b6c1baa8
4 changed files with 24 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,4 @@
<div class="channels-block"> <div class="channels-block transparent">
<div class="chart-bg"></div> <div class="chart-bg"></div>
<div class="traffic-chart" id="trafficChart"> <div class="traffic-chart" id="trafficChart">
<div class="canvas-holder"> <div class="canvas-holder">

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

@ -504,7 +504,7 @@ label.custom-input-danger {
} }
.progress { .progress {
background: rgba(black, 0.15); background: $progress-background;
} }
.progress-bar-primary { .progress-bar-primary {

2
src/sass/theme/conf/_colorScheme.scss
View File

@ -18,6 +18,8 @@ $bootstrap-panel-text: #7d7d7d;
$bootstrap-panel-bg: #ffffff; $bootstrap-panel-bg: #ffffff;
$mail-box: whitesmoke; $mail-box: whitesmoke;
$auth-panel-background: rgba(#000000, 0.55); $auth-panel-background: rgba(#000000, 0.55);
$progress-background: rgba(#000000, 0.15);
$progress-default: #ffffff;
$primary: #209e91 !default; $primary: #209e91 !default;
$info: #2dacd1 !default; $info: #2dacd1 !default;

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

@ -3,6 +3,24 @@
position: relative; position: relative;
} }
.channels-block.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;
}
.chart-bg{
position: absolute;
width: 180px;
height: 180px;
left: 60px;
top: 60px;
background-color: rgba(0,0,0,0.35);
border-radius: 100px;
}
}
.channels-info { .channels-info {
display: inline-block; display: inline-block;
width: calc(100% - 370px); width: calc(100% - 370px);
@ -97,11 +115,11 @@
border-radius: 0; border-radius: 0;
width: 100%; width: 100%;
margin-bottom: 0; margin-bottom: 0;
background-color: rgba(0, 0, 0, 0.25); background-color: $progress-background;
box-shadow: none; box-shadow: none;
.progress-bar{ .progress-bar{
height: 4px; height: 4px;
background-color: $default-text; background-color: $progress-default;
box-shadow: none; box-shadow: none;
} }
} }
@ -116,22 +134,6 @@
left: -45px; left: -45px;
} }
.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;
}
.chart-bg{
position: absolute;
width: 180px;
height: 180px;
left: 60px;
top: 60px;
background-color: rgba(0,0,0,0.35);
border-radius: 100px;
}
@media (max-width: $resM) { @media (max-width: $resM) {
div.channels-info{ div.channels-info{
display: block; display: block;