Commit f6752f262049aa0d462c5fd0e6bb783f33fc36ac
1 parent
e3e43e87
Exists in
master
and in
1 other branch
Changes into sass on profile-info and use moment dateFormat filter
Showing
5 changed files
with
47 additions
and
3 deletions
Show diff stats
src/app/index.scss
| @@ -68,3 +68,4 @@ h1, h2, h3, h4, h5 { | @@ -68,3 +68,4 @@ h1, h2, h3, h4, h5 { | ||
| 68 | @import "../../bower_components/bootswatch/flatly/_bootswatch.scss"; | 68 | @import "../../bower_components/bootswatch/flatly/_bootswatch.scss"; |
| 69 | @import "layout/scss/mixins"; | 69 | @import "layout/scss/mixins"; |
| 70 | @import "layout/scss/bootstrap-overrides"; | 70 | @import "layout/scss/bootstrap-overrides"; |
| 71 | +@import "layout/scss/layout" |
| @@ -0,0 +1,38 @@ | @@ -0,0 +1,38 @@ | ||
| 1 | +/* MAINBOX */ | ||
| 2 | +.main-box { | ||
| 3 | + border: 1px solid #e7ebee; | ||
| 4 | + box-shadow: 0px 1px 1px rgba(0,0,0,0.1); | ||
| 5 | + margin-bottom: 16px; | ||
| 6 | + /* overflow: hidden; */ | ||
| 7 | + @include border-radius($border-radius-base); | ||
| 8 | + | ||
| 9 | + @media (max-width: $break-xs-max) { | ||
| 10 | + margin-bottom: 10px; | ||
| 11 | + } | ||
| 12 | + | ||
| 13 | + h2 { | ||
| 14 | + font-size: 1.3em; | ||
| 15 | + line-height: 29px; | ||
| 16 | + margin: 0; | ||
| 17 | + padding: 0; | ||
| 18 | + | ||
| 19 | + @media (max-width: $break-xxs-max) { | ||
| 20 | + margin-bottom: 5px; | ||
| 21 | + } | ||
| 22 | + } | ||
| 23 | + &.no-header { | ||
| 24 | + padding-top: 20px; | ||
| 25 | + } | ||
| 26 | + .main-box-header { | ||
| 27 | + min-height: 50px; | ||
| 28 | + padding: 10px 20px; | ||
| 29 | + | ||
| 30 | + &.with-border { | ||
| 31 | + border-bottom: 1px solid #ecf0f1; | ||
| 32 | + } | ||
| 33 | + } | ||
| 34 | + .main-box-body { | ||
| 35 | + padding: 0 20px 20px 20px; | ||
| 36 | + text-align: center; | ||
| 37 | + } | ||
| 38 | +} |
src/app/profile/image/image.scss
src/app/profile/info/profile-info.component.ts
| @@ -7,12 +7,13 @@ import {ProfileService} from "../../../lib/ng-noosfero-api/http/profile.service" | @@ -7,12 +7,13 @@ import {ProfileService} from "../../../lib/ng-noosfero-api/http/profile.service" | ||
| 7 | providers: [provide('profileService', { useClass: ProfileService })] | 7 | providers: [provide('profileService', { useClass: ProfileService })] |
| 8 | }) | 8 | }) |
| 9 | @Inject(ProfileService) | 9 | @Inject(ProfileService) |
| 10 | +@Inject("amDateFormatFilter") | ||
| 10 | export class ProfileInfoComponent { | 11 | export class ProfileInfoComponent { |
| 11 | 12 | ||
| 12 | activities: any; | 13 | activities: any; |
| 13 | profile: noosfero.Profile; | 14 | profile: noosfero.Profile; |
| 14 | 15 | ||
| 15 | - constructor(private profileService: ProfileService) { | 16 | + constructor(private profileService: ProfileService, private amDateFormatFilter: any) { |
| 16 | this.activate(); | 17 | this.activate(); |
| 17 | } | 18 | } |
| 18 | 19 |
src/app/profile/info/profile-info.html
| @@ -8,7 +8,7 @@ | @@ -8,7 +8,7 @@ | ||
| 8 | <div class="main-box-body clearfix"> | 8 | <div class="main-box-body clearfix"> |
| 9 | <noosfero-profile-image [profile]="vm.profile" class="img-responsive center-block"></noosfero-profile-image> | 9 | <noosfero-profile-image [profile]="vm.profile" class="img-responsive center-block"></noosfero-profile-image> |
| 10 | <div class="profile-since"> | 10 | <div class="profile-since"> |
| 11 | - {{"profile.member_since" | translate}}: {{vm.profile.created_at}} | 11 | + {{"profile.member_since" | translate}}: {{vm.profile.created_at | amDateFormat:'MMMM YYYY'}} |
| 12 | </div> | 12 | </div> |
| 13 | </div> | 13 | </div> |
| 14 | </div> | 14 | </div> |