Commit 17a77b736c996bd69e462e180f13d3f6fbabb55f
1 parent
a06484da
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 | 34 | </div> |
35 | 35 | |
36 | 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 | 57 | </div> |
58 | + </div> | |
59 | 59 | </div> | ... | ... |
src/app/profile/profile.html
... | ... | @@ -5,10 +5,13 @@ |
5 | 5 | [profile]="vm.profile"> |
6 | 6 | </custom-content> |
7 | 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 | 16 | <custom-content class="profile-footer" [label]="'profile.custom_footer.label'" [attribute]="'custom_footer'" [profile]="vm.profile"></custom-content> |
14 | 17 | </div> | ... | ... |
src/app/profile/profile.scss
1 | + | |
1 | 2 | .profile-container { |
2 | 3 | @extend .container-fluid; |
3 | 4 | margin-top: -$wrapper-padding-top; |
... | ... | @@ -9,6 +10,11 @@ |
9 | 10 | } |
10 | 11 | } |
11 | 12 | |
13 | +.wrapper-container { | |
14 | + margin: auto; | |
15 | + max-width: 980px; | |
16 | +} | |
17 | + | |
12 | 18 | #profile-left { |
13 | 19 | text-align: center; |
14 | 20 | margin-top: 15px; |
... | ... | @@ -146,6 +152,12 @@ a{ |
146 | 152 | /* NOOSFERO PROFILE */ |
147 | 153 | .bg-image {} |
148 | 154 | |
155 | +@mixin profile-img { | |
156 | + text-align: center; | |
157 | + margin: 10px; | |
158 | + border: 1px solid #eee; | |
159 | +} | |
160 | + | |
149 | 161 | #noosfero-profile { |
150 | 162 | background:#fff; |
151 | 163 | margin: -200px auto auto; |
... | ... | @@ -155,9 +167,11 @@ a{ |
155 | 167 | border:1px solid #eee; |
156 | 168 | padding:20px 0; |
157 | 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 | 176 | .col-sm-2 { |
163 | 177 | text-align: center; |
... | ... | @@ -171,7 +185,6 @@ a{ |
171 | 185 | } |
172 | 186 | .profile-contact { |
173 | 187 | padding-top: 10px; |
174 | - | |
175 | 188 | p { |
176 | 189 | margin: 0px; |
177 | 190 | } | ... | ... |