diff --git a/src/app/components/blurPanel/_blurPanel.scss b/src/app/components/blurPanel/_blurPanel.scss index 0b05ba4..1c14442 100644 --- a/src/app/components/blurPanel/_blurPanel.scss +++ b/src/app/components/blurPanel/_blurPanel.scss @@ -25,6 +25,10 @@ $panel-title-height: 35px; &.large-panel { height: $large-panel-height; } + &.viewport100 { + height: calc(100vh - 212px); + } + &.with-scroll { .panel-body { height: calc(100% - #{$panel-title-height}); diff --git a/src/app/components/contentTop/contentTop.js b/src/app/components/contentTop/contentTop.js index 7d90684..9d33adf 100644 --- a/src/app/components/contentTop/contentTop.js +++ b/src/app/components/contentTop/contentTop.js @@ -23,7 +23,11 @@ blurAdminApp.directive('contentTop', ['$location', function ($location) { '/tables': 'Tables', '/typography': 'Typography', '/form-layouts': 'Form Layouts', - '/form-inputs': 'Form Inputs' + '/form-inputs': 'Form Inputs', + '/maps/gmap': 'Google Map', + '/maps/leaflet': 'Leaflet Map', + '/maps/line': 'Line Map', + '/maps/bubble': 'Bubble Map' }; $scope.$watch(function () { diff --git a/src/app/components/sidebar/sidebar.js b/src/app/components/sidebar/sidebar.js index c77819d..0d64a5e 100644 --- a/src/app/components/sidebar/sidebar.js +++ b/src/app/components/sidebar/sidebar.js @@ -63,7 +63,24 @@ blurAdminApp.directive('sidebar', function () { { title: 'Maps', icon: 'ion-ios-location-outline', - root: '#/maps' + subMenu: [ + { + title: 'Google Maps', + root: '#/maps/gmap' + }, + { + title: 'Leaflet', + root: '#/maps/leaflet' + }, + { + title: 'Bubble Map', + root: '#/maps/bubble' + }, + { + title: 'Line Map', + root: '#/maps/line' + } + ] }, { title: 'User Profile', diff --git a/src/app/components/widgets/widgets.html b/src/app/components/widgets/widgets.html index edf5632..99efde8 100644 --- a/src/app/components/widgets/widgets.html +++ b/src/app/components/widgets/widgets.html @@ -1,7 +1,7 @@