diff --git a/src/app/components/blurPanel/_blurPanel.scss b/src/app/components/blurPanel/_blurPanel.scss index 45b4a02..d2462a3 100644 --- a/src/app/components/blurPanel/_blurPanel.scss +++ b/src/app/components/blurPanel/_blurPanel.scss @@ -1,3 +1,5 @@ +$panel-title-height: 35px; + .panel { border: none; border-radius: 0px; @@ -21,22 +23,26 @@ height: $large-panel-height; } &.with-scroll { - overflow-y: auto; + .panel-body { + overflow-y: auto; + height: calc(100% - #{$panel-title-height}); + } } } .panel-heading, .panel-default > .panel-heading { background-color: transparent; border: none; - padding: 7px 22px 0px; - margin-bottom: -5px; + padding: 0 22px; color: $default-text; } .panel-title { - font-weight: normal; + height: $panel-title-height; + line-height: 20px; + padding-top: 15px; } .panel-body { - padding: 16px 22px; + padding: 15px 22px; } \ No newline at end of file diff --git a/src/app/pages/dashboard/_dashboard.scss b/src/app/pages/dashboard/_dashboard.scss index 57b839b..e793424 100644 --- a/src/app/pages/dashboard/_dashboard.scss +++ b/src/app/pages/dashboard/_dashboard.scss @@ -5,4 +5,10 @@ margin-top: -423px; } } +} + +.user-stats-panel { + .panel-title { + padding: 0 0 15px; + } } \ No newline at end of file diff --git a/src/app/pages/dashboard/dashboard.html b/src/app/pages/dashboard/dashboard.html index febfdb7..f0cfb1c 100644 --- a/src/app/pages/dashboard/dashboard.html +++ b/src/app/pages/dashboard/dashboard.html @@ -1,14 +1,14 @@
- +
-

Acquisition Channels

+

Acquisition Channels

-

Users by country

+

Users by Country

@@ -39,7 +39,7 @@
- +
diff --git a/src/app/pages/dashboard/widgets/blurFeed/blurFeed.js b/src/app/pages/dashboard/widgets/blurFeed/blurFeed.js index 59adfd8..1b5a5e6 100644 --- a/src/app/pages/dashboard/widgets/blurFeed/blurFeed.js +++ b/src/app/pages/dashboard/widgets/blurFeed/blurFeed.js @@ -50,7 +50,7 @@ blurAdminApp.directive('blurFeed', function () { type: 'text-message', author: 'Vlad', header: 'posted new message', - text: "First snake:I hope I'm not poisonous. Second snake:Why? First snake:Because I bit my lip!", + text: "First snake: I hope I'm not poisonous. Second snake: Why? First snake: Because I bit my lip!", time: '12.11.2015', ago: '3 days ago', }, { diff --git a/src/app/pages/dashboard/widgets/pieCharts/pieCharts.js b/src/app/pages/dashboard/widgets/pieCharts/pieCharts.js index 664fd58..afe10c1 100644 --- a/src/app/pages/dashboard/widgets/pieCharts/pieCharts.js +++ b/src/app/pages/dashboard/widgets/pieCharts/pieCharts.js @@ -57,7 +57,7 @@ blurAdminApp.directive('pieCharts', function () { function updatePieCharts() { $('.pie-charts .chart').each(function(index, chart) { - $(chart).data('easyPieChart').update(getRandomArbitrary(60, 90)); + $(chart).data('easyPieChart').update(getRandomArbitrary(55, 90)); }); } diff --git a/src/assets/css/_variables.scss b/src/assets/css/_variables.scss index 7b37584..ddc5f8d 100644 --- a/src/assets/css/_variables.scss +++ b/src/assets/css/_variables.scss @@ -53,6 +53,6 @@ $resMin: 320px; $top-height: 66px; -$small-panel-height: 120px; +$small-panel-height: 114px; $medium-panel-height: 400px; $large-panel-height: 824px; \ No newline at end of file