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

fix component scroll

pull/3/head
KostyaDanovsky 2015-11-23 19:38:09 +03:00
parent 0393f2599c
commit 36f7dbc804
8 changed files with 361 additions and 357 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -49,8 +49,9 @@ $panel-title-height: 35px;
} }
.panel-body { .panel-body {
padding: 15px 22px; padding: 0;
}
.panel-content { .panel-content {
padding: 15px 22px;
height: 100%; height: 100%;
} }
}

2
src/app/components/widgets/widgets.html
View File

@ -1,7 +1,7 @@
<div class="widgets"> <div class="widgets">
<div ng-repeat="widgetBlock in ngModel" ng-class="{'row': widgetBlock.widgets.length > 1}"> <div ng-repeat="widgetBlock in ngModel" ng-class="{'row': widgetBlock.widgets.length > 1}">
<div ng-repeat="widgetCol in widgetBlock.widgets" ng-class="{'col-md-6': widgetBlock.widgets.length === 2}" ng-model="widgetCol" class="widgets-block"> <div ng-repeat="widgetCol in widgetBlock.widgets" ng-class="{'col-md-6': widgetBlock.widgets.length === 2}" ng-model="widgetCol" class="widgets-block">
<blur-panel title="{{::widget.title}}" ng-repeat="widget in widgetCol" > <blur-panel title="{{::widget.title}}" ng-repeat="widget in widgetCol" class-container="with-scroll">
<div ng-include="widget.url"></div> <div ng-include="widget.url"></div>
</blur-panel> </blur-panel>
</div> </div>

8
src/app/pages/dashboard/widgets/blurFeed/_blurFeed.scss
View File

@ -61,10 +61,10 @@
.sub-photo-icon { .sub-photo-icon {
position: absolute; position: absolute;
width: 25px; width: 30px;
height: 25px; height: 30px;
right: -2px; right: -4px;
bottom: -2px; bottom: -4px;
border: 2px solid #fff; border: 2px solid #fff;
} }
} }

2
src/app/pages/dashboard/widgets/popularApp/_popularApp.scss
View File

@ -1,5 +1,5 @@
.popular-app { .popular-app {
.panel-body { .panel-content {
padding: 0; padding: 0;
} }

3
src/app/pages/profile/profile.html
View File

@ -2,7 +2,7 @@
<div class="widgets-block"> <div class="widgets-block">
<div class="panel panel-default invisible" zoom-in> <div class="panel panel-default invisible" zoom-in>
<div class="panel-body content-panel profile-page"> <div class="panel-body content-panel profile-page">
<div class="panel-content">
<div class="progress-info">Your profile is 70% Complete</div> <div class="progress-info">Your profile is 70% Complete</div>
<div class="progress"> <div class="progress">
<div class="progress-bar progress-bar-success progress-bar-striped active" role="progressbar" <div class="progress-bar progress-bar-success progress-bar-striped active" role="progressbar"
@ -214,4 +214,5 @@
</div> </div>
</div> </div>
</div> </div>
</div>
<profile-modal></profile-modal> <profile-modal></profile-modal>

2
src/app/pages/tables/widgets/stripedRows.html
View File

@ -1,4 +1,4 @@
<div class="horizontal-scroll vertical-scroll" ng-controller="tablesPageCtrl"> <div class="vertical-scroll" ng-controller="tablesPageCtrl">
<table class="table table-striped"> <table class="table table-striped">
<thead> <thead>
<tr> <tr>

2
src/app/pages/typography/typography.html
View File

@ -2,6 +2,7 @@
<div class="widgets-block"> <div class="widgets-block">
<div class="panel panel-default invisible" zoom-in> <div class="panel panel-default invisible" zoom-in>
<div class="panel-body content-panel"> <div class="panel-body content-panel">
<div class="panel-content">
<div class="section-block"> <div class="section-block">
<h1>H1. Blur Admin Heading</h1> <h1>H1. Blur Admin Heading</h1>
@ -180,3 +181,4 @@
</div> </div>
</div> </div>
</div> </div>
</div>

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

@ -108,7 +108,7 @@ input.search-input {
} }
.vertical-scroll { .vertical-scroll {
max-height: 210px; max-height: 214px;
} }
.pagination>li>a, .pagination>li>span { .pagination>li>a, .pagination>li>span {