refactor: restyle transparent skin

pull/3/head
alex 2016-02-05 10:22:24 +03:00
parent a66a7df2bd
commit 4ab926218c
17 changed files with 155 additions and 45 deletions

View File

@ -46,17 +46,9 @@
var ctx = document.getElementById('chart-area').getContext('2d'); var ctx = document.getElementById('chart-area').getContext('2d');
window.myDoughnut = new Chart(ctx).Doughnut(doughnutData, { window.myDoughnut = new Chart(ctx).Doughnut(doughnutData, {
segmentShowStroke: false, segmentShowStroke: false,
responsive: true, percentageInnerCutout : 64,
legendTemplate: '<ul class="<%=name.toLowerCase()%>-legend clearfix">' + responsive: true
'<% for (var i=0; i<segments.length; i++){%>' +
'<li class="clearfix">' +
'<span style="background-color:<%=segments[i].fillColor%>"></span>' +
'<%if(segments[i].label){%><%=segments[i].label%><%}%>' +
'</li><%}%>' +
'</ul>'
}); });
var legend = window.myDoughnut.generateLegend();
$('.traffic-legend').html(legend);
} }
})(); })();

View File

@ -1,6 +1,7 @@
<div class="channels-block" track-width="smallContainerWidth" min-width="640" <div class="channels-block" track-width="smallContainerWidth" min-width="640"
ng-class="{'small-container': smallContainerWidth}"> ng-class="{'small-container': smallContainerWidth}">
<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">
<canvas id="chart-area" width="300" height="300"></canvas> <canvas id="chart-area" width="300" height="300"></canvas>
@ -15,34 +16,54 @@
<div class="channels-info"> <div class="channels-info">
<div> <div>
<div class="channels-info-item"> <div class="channels-info-item">
<p>Direct Traffic</p> <div class="legend-color successLight"></div>
<span class="text-muted channel-change">70% growth in last mont</span> <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 progress-bar-success" role="progressbar" <div class="progress-bar " role="progressbar"
aria-valuenow="70" aria-valuemin="0" aria-valuemax="100" style="width: 70%"> aria-valuenow="70" aria-valuemin="0" aria-valuemax="100" style="width: 70%">
</div> </div>
</div> </div>
</div> </div>
<div class="channels-info-item"> <div class="channels-info-item">
<p>Search engines</p> <div class="legend-color danger"></div>
<span class="text-muted channel-change">42% growth in last month</span> <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 progress-bar-danger" role="progressbar" <div class="progress-bar " role="progressbar"
aria-valuenow="22" aria-valuemin="0" aria-valuemax="100" style="width: 42%"> aria-valuenow="22" aria-valuemin="0" aria-valuemax="100" style="width: 42%">
</div> </div>
</div> </div>
</div> </div>
<div class="channels-info-item"> <div class="channels-info-item">
<p>Ad Campaigns</p> <div class="legend-color primary"></div>
<span class="text-muted channel-change">87% growth in last mont</span> <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 progress-bar-primary" role="progressbar" <div class="progress-bar " role="progressbar"
aria-valuenow="87" aria-valuemin="0" aria-valuemax="100" style="width: 87%"> aria-valuenow="87" aria-valuemin="0" aria-valuemax="100" style="width: 87%">
</div> </div>
</div> </div>
</div> </div>
<div class="channels-info-item">
<div class="legend-color successDark"></div>
<p>Referral<span class="channel-number">+38%</span></p>
<div class="progress progress-sm channel-progress">
<div class="progress-bar " role="progressbar"
aria-valuenow="38" aria-valuemin="0" aria-valuemax="100" style="width: 38%">
</div>
</div>
</div>
<div class="channels-info-item">
<div class="legend-color warning"></div>
<p>Ohter<span class="channel-number">+17%</span></p>
<div class="progress progress-sm channel-progress">
<div class="progress-bar " role="progressbar"
aria-valuenow="17" aria-valuemin="0" aria-valuemax="100" style="width: 17%">
</div>
</div>
</div>
</div> </div>
</div> </div>

View File

@ -5,7 +5,7 @@
ba-panel ba-panel
ba-panel-title="Basic" ba-panel-title="Basic"
ba-panel-class="with-scroll"> ba-panel-class="with-scroll">
<div> <div class="default-color">
<div class="alert bg-success"> <div class="alert bg-success">
<strong>Well done!</strong> You successfully read this important alert message. <strong>Well done!</strong> You successfully read this important alert message.
</div> </div>

View File

@ -134,7 +134,7 @@
<h4 class="grid-h">Responsive column resets</h4> <h4 class="grid-h">Responsive column resets</h4>
<div class="row show-grid"> <div class="row show-grid">
<div class="col-xs-6 col-sm-3"> <div class="col-xs-6 col-sm-3">
<div>.col-xs-6 .col-sm-3 <p>Resize your viewport or check it out on your phone for an example.</p></div> <div>.col-xs-6 .col-sm-3 <p class="default-color">Resize your viewport or check it out on your phone for an example.</p></div>
</div> </div>
<div class="col-xs-6 col-sm-3"> <div class="col-xs-6 col-sm-3">
<div>.col-xs-6 .col-sm-3</div> <div>.col-xs-6 .col-sm-3</div>

View File

@ -55,14 +55,14 @@
</p> </p>
</div> </div>
<div class="section-block upper-text bold-text"> <div class="section-block upper-text bold-text">
<p class="black">Lorem ipsum dolor sit amet, consectetur adipiscing elit. Curabitur bibendum ornare dolor, <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Curabitur bibendum ornare dolor,
quis quis
ullamcorper ligula sodales at. Nulla tellus elit, varius non commodo eget, mattis vel eros. In sed ullamcorper ligula sodales at. Nulla tellus elit, varius non commodo eget, mattis vel eros. In sed
ornare ornare
nulla. </p> nulla. </p>
</div> </div>
<div class="section-block bold-text"> <div class="section-block bold-text">
<p class="black">Lorem ipsum dolor sit amet, consectetur adipiscing elit. Curabitur bibendum ornare dolor, <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Curabitur bibendum ornare dolor,
quis quis
ullam-corper ligula sodales at. Nulla tellus elit, varius non commodo eget, mattis vel eros. In sed ullam-corper ligula sodales at. Nulla tellus elit, varius non commodo eget, mattis vel eros. In sed
ornare ornare

View File

@ -8,6 +8,13 @@
var SKIN_CLASS_PREFIX = 'badmin'; var SKIN_CLASS_PREFIX = 'badmin';
var ADMIN_STYLES = [ 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', name: 'Default',
bodyClass: '', bodyClass: '',
@ -42,13 +49,6 @@
panelType: "panel-blur", panelType: "panel-blur",
thumbnailUrl: 'assets/img/app/skin-thumbnails/06_transblue.jpg', thumbnailUrl: 'assets/img/app/skin-thumbnails/06_transblue.jpg',
chartColorProfile: 'transparent' chartColorProfile: 'transparent'
},
{
name: 'Transparent (beta)',
bodyClass: SKIN_CLASS_PREFIX + '-transparent',
panelType: "panel-blur",
thumbnailUrl: 'assets/img/app/skin-thumbnails/02_transparent.jpg',
chartColorProfile: 'transparent'
} }
]; ];

View File

@ -43,6 +43,8 @@
function _addSkinBodyClass(skin) { function _addSkinBodyClass(skin) {
angular.element($document[0].body).addClass(skin.bodyClass); angular.element($document[0].body).addClass(skin.bodyClass);
} }
this.setActiveSkin(activeSkin);
} }
})(); })();

Binary file not shown.

Before

Width:  |  Height:  |  Size: 89 KiB

After

Width:  |  Height:  |  Size: 271 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 367 KiB

After

Width:  |  Height:  |  Size: 2.3 MiB

View File

@ -1,8 +1,8 @@
.show-grid [class^=col-] { .show-grid div[class^=col-]{
padding: 10px; padding: 10px;
box-sizing: border-box; box-sizing: border-box;
div { div {
color: $default-text;
text-align: center; text-align: center;
font-size: 18px; font-size: 18px;
background-color: $border-light;; background-color: $border-light;;

View File

@ -186,7 +186,6 @@ h5 {
padding-top: 1px; padding-top: 1px;
li { li {
margin-top: 5px; margin-top: 5px;
color: $default-text;
font-size: 14px; font-size: 14px;
ul, ol { ul, ol {
padding-left: 20px; padding-left: 20px;

View File

@ -9,7 +9,7 @@ $panel-heading-font-size: 16px;
position: relative; position: relative;
//transition: all 0.2s ease; //transition: all 0.2s ease;
margin-bottom: 24px; margin-bottom: 24px;
box-shadow:0 5px 5px 0 rgba(0, 0, 0, 0.25);
/*&:hover { /*&:hover {
background: $panel-bg-hover; background: $panel-bg-hover;
}*/ }*/
@ -56,6 +56,8 @@ $panel-heading-font-size: 16px;
.panel-title { .panel-title {
font-weight: $font-normal; font-weight: $font-normal;
text-transform: uppercase;
opacity: 0.9;
//text-transform: uppercase; //text-transform: uppercase;
} }

View File

@ -4,13 +4,15 @@
} }
h1.al-title { h1.al-title {
font-weight: $font-normal; font-weight: $font-bold;
color: #ffffff; color: #ffffff;
float: left; float: left;
width: auto; width: auto;
margin: 0; margin: 0;
padding: 0; padding: 0;
font-size: 30px; font-size: 24px;
text-transform: uppercase;
opacity: 0.9;
} }
.al-breadcrumb { .al-breadcrumb {

View File

@ -78,9 +78,22 @@
} }
@mixin overrideColors($color) { @mixin overrideColors($color) {
color: $color; p,
h1,h2,h3,h4,h5,h6,
p,.pie-charts,.panel-heading>.dropdown .dropdown-toggle, .panel-title, .panel-title>.small, .panel-title>.small>a, .panel-title>a, .panel-title>small, .panel-title>small>a,.traffic-text span, .form-group label { .pie-chart-item,
.panel-heading>.dropdown .dropdown-toggle,
.panel-title,
ol.blur span,
ul.blur,
.popular-app-cost,
.popular-app-info,
.panel-title>.small,
.panel-title>.small>a,
.panel-title>a,
.panel-title>small,
.panel-title>small>a,
.traffic-text span,
.form-group label {
color: $color; color: $color;
} }
.traffic-text { .traffic-text {

View File

@ -8,7 +8,8 @@
background: #2d2d2d; background: #2d2d2d;
padding: 30px 0; padding: 30px 0;
height: 260px; height: 260px;
border-top-right-radius: 5px;
border-top-left-radius: 5px;
img { img {
max-width: 60%; max-width: 60%;
max-height: 70%; max-height: 70%;

View File

@ -5,7 +5,9 @@
.channels-info { .channels-info {
display: inline-block; display: inline-block;
width: calc(100% - 500px); width: calc(100% - 370px);
margin-left: 70px;
margin-top: -20px;
} }
.small-container { .small-container {
.channels-info { .channels-info {
@ -14,14 +16,19 @@
} }
.channels-info-item { .channels-info-item {
margin-bottom: 19px;
p { p {
margin-bottom: 9px; margin-bottom: 9px;
font-size: 18px;
opacity: 0.9;
}
.channel-number{
display: inline-block;
float: right;
} }
} }
.traffic-chart { .traffic-chart {
width: 500px; width: 300px;
position: relative; position: relative;
min-height: 300px; min-height: 300px;
float: left; float: left;
@ -60,6 +67,10 @@
height: 300px; height: 300px;
position: relative; position: relative;
float: left; float: left;
//canvas{
// border: 10px solid rgba(0, 0, 0, 0.34902);
// border-radius: 180px;
//}
} }
.traffic-text { .traffic-text {
@ -75,7 +86,7 @@
//color: $danger; //color: $danger;
span { span {
display: block; display: block;
font-size: 12px; font-size: 18px;
color: $default-text; color: $default-text;
} }
} }
@ -86,10 +97,40 @@
} }
.channel-progress { .channel-progress {
height: 16px; height: 4px;
border-radius: 0; border-radius: 0;
width: 100%; width: 100%;
margin-bottom: 0; margin-bottom: 0;
background-color: rgba(0, 0, 0, 0.25);
.progress-bar{
height: 4px;
background-color: white;
}
}
.legend-color{
width: 30px;
height: 30px;
box-shadow:0 2px 2px 0 rgba(0, 0, 0, 0.25);
position: relative;
top: 27px;
border-radius: 15px;
left: -45px;
&.successDark{
background-color: $success-dark;
}
&.successLight{
background-color: $success-light;
}
&.danger{
background-color: $danger-bg;
}
&.primary{
background-color: $primary-bg;
}
&.warning{
background-color: $warning-bg;
}
} }
@mixin doughnut-size($size) { @mixin doughnut-size($size) {
@ -133,6 +174,21 @@
} }
} }
.traffic-chart canvas{
border: 10px solid rgba(0,0,0,0.0);
border-radius: 150px;
}
.chart-bg{
background-color: $primary-dark;
position: absolute;
border-radius: 100px;
width: 180px;
height: 180px;
left: 60px;
top: 60px;
}
@media (max-width: $resMin) { @media (max-width: $resMin) {
@include doughnut-size(200px); @include doughnut-size(200px);
} }

View File

@ -1,4 +1,26 @@
body.badmin-transparent { body.badmin-transparent {
@include overrideColors(#fff); @include overrideColors(#fff);
@include overridePanelBg(rgba(0, 0, 0, 0.5), rgba(0, 0, 0, 0.5), rgba(0, 0, 0, 0.9)); @include overridePanelBg(rgba(0, 0, 0, 0.5), rgba(0, 0, 0, 0.5), rgba(0, 0, 0, 0.9));
.default-color{
color: $default-text;
}
.traffic-chart canvas{
border: 10px solid rgba(0,0,0,0.35);
border-radius: 150px;
}
.panel.panel-blur{
border-radius: 5px;
.panel-heading{
border-bottom: 1px solid rgba(0,0,0,0.12);
box-shadow: 0px 1px 0px 0px rgba(255, 255, 255, 0.12);
}
}
.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);
}
} }