Andreas/ngx-admin
1
0
Fork 0
mirror of https://github.com/akveo/ngx-admin.git synced 2026-01-28 12:16:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/master'

Browse source 
Conflicts:
	src/app/theme/index.ts
This commit is contained in:
nixa 2016-05-02 17:14:40 +03:00
commit a182cb00ca
17 changed files with 118 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/app/pages/dashboard/dashboard.component.ts
View file

@ -1,13 +1,13 @@
import {Component, ViewEncapsulation} from 'angular2/core';
import {PopularApp} from './popularApp';
import {BaPanel} from '../../theme';
import {BaCard} from '../../theme';
@Component({
selector: 'dashboard',
pipes: [],
directives: [PopularApp, BaPanel],
directives: [PopularApp, BaCard],
encapsulation: ViewEncapsulation.None,
styles: [require('./dashboard.scss')],
template: require('./dashboard.html')

6
src/app/pages/dashboard/dashboard.html
View file

@ -1,10 +1,10 @@
<div class="row">
<div class="col-xlg-9 col-lg-6 col-md-6 col-sm-12 col-xs-12">
<div class="row">
<ba-panel class="col-xlg-4 col-lg-12 col-md-12 col-sm-5 col-xs-12"
ba-panel-class="popular-app medium-panel">
<ba-card class="col-xlg-4 col-lg-12 col-md-12 col-sm-5 col-xs-12"
baCardClass="popular-app medium-card">
<popular-app></popular-app>
</ba-panel>
</ba-card>
</div>
</div>
</div>

6
src/app/pages/dashboard/dashboard.scss
View file

@ -7,13 +7,13 @@
}
@media screen and (max-width: 1620px) {
.panel.feed-panel.large-panel {
.card.feed-card.large-card {
height: 824px;
}
}
.user-stats-panel {
.panel-title {
.user-stats-card {
.card-title {
padding: 0 0 15px;
}
}

55
src/app/pages/dashboard/popularApp/popularApp.scss
View file

@ -1 +1,54 @@
@import '../dashboard';
@import "../../../theme/sass/conf/conf";
.card.popular-app {
&>.card-body {
padding: 0;
}
.popular-app-img {
position: relative;
background: rgba(0, 0, 0, 0.5);
padding: 30px 0;
height: 260px;
border-top-right-radius: 5px;
border-top-left-radius: 5px;
img {
max-width: 60%;
max-height: 70%;
position: absolute;
transform: translateY(-50%) translate(-50%);
top: 50%;
left: 50%;
}
}
.popular-app-cost {
font-size: 20px;
padding: 20px 22px;
border-bottom: 1px solid $border;
}
.popular-app-info {
padding: 20px 22px;
font-size: 20px;
text-align: center;
.info-label {
font-size: 12px;
}
}
.row {
margin: 0;
> div {
padding: 0;
}
}
}
body.badmin-transparent {
.popular-app-img {
border-top-right-radius: 5px;
border-top-left-radius: 5px;
}
.popular-app-cost {
border-bottom: 1px solid rgba(0, 0, 0, 0.12);
box-shadow: 0px 1px 0px 0px rgba(255, 255, 255, 0.12);
}
}