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

fix panel header layout

pull/3/head
KostyaDanovsky 2015-11-19 13:03:35 +03:00
parent e1958b5e86
commit 36766349f5
6 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/app/components/blurPanel/_blurPanel.scss
View File

@ -1,3 +1,5 @@
$panel-title-height: 35px;
.panel { .panel {
border: none; border: none;
border-radius: 0px; border-radius: 0px;
@ -21,22 +23,26 @@
height: $large-panel-height; height: $large-panel-height;
} }
&.with-scroll { &.with-scroll {
overflow-y: auto; .panel-body {
overflow-y: auto;
height: calc(100% - #{$panel-title-height});
}
} }
} }
.panel-heading, .panel-default > .panel-heading { .panel-heading, .panel-default > .panel-heading {
background-color: transparent; background-color: transparent;
border: none; border: none;
padding: 7px 22px 0px; padding: 0 22px;
margin-bottom: -5px;
color: $default-text; color: $default-text;
} }
.panel-title { .panel-title {
font-weight: normal; height: $panel-title-height;
line-height: 20px;
padding-top: 15px;
} }
.panel-body { .panel-body {
padding: 16px 22px; padding: 15px 22px;
} }

6
src/app/pages/dashboard/_dashboard.scss
View File

@ -5,4 +5,10 @@
margin-top: -423px; margin-top: -423px;
} }
} }
}
.user-stats-panel {
.panel-title {
padding: 0 0 15px;
}
} }

8
src/app/pages/dashboard/dashboard.html
View File

@ -1,14 +1,14 @@
<pie-charts></pie-charts> <pie-charts></pie-charts>
<div> <div>
<blur-panel> <blur-panel class-container="user-stats-panel">
<div class="row"> <div class="row">
<div class="col-md-6"> <div class="col-md-6">
<h3>Acquisition Channels</h3> <h3 class="panel-title">Acquisition Channels</h3>
<traffic-chart></traffic-chart> <traffic-chart></traffic-chart>
</div> </div>
<div class="col-md-6"> <div class="col-md-6">
<h3>Users by country</h3> <h3 class="panel-title">Users by Country</h3>
<am-chart-map></am-chart-map> <am-chart-map></am-chart-map>
</div> </div>
</div> </div>
@ -39,7 +39,7 @@
<div class="row shift-up"> <div class="row shift-up">
<div class="col-lg-3 col-sm-6 col-xs-12"> <div class="col-lg-3 col-sm-6 col-xs-12">
<blur-panel title="ToDo List" class-container="medium-panel with-scroll"> <blur-panel title="To Do List" class-container="medium-panel with-scroll">
<blur-todo></blur-todo> <blur-todo></blur-todo>
</blur-panel> </blur-panel>
</div> </div>

2
src/app/pages/dashboard/widgets/blurFeed/blurFeed.js
View File

@ -50,7 +50,7 @@ blurAdminApp.directive('blurFeed', function () {
type: 'text-message', type: 'text-message',
author: 'Vlad', author: 'Vlad',
header: 'posted new message', 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', time: '12.11.2015',
ago: '3 days ago', ago: '3 days ago',
}, { }, {

2
src/app/pages/dashboard/widgets/pieCharts/pieCharts.js
View File

@ -57,7 +57,7 @@ blurAdminApp.directive('pieCharts', function () {
function updatePieCharts() { function updatePieCharts() {
$('.pie-charts .chart').each(function(index, chart) { $('.pie-charts .chart').each(function(index, chart) {
$(chart).data('easyPieChart').update(getRandomArbitrary(60, 90)); $(chart).data('easyPieChart').update(getRandomArbitrary(55, 90));
}); });
} }

2
src/assets/css/_variables.scss
View File

@ -53,6 +53,6 @@ $resMin: 320px;
$top-height: 66px; $top-height: 66px;
$small-panel-height: 120px; $small-panel-height: 114px;
$medium-panel-height: 400px; $medium-panel-height: 400px;
$large-panel-height: 824px; $large-panel-height: 824px;