Merge branch 'master' of softwarepublico.gov.br:noosfero-themes/angular-theme

ABNER SILVA DE OLIVEIRA
2 parents e664cc52 c1e0c406
Showing 5 changed files with 47 additions and 3 deletions Show diff stats
src/app/index.scss
src/app/layout/scss/_layout.scss
src/app/profile/image/image.scss
src/app/profile/info/profile-info.component.ts
src/app/profile/info/profile-info.html
@@ -68,3 +68,4 @@ h1, h2, h3, h4, h5 {
 @import "../../bower_components/bootswatch/flatly/_bootswatch.scss";
 @import "layout/scss/mixins";
 @import "layout/scss/bootstrap-overrides";
+@import "layout/scss/layout"
@@ -0,0 +1,38 @@
+/* MAINBOX */
+.main-box {
+		border: 1px solid #e7ebee;
+    box-shadow: 0px 1px 1px rgba(0,0,0,0.1);
+    margin-bottom: 16px;
+    /* overflow: hidden; */
+    @include border-radius($border-radius-base);
+
+	@media (max-width: $break-xs-max) {
+		margin-bottom: 10px;
+	}
+
+	h2 {
+	    font-size: 1.3em;
+	    line-height: 29px;
+	    margin: 0;
+	    padding: 0;
+
+		@media (max-width: $break-xxs-max) {
+			margin-bottom: 5px;
+		}
+	}
+	&.no-header {
+		padding-top: 20px;
+	}
+	.main-box-header {
+	    min-height: 50px;
+	    padding: 10px 20px;
+
+		&.with-border {
+			border-bottom: 1px solid #ecf0f1;
+		}
+	}
+	.main-box-body {
+		padding: 0 20px 20px 20px;
+    text-align: center;
+	}
+}
 i.profile-image {
-  color: rgb(44, 62, 80);  
+  color: rgb(44, 62, 80);
+
+  border-radius: 50%;
+  background-clip: padding-box;
+  margin-bottom: 15px;
 }
@@ -7,12 +7,13 @@ import {ProfileService} from &quot;../../../lib/ng-noosfero-api/http/profile.service&quot;
     providers: [provide('profileService', { useClass: ProfileService })]
 })
 @Inject(ProfileService)
+@Inject("amDateFormatFilter")
 export class ProfileInfoComponent {
  
     activities: any;
     profile: noosfero.Profile;
  
-    constructor(private profileService: ProfileService) {
+    constructor(private profileService: ProfileService, private amDateFormatFilter: any) {
         this.activate();
     }
  
@@ -8,7 +8,7 @@
       <div class="main-box-body clearfix">
         <noosfero-profile-image [profile]="vm.profile" class="img-responsive center-block"></noosfero-profile-image>
         <div class="profile-since">
-          {{"profile.member_since" | translate}}: {{vm.profile.created_at}}
+          {{"profile.member_since" | translate}}: {{vm.profile.created_at | amDateFormat:'MMMM YYYY'}}
         </div>
       </div>
     </div>
...	...	@@ -68,3 +68,4 @@ h1, h2, h3, h4, h5 {
68	68	@import "../../bower_components/bootswatch/flatly/_bootswatch.scss";
69	69	@import "layout/scss/mixins";
70	70	@import "layout/scss/bootstrap-overrides";
	71	+@import "layout/scss/layout"
...	...
...	...	@@ -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	+}
...	...
1	1	i.profile-image {
2		- color: rgb(44, 62, 80);
	2	+ color: rgb(44, 62, 80);
	3	+
	4	+ border-radius: 50%;
	5	+ background-clip: padding-box;
	6	+ margin-bottom: 15px;
3	7	}
...	...
...	...	@@ -7,12 +7,13 @@ import {ProfileService} from "../../../lib/ng-noosfero-api/http/profile.service"
7	7	providers: [provide('profileService', { useClass: ProfileService })]
8	8	})
9	9	@Inject(ProfileService)
	10	+@Inject("amDateFormatFilter")
10	11	export class ProfileInfoComponent {
11	12
12	13	activities: any;
13	14	profile: noosfero.Profile;
14	15
15		- constructor(private profileService: ProfileService) {
	16	+ constructor(private profileService: ProfileService, private amDateFormatFilter: any) {
16	17	this.activate();
17	18	}
18	19
...	...
...	...	@@ -8,7 +8,7 @@
8	8	<div class="main-box-body clearfix">
9	9	<noosfero-profile-image [profile]="vm.profile" class="img-responsive center-block"></noosfero-profile-image>
10	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	12	</div>
13	13	</div>
14	14	</div>
...	...