From 50fb1ccddd518bd796d794c95b44f1b0feaa090a Mon Sep 17 00:00:00 2001
From: Tallys Martins <tallysmartins@gmail.com>
Date: Mon, 11 Jul 2016 15:16:24 -0300
Subject: [PATCH] Changes /profile page css style

---
 src/app/index.scss                                       |  6 ++++++
 src/app/layout/blocks/communities/communities-block.html | 12 ++++++------
 src/app/layout/scss/skins/_whbl.scss                     |  2 +-
 src/app/profile/image/image.html                         |  2 +-
 src/app/profile/info/profile-info.component.ts           |  3 ---
 src/app/profile/info/profile-info.html                   |  6 +++---
 src/app/profile/info/profile-info.scss                   |  0
 src/app/profile/profile.component.ts                     |  5 -----
 src/app/profile/profile.html                             |  1 +
 src/app/profile/profile.scss                             | 35 +++++++++++++++++++++++++++++------
 10 files changed, 47 insertions(+), 25 deletions(-)
 create mode 100644 src/app/profile/info/profile-info.scss

diff --git a/src/app/index.scss b/src/app/index.scss
index 4e0eefc..153127b 100644
--- a/src/app/index.scss
+++ b/src/app/index.scss
@@ -39,6 +39,12 @@ $break-sm-min: 992px;
 $break-xxs-max: ($break-xxs-min - 1);
 $break-sm-max: ($break-sm-min - 1);
 $break-xs-max: ($break-xs-min - 1);
+// TODO: improve this method to collect all the paddings with a single var 
+$wrapper-padding: 15px 15px 35px 15px;
+$wrapper-padding-top: 15px;
+$wrapper-padding-right: 15px;
+$wrapper-padding-bottom: 35px;
+$wrapper-padding-left: 15px;
 
 
 @import "../../bower_components/bootswatch/flatly/_variables.scss";
diff --git a/src/app/layout/blocks/communities/communities-block.html b/src/app/layout/blocks/communities/communities-block.html
index 4ddb907..0ffd238 100644
--- a/src/app/layout/blocks/communities/communities-block.html
+++ b/src/app/layout/blocks/communities/communities-block.html
@@ -1,6 +1,6 @@
-  <div ng-repeat="profile in ctrl.profiles" class="col-xs-2 col-md-4 block-item"> 
-    <a ui-sref="main.profile.home({profile: profile.identifier})">
-      <noosfero-profile-image [profile]="profile"></noosfero-profile-image>
-    </a>
-    <p>{{profile.name}}</p>
-  </div>
+<div ng-repeat="profile in ctrl.profiles" class="col-xs-2 col-md-4 block-item"> 
+  <a ui-sref="main.profile.home({profile: profile.identifier})">
+    <noosfero-profile-image [profile]="profile"></noosfero-profile-image>
+  </a>
+  <p>{{profile.name}}</p>
+</div>
diff --git a/src/app/layout/scss/skins/_whbl.scss b/src/app/layout/scss/skins/_whbl.scss
index 2d42de2..a81d6ef 100644
--- a/src/app/layout/scss/skins/_whbl.scss
+++ b/src/app/layout/scss/skins/_whbl.scss
@@ -122,7 +122,7 @@ $whbl-font-color: #16191c;
 	  margin-bottom: 0;
 	  position: relative;
 	  min-height: 1200px;
-	  padding: 15px 15px 35px 15px;
+	  padding: $wrapper-padding;
 	  margin-left: 220px;
 		// border-left: 2px solid #e7ebee;
 	}
diff --git a/src/app/profile/image/image.html b/src/app/profile/image/image.html
index 9bf6c30..c8bba27 100644
--- a/src/app/profile/image/image.html
+++ b/src/app/profile/image/image.html
@@ -1,4 +1,4 @@
 <span class="profile-image-wrap" title="{{ctrl.profile.name}}">
-  <img ng-if="ctrl.profile.image" ng-src="{{ctrl.profile.image.url}}" class="img-responsive profile-image img-avatar">
+  <img ng-if="ctrl.profile.image" ng-src="{{ctrl.profile.image.url}}" class="">
   <i ng-if="!ctrl.profile.image" class="fa {{ctrl.defaultIcon}} fa-5x profile-image img-avatar"></i>
 </span>
diff --git a/src/app/profile/info/profile-info.component.ts b/src/app/profile/info/profile-info.component.ts
index 64acaa7..2d35077 100644
--- a/src/app/profile/info/profile-info.component.ts
+++ b/src/app/profile/info/profile-info.component.ts
@@ -24,9 +24,6 @@ export class ProfileInfoComponent {
     init() {
         this.profileService.getCurrentProfile().then((profile: noosfero.Profile) => {
             this.profile = profile;
-            return this.profileService.getActivities(<number>this.profile.id);
-        }).then((response: restangular.IResponse) => {
-            this.activities = response.data.activities;
         });
     }
 }
diff --git a/src/app/profile/info/profile-info.html b/src/app/profile/info/profile-info.html
index f07c9e0..eb1068a 100644
--- a/src/app/profile/info/profile-info.html
+++ b/src/app/profile/info/profile-info.html
@@ -28,13 +28,13 @@
     </div>
   </div>
 </div> -->
-<div class="bg-image">
+<div class="bg-image" style="background-color: black";>
 
 </div>
 
-<div class="container" id="noosfero-profile">
+<div class="container" id="noosfero-profile" style="background-color: aqua";>
     <div class="col-sm-2">
-        <noosfero-profile-image [profile]="vm.profile" class="img-avatar-main" data-pin-nopin="true"><noosfero-profile-image>
+        <noosfero-profile-image [profile]="vm.profile" class="img-avatar-main" data-pin-nopin="true"></noosfero-profile-image>
         <ul class="social">
             <li>Facebook</li>
             <li>Twitter</li>
diff --git a/src/app/profile/info/profile-info.scss b/src/app/profile/info/profile-info.scss
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/src/app/profile/info/profile-info.scss
diff --git a/src/app/profile/profile.component.ts b/src/app/profile/profile.component.ts
index 38a2b3b..17f432c 100644
--- a/src/app/profile/profile.component.ts
+++ b/src/app/profile/profile.component.ts
@@ -47,11 +47,6 @@ import {ProfileToolbarComponent} from "./profile-toolbar.component";
             "toolbar@main": {
                 templateUrl: "app/profile/toolbar.html",
                 controller: ProfileToolbarComponent,
-            },
-            "mainBlockContent": {
-                templateUrl: "app/profile/activities/activities.html",
-                controller: ProfileInfoComponent,
-                controllerAs: "vm"
             }
         }
     },
diff --git a/src/app/profile/profile.html b/src/app/profile/profile.html
index 9ba268a..c7841e1 100644
--- a/src/app/profile/profile.html
+++ b/src/app/profile/profile.html
@@ -4,6 +4,7 @@
                   [attribute]="'custom_header'"
                   [profile]="vm.profile">
   </custom-content>
+  <div class="row" ui-view="profile-info"></div>
   <noosfero-boxes ng-if="vm.boxes"
                   [layout]="vm.profile.layout_template"
                   [boxes]="vm.boxes"
diff --git a/src/app/profile/profile.scss b/src/app/profile/profile.scss
index b80cc79..414b261 100644
--- a/src/app/profile/profile.scss
+++ b/src/app/profile/profile.scss
@@ -1,6 +1,9 @@
 .profile-container {
   @extend .container-fluid;
-  padding: 0 1%;
+  margin-top:     -$wrapper-padding-top;
+  margin-left:    -$wrapper-padding-left;
+  margin-bottom:  -$wrapper-padding-bottom;
+  margin-right:   -$wrapper-padding-right;
   @media (max-width: 978px) {
     padding: 0 2%;
   }
@@ -14,8 +17,6 @@
 @charset "UTF-8";
 /* CSS Document */
 
-@import "font-awesome.min.css";
-@import "font-awesome-ie7.min.css";
 /* Space out content a bit */
 body {
   padding-top: 0;
@@ -144,11 +145,33 @@ a{
 
 /* NOOSFERO PROFILE */
 .bg-image {}
-#noosfero-profile {background:#fff; margin: -200px auto auto; z-index:9999; left:0; right:0; border:1px solid #eee; padding:20px 0;}
-	#noosfero-profile img {margin:10px; border:1px solid #eee;}
+#noosfero-profile {
+  background:#fff;
+  margin: -200px auto auto;
+  z-index:9999;
+  left:0;
+  right:0;
+  border:1px solid #eee;
+  padding:20px 0;
+  font-size: 14px;
+  img, i {
+    text-align: center;
+    margin:10px; border:1px solid #eee;
+  }
+  .col-sm-2 {
+    text-align: center;
+  }
+  h3 {
+    margin-top: 16px;
+  }
+}
 ul.social {list-style:none; text-align:center;padding:0; margin:0;}
 #infocontato {max-width:200px;}
-#infocontato .alert-info{margin:.5rem 0; padding:1rem; font-size:1rem; line-height:1.5rem;}
+#infocontato .alert-info{margin:.5rem 0;
+  padding:1rem;
+  font-size:1rem;
+  line-height:1.5rem;
+}
 #noosfero-groups {margin:auto;}
 
 .secondary {border:1px solid #eee; padding:1rem; margin-top:2rem;}
--
libgit2 0.21.2