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

refactor(global): little fixes after rewiew with Konstantin

pull/3/head
alex 2016-02-18 17:07:58 +03:00
parent ef3ea263a5
commit 23d1277bb0
9 changed files with 32 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/app/pages/charts/chartJs/chartJs1DCtrl.js
View File

@ -11,8 +11,8 @@
/** @ngInject */ /** @ngInject */
function chartJs1DCtrl($scope) { function chartJs1DCtrl($scope) {
$scope.labels =["Sleeping", "Designing", "Coding", "Cycling", "Running"]; $scope.labels =["Sleeping", "Designing", "Coding", "Cycling"];
$scope.data = [20, 40, 5, 35, 10]; $scope.data = [20, 40, 5, 35];
$scope.options = { $scope.options = {
segmentStrokeColor : "rgba(0,0,0,0)" segmentStrokeColor : "rgba(0,0,0,0)"
}; };

30
src/app/pages/maps/map-lines/MapLinesPageCtrl.js
View File

@ -77,16 +77,16 @@
left: 100, left: 100,
top: 45, top: 45,
labelShiftY: 5, labelShiftY: 5,
color: layoutColors.danger, color: layoutColors.default,
labelColor: layoutColors.danger, labelColor: layoutColors.default,
labelRollOverColor: layoutColors.danger, labelRollOverColor: layoutColors.default,
labelFontSize: 20 labelFontSize: 20
}, { }, {
label: 'show flights from Vilnius', label: 'show flights from Vilnius',
left: 106, left: 106,
top: 70, top: 70,
labelColor: layoutColors.warningBg, labelColor: layoutColors.default,
labelRollOverColor: layoutColors.danger, labelRollOverColor: layoutColors.default,
labelFontSize: 11, labelFontSize: 11,
linkToObject: 'vilnius' linkToObject: 'vilnius'
} ] } ]
@ -145,16 +145,16 @@
left: 100, left: 100,
top: 45, top: 45,
labelShiftY: 5, labelShiftY: 5,
color: layoutColors.danger, color: layoutColors.default,
labelColor: layoutColors.danger, labelColor: layoutColors.default,
labelRollOverColor: layoutColors.danger, labelRollOverColor: layoutColors.default,
labelFontSize: 20 labelFontSize: 20
}, { }, {
label: 'show flights from London', label: 'show flights from London',
left: 106, left: 106,
top: 70, top: 70,
labelColor: layoutColors.warningBg, labelColor: layoutColors.default,
labelRollOverColor: layoutColors.danger, labelRollOverColor: layoutColors.default,
labelFontSize: 11, labelFontSize: 11,
linkToObject: 'london' linkToObject: 'london'
} ] } ]
@ -252,14 +252,14 @@
}, },
imagesSettings: { imagesSettings: {
color: layoutColors.danger, color: layoutColors.warningBg,
rollOverColor: layoutColors.danger, rollOverColor: layoutColors.warningBg,
selectedColor: layoutColors.warningBg selectedColor: layoutColors.warning
}, },
linesSettings: { linesSettings: {
color: layoutColors.danger, color: layoutColors.warningBg,
alpha: 0.4 alpha: 0.8
}, },

16
src/app/pages/ui/slider/slider.html
View File

@ -9,7 +9,7 @@
max="100" max="100"
from="45" from="45"
disable="false" disable="false"
timeout="300"> timeout="2010">
</ion-slider> </ion-slider>
</div> </div>
<div> <div>
@ -21,7 +21,7 @@
prefix="$" prefix="$"
from="420" from="420"
disable="false" disable="false"
timeout="300"> timeout="2010">
</ion-slider> </ion-slider>
</div> </div>
<div> <div>
@ -33,7 +33,7 @@
postfix="°" postfix="°"
from="36" from="36"
disable="false" disable="false"
timeout="300"> timeout="2010">
</ion-slider> </ion-slider>
</div> </div>
<div> <div>
@ -45,7 +45,7 @@
from="420" from="420"
to="900" to="900"
disable="false" disable="false"
timeout="300"> timeout="2010">
</ion-slider> </ion-slider>
</div> </div>
<div> <div>
@ -57,7 +57,7 @@
from="300" from="300"
step="50" step="50"
disable="false" disable="false"
timeout="300"> timeout="2010">
</ion-slider> </ion-slider>
</div> </div>
<div> <div>
@ -71,7 +71,7 @@
prettify-separator="." prettify-separator="."
prettify="true" prettify="true"
disable="false" disable="false"
timeout="300"> timeout="2010">
</ion-slider> </ion-slider>
</div> </div>
<div> <div>
@ -85,7 +85,7 @@
'July', 'August', 'September', 'July', 'August', 'September',
'October', 'November', 'December']" 'October', 'November', 'December']"
disable="false" disable="false"
timeout="300"> timeout="2010">
</ion-slider> </ion-slider>
</div> </div>
<div> <div>
@ -96,7 +96,7 @@
max="100" max="100"
from="45" from="45"
disable="true" disable="true"
timeout="300"> timeout="2010">
</ion-slider> </ion-slider>
</div> </div>
</div> </div>

2
src/app/pages/ui/tabs/tabs.module.js
View File

@ -14,7 +14,7 @@
.state('ui.tabs', { .state('ui.tabs', {
url: '/tabs', url: '/tabs',
templateUrl: 'app/pages/ui/tabs/tabs.html', templateUrl: 'app/pages/ui/tabs/tabs.html',
title: 'Tabs and Accordions', title: 'Tabs & Accordions',
sidebarMeta: { sidebarMeta: {
order: 800, order: 800,
}, },

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

@ -430,7 +430,6 @@ label.custom-input-danger {
.bootstrap-select { .bootstrap-select {
.btn-default { .btn-default {
background: transparent; background: transparent;
border-color: $default;
color: #555555; color: #555555;
&:focus { &:focus {
background: #ffffff; background: #ffffff;

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

@ -64,7 +64,7 @@ $hover: 24;
} }
.btn-default { .btn-default {
border-width: 2px; border-width: 1px;
@include buttonColor(transparent, $default); @include buttonColor(transparent, $default);
} }

3
src/sass/theme/conf/_mixins.scss
View File

@ -100,9 +100,6 @@
.help-block{ .help-block{
color: $color; color: $color;
} }
.traffic-text {
color: $warning;
}
.feed-message .message-time, .text-muted { .feed-message .message-time, .text-muted {
color: darken($color, 20); color: darken($color, 20);
} }

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

@ -29,7 +29,7 @@ $warning-charts :#b9f2a1;
$danger-charts :#ffa76d; $danger-charts :#ffa76d;
$default-charts :#ffffff; $default-charts :#ffffff;
$view-total :#242343; $view-total :rgba(0,0,0,.4);
$accent: #E3FF53; $accent: #E3FF53;

9
src/sass/theme/dashboard/_popularApp.scss
View File

@ -5,7 +5,7 @@
.popular-app-img { .popular-app-img {
position: relative; position: relative;
background: #2d2d2d; background: rgba(0, 0, 0, 0.5);
padding: 30px 0; padding: 30px 0;
height: 260px; height: 260px;
border-top-right-radius: 5px; border-top-right-radius: 5px;
@ -40,14 +40,13 @@
} }
} }
body.badmin-transparent {
body.badmin-transparent{
.popular-app-img { .popular-app-img {
border-top-right-radius: 5px; border-top-right-radius: 5px;
border-top-left-radius: 5px; border-top-left-radius: 5px;
} }
.popular-app-cost{ .popular-app-cost {
border-bottom: 1px solid rgba(0,0,0,0.12); border-bottom: 1px solid rgba(0, 0, 0, 0.12);
box-shadow: 0px 1px 0px 0px rgba(255, 255, 255, 0.12); box-shadow: 0px 1px 0px 0px rgba(255, 255, 255, 0.12);
} }
} }