mirror of https://github.com/akveo/blur-admin
refactor(global): fix little issues
parent
1375efbecd
commit
b7af0162ee
|
@ -9,12 +9,12 @@
|
|||
.directive('selectpicker', selectpicker);
|
||||
|
||||
/** @ngInject */
|
||||
function selectpicker($timeout) {
|
||||
function selectpicker() {
|
||||
return {
|
||||
restrict: 'A',
|
||||
link: function( $scope, elem) {
|
||||
$timeout(function() {
|
||||
$(elem).selectpicker({dropupAuto: false});
|
||||
setTimeout(function() {
|
||||
elem.selectpicker({dropupAuto: false});
|
||||
}, 0);
|
||||
}
|
||||
};
|
||||
|
|
|
@ -11,7 +11,7 @@
|
|||
/** @ngInject */
|
||||
function LeafletPageCtrl($timeout) {
|
||||
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);
|
||||
L.tileLayer('http://{s}.tile.osm.org/{z}/{x}/{y}.png', {
|
||||
attribution: '© <a href="http://osm.org/copyright">OpenStreetMap</a> contributors'
|
||||
|
|
|
@ -469,8 +469,7 @@ label.custom-input-danger {
|
|||
border-left: 1px solid $default;
|
||||
border-right: 1px solid $default;
|
||||
border-bottom-color: $default;
|
||||
border-bottom-left-radius: 5px;
|
||||
border-bottom-right-radius: 5px;
|
||||
border-radius: 0 0 5px 5px;
|
||||
}
|
||||
> .btn.dropdown-toggle {
|
||||
border-bottom-left-radius: 0;
|
||||
|
|
|
@ -8,9 +8,10 @@ h1.color, h2.color, h3.color, h4.color, h5.color, h6.color {
|
|||
color: $danger;
|
||||
}
|
||||
|
||||
a {
|
||||
body a {
|
||||
color: $activelink;
|
||||
text-decoration: none !important;
|
||||
transition: color 0.2s ease;
|
||||
&:hover {
|
||||
color: $hoverlink;
|
||||
}
|
||||
|
|
|
@ -63,7 +63,7 @@ $hover: 24;
|
|||
.dropdown-toggle:focus {
|
||||
outline: none !important;
|
||||
}
|
||||
.btn-default:focus{
|
||||
button.btn-default:focus{
|
||||
color: $default;
|
||||
}
|
||||
.btn{
|
||||
|
|
|
@ -65,7 +65,7 @@
|
|||
.editable-wrap {
|
||||
vertical-align: super;
|
||||
}
|
||||
input.editable-input {
|
||||
.editable-controls input.editable-input {
|
||||
width: 110px;
|
||||
}
|
||||
td {
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
#calendar.blurCalendar{
|
||||
div.blurCalendar{
|
||||
font-size: 12px;
|
||||
}
|
||||
.fc {
|
||||
|
|
|
@ -200,15 +200,15 @@
|
|||
}
|
||||
|
||||
.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 {
|
||||
@include cd-timeline-left-color($danger-bg);
|
||||
@include cd-timeline-left-color(rgba(0,0,0,.2));
|
||||
}
|
||||
|
||||
.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 {
|
||||
|
@ -231,13 +231,13 @@
|
|||
}
|
||||
}
|
||||
&.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 {
|
||||
@include cd-timeline-right-color($danger-bg);
|
||||
@include cd-timeline-right-color(rgba(0,0,0,.2));
|
||||
}
|
||||
&.cd-timeline-content-blue {
|
||||
@include cd-timeline-right-color($primary-bg);
|
||||
@include cd-timeline-right-color(rgba(0,0,0,.2));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue