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

refactor(global): fix little issues

pull/3/head
alex 2016-02-25 13:10:26 +03:00
parent 1375efbecd
commit b7af0162ee
8 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/app/pages/form/inputs/widgets/select/selectpicker.directive.js
View File

@ -9,12 +9,12 @@
.directive('selectpicker', selectpicker); .directive('selectpicker', selectpicker);
/** @ngInject */ /** @ngInject */
function selectpicker($timeout) { function selectpicker() {
return { return {
restrict: 'A', restrict: 'A',
link: function( $scope, elem) { link: function( $scope, elem) {
$timeout(function() { setTimeout(function() {
$(elem).selectpicker({dropupAuto: false}); elem.selectpicker({dropupAuto: false});
}, 0); }, 0);
} }
}; };

2
src/app/pages/maps/leaflet/LeafletPageCtrl.js
View File

@ -11,7 +11,7 @@
/** @ngInject */ /** @ngInject */
function LeafletPageCtrl($timeout) { function LeafletPageCtrl($timeout) {
function initialize() { function initialize() {
L.Icon.Default.imagePath = 'assets/img/theme/vendor/leaflet/'; L.Icon.Default.imagePath = 'assets/img/theme/vendor/leaflet/dist/images';
var map = L.map(document.getElementById('leaflet-map')).setView([51.505, -0.09], 13); var map = L.map(document.getElementById('leaflet-map')).setView([51.505, -0.09], 13);
L.tileLayer('http://{s}.tile.osm.org/{z}/{x}/{y}.png', { L.tileLayer('http://{s}.tile.osm.org/{z}/{x}/{y}.png', {
attribution: '&copy; <a href="http://osm.org/copyright">OpenStreetMap</a> contributors' attribution: '&copy; <a href="http://osm.org/copyright">OpenStreetMap</a> contributors'

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

@ -469,8 +469,7 @@ label.custom-input-danger {
border-left: 1px solid $default; border-left: 1px solid $default;
border-right: 1px solid $default; border-right: 1px solid $default;
border-bottom-color: $default; border-bottom-color: $default;
border-bottom-left-radius: 5px; border-radius: 0 0 5px 5px;
border-bottom-right-radius: 5px;
} }
> .btn.dropdown-toggle { > .btn.dropdown-toggle {
border-bottom-left-radius: 0; border-bottom-left-radius: 0;

3
src/sass/app/_typography.scss
View File

@ -8,9 +8,10 @@ h1.color, h2.color, h3.color, h4.color, h5.color, h6.color {
color: $danger; color: $danger;
} }
a { body a {
color: $activelink; color: $activelink;
text-decoration: none !important; text-decoration: none !important;
transition: color 0.2s ease;
&:hover { &:hover {
color: $hoverlink; color: $hoverlink;
} }

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

@ -63,7 +63,7 @@ $hover: 24;
.dropdown-toggle:focus { .dropdown-toggle:focus {
outline: none !important; outline: none !important;
} }
.btn-default:focus{ button.btn-default:focus{
color: $default; color: $default;
} }
.btn{ .btn{

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

@ -65,7 +65,7 @@
.editable-wrap { .editable-wrap {
vertical-align: super; vertical-align: super;
} }
input.editable-input { .editable-controls input.editable-input {
width: 110px; width: 110px;
} }
td { td {

2
src/sass/theme/dashboard/_calendar.scss
View File

@ -1,4 +1,4 @@
#calendar.blurCalendar{ div.blurCalendar{
font-size: 12px; font-size: 12px;
} }
.fc { .fc {

12
src/sass/theme/dashboard/_timeline.scss
View File

@ -200,15 +200,15 @@
} }
.cd-timeline-content-yellow { .cd-timeline-content-yellow {
@include cd-timeline-left-color($warning-bg); @include cd-timeline-left-color(rgba(0,0,0,.2));
} }
.cd-timeline-content-red { .cd-timeline-content-red {
@include cd-timeline-left-color($danger-bg); @include cd-timeline-left-color(rgba(0,0,0,.2));
} }
.cd-timeline-content-blue { .cd-timeline-content-blue {
@include cd-timeline-left-color($primary-bg); @include cd-timeline-left-color(rgba(0,0,0,.2));
} }
.cd-timeline-block:nth-child(even) .cd-timeline-content { .cd-timeline-block:nth-child(even) .cd-timeline-content {
@ -231,13 +231,13 @@
} }
} }
&.cd-timeline-content-yellow { &.cd-timeline-content-yellow {
@include cd-timeline-right-color($warning-bg); @include cd-timeline-right-color(rgba(0,0,0,.2));
} }
&.cd-timeline-content-red { &.cd-timeline-content-red {
@include cd-timeline-right-color($danger-bg); @include cd-timeline-right-color(rgba(0,0,0,.2));
} }
&.cd-timeline-content-blue { &.cd-timeline-content-blue {
@include cd-timeline-right-color($primary-bg); @include cd-timeline-right-color(rgba(0,0,0,.2));
} }
} }
} }