Commit aa8cceef9c84960c776498c4aeed13a9288188b8
Committed by
Tallys Martins
1 parent
6bf7264e
Exists in
users_profile_page
Wrapping the mid content of profile-info page
Showing
3 changed files
with
46 additions
and
30 deletions
Show diff stats
src/app/profile/info/profile-info.html
@@ -34,26 +34,26 @@ | @@ -34,26 +34,26 @@ | ||
34 | </div> | 34 | </div> |
35 | 35 | ||
36 | <div class="container" id="noosfero-profile"> | 36 | <div class="container" id="noosfero-profile"> |
37 | - <div class="col-sm-2"> | ||
38 | - <noosfero-profile-image [profile]="vm.profile" class="img-avatar-main" data-pin-nopin="true"></noosfero-profile-image> | ||
39 | - <ul class="social"> | ||
40 | - <li>Facebook</li> | ||
41 | - <li>Twitter</li> | ||
42 | - <li>Instagram</li> | ||
43 | - </ul> | ||
44 | - </div> | ||
45 | - <div class="col-sm-10"> | ||
46 | - <h3>{{vm.profile.name}}</h3> | ||
47 | - <p>Brasília-DF, Brasil</p> | ||
48 | - <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Maecenas eget fermentum mauris, non viverra felis. In varius, felis et placerat feugiat, massa magna sagittis nisl, ut scelerisque ex urna nec ipsum.</p> | ||
49 | - <br /> | ||
50 | - <p class="pull-left">www.noosfero.gov.br/<strong>patriciaoliveira</strong></p> | ||
51 | - <div class="pull-right info-contato"> | ||
52 | - <button ng-click="vm.toggleInformation()" class="btn btn-sm">Informações de Contato</button> | ||
53 | - <div clas="profile-contact" ng-show="vm.showInformation"> | ||
54 | - <p class="email">patricia@oliveira.com</p> | ||
55 | - <p class="phone">61 9999-9999</p> | ||
56 | - </div> | ||
57 | - </div> | 37 | + <div class="col-sm-2"> |
38 | + <noosfero-profile-image [profile]="vm.profile" class="img-avatar-main" data-pin-nopin="true"></noosfero-profile-image> | ||
39 | + <ul class="social"> | ||
40 | + <li>Facebook</li> | ||
41 | + <li>Twitter</li> | ||
42 | + <li>Instagram</li> | ||
43 | + </ul> | ||
44 | + </div> | ||
45 | + <div class="col-sm-10"> | ||
46 | + <h3>{{vm.profile.name}}</h3> | ||
47 | + <p>Brasília-DF, Brasil</p> | ||
48 | + <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Maecenas eget fermentum mauris, non viverra felis. In varius, felis et placerat feugiat, massa magna sagittis nisl, ut scelerisque ex urna nec ipsum.</p> | ||
49 | + <br /> | ||
50 | + <p class="pull-left">www.noosfero.gov.br/<strong>patriciaoliveira</strong></p> | ||
51 | + <div class="pull-right info-contato"> | ||
52 | + <button ng-click="vm.toggleInformation()" class="btn btn-sm">Informações de Contato</button> | ||
53 | + <div clas="profile-contact" ng-show="vm.showInformation"> | ||
54 | + <p class="email">patricia@oliveira.com</p> | ||
55 | + <p class="phone">61 9999-9999</p> | ||
56 | + </div> | ||
58 | </div> | 57 | </div> |
58 | + </div> | ||
59 | </div> | 59 | </div> |
src/app/profile/profile.html
@@ -5,10 +5,13 @@ | @@ -5,10 +5,13 @@ | ||
5 | [profile]="vm.profile"> | 5 | [profile]="vm.profile"> |
6 | </custom-content> | 6 | </custom-content> |
7 | <div class="row" ui-view="profile-info"></div> | 7 | <div class="row" ui-view="profile-info"></div> |
8 | - <noosfero-boxes ng-if="vm.boxes" | ||
9 | - [layout]="vm.profile.layout_template" | ||
10 | - [boxes]="vm.boxes" | ||
11 | - [owner]="vm.profile" class="row"> | ||
12 | - </noosfero-boxes> | 8 | + |
9 | + <div class="wrapper-container"> | ||
10 | + <noosfero-boxes ng-if="vm.boxes" | ||
11 | + [layout]="vm.profile.layout_template" | ||
12 | + [boxes]="vm.boxes" | ||
13 | + [owner]="vm.profile" class="row"> | ||
14 | + </noosfero-boxes> | ||
15 | + </div> | ||
13 | <custom-content class="profile-footer" [label]="'profile.custom_footer.label'" [attribute]="'custom_footer'" [profile]="vm.profile"></custom-content> | 16 | <custom-content class="profile-footer" [label]="'profile.custom_footer.label'" [attribute]="'custom_footer'" [profile]="vm.profile"></custom-content> |
14 | </div> | 17 | </div> |
src/app/profile/profile.scss
1 | + | ||
1 | .profile-container { | 2 | .profile-container { |
2 | @extend .container-fluid; | 3 | @extend .container-fluid; |
3 | margin-top: -$wrapper-padding-top; | 4 | margin-top: -$wrapper-padding-top; |
@@ -9,6 +10,11 @@ | @@ -9,6 +10,11 @@ | ||
9 | } | 10 | } |
10 | } | 11 | } |
11 | 12 | ||
13 | +.wrapper-container { | ||
14 | + margin: auto; | ||
15 | + max-width: 980px; | ||
16 | +} | ||
17 | + | ||
12 | #profile-left { | 18 | #profile-left { |
13 | text-align: center; | 19 | text-align: center; |
14 | margin-top: 15px; | 20 | margin-top: 15px; |
@@ -146,6 +152,12 @@ a{ | @@ -146,6 +152,12 @@ a{ | ||
146 | /* NOOSFERO PROFILE */ | 152 | /* NOOSFERO PROFILE */ |
147 | .bg-image {} | 153 | .bg-image {} |
148 | 154 | ||
155 | +@mixin profile-img { | ||
156 | + text-align: center; | ||
157 | + margin: 10px; | ||
158 | + border: 1px solid #eee; | ||
159 | +} | ||
160 | + | ||
149 | #noosfero-profile { | 161 | #noosfero-profile { |
150 | background:#fff; | 162 | background:#fff; |
151 | margin: -200px auto auto; | 163 | margin: -200px auto auto; |
@@ -155,9 +167,11 @@ a{ | @@ -155,9 +167,11 @@ a{ | ||
155 | border:1px solid #eee; | 167 | border:1px solid #eee; |
156 | padding:20px 0; | 168 | padding:20px 0; |
157 | font-size: 14px; | 169 | font-size: 14px; |
158 | - img, i { | ||
159 | - text-align: center; | ||
160 | - margin:10px; border:1px solid #eee; | 170 | + img { |
171 | + @include profile-img; | ||
172 | + } | ||
173 | + i { | ||
174 | + @include profile-img; | ||
161 | } | 175 | } |
162 | .col-sm-2 { | 176 | .col-sm-2 { |
163 | text-align: center; | 177 | text-align: center; |
@@ -171,7 +185,6 @@ a{ | @@ -171,7 +185,6 @@ a{ | ||
171 | } | 185 | } |
172 | .profile-contact { | 186 | .profile-contact { |
173 | padding-top: 10px; | 187 | padding-top: 10px; |
174 | - | ||
175 | p { | 188 | p { |
176 | margin: 0px; | 189 | margin: 0px; |
177 | } | 190 | } |