Commit f4dc6b352ed014176dffe949d643af98c36915b0
1 parent
25eeecaf
Exists in
users_profile_page
Changes /profile page css style
Signed-off-by: Tallys Martins <tallysmartins@gmail.com> Signed-off-by: Paulo Tada <paulohtfs@gmail.com>
Showing
9 changed files
with
47 additions
and
20 deletions
Show diff stats
src/app/index.scss
... | ... | @@ -39,6 +39,12 @@ $break-sm-min: 992px; |
39 | 39 | $break-xxs-max: ($break-xxs-min - 1); |
40 | 40 | $break-sm-max: ($break-sm-min - 1); |
41 | 41 | $break-xs-max: ($break-xs-min - 1); |
42 | +// TODO: improve this method to collect all the paddings with a single var | |
43 | +$wrapper-padding: 15px 15px 35px 15px; | |
44 | +$wrapper-padding-top: 15px; | |
45 | +$wrapper-padding-right: 15px; | |
46 | +$wrapper-padding-bottom: 35px; | |
47 | +$wrapper-padding-left: 15px; | |
42 | 48 | |
43 | 49 | |
44 | 50 | @import "../../bower_components/bootswatch/flatly/_variables.scss"; | ... | ... |
src/app/layout/blocks/communities/communities-block.html
1 | - <div ng-repeat="profile in ctrl.profiles" class="col-xs-2 col-md-4 block-item"> | |
2 | - <a ui-sref="main.profile.home({profile: profile.identifier})"> | |
3 | - <noosfero-profile-image [profile]="profile"></noosfero-profile-image> | |
4 | - </a> | |
5 | - <p>{{profile.name}}</p> | |
6 | - </div> | |
1 | +<div ng-repeat="profile in ctrl.profiles" class="col-xs-2 col-md-4 block-item"> | |
2 | + <a ui-sref="main.profile.home({profile: profile.identifier})"> | |
3 | + <noosfero-profile-image [profile]="profile"></noosfero-profile-image> | |
4 | + </a> | |
5 | + <p>{{profile.name}}</p> | |
6 | +</div> | ... | ... |
src/app/layout/scss/skins/_whbl.scss
src/app/profile/image/image.html
1 | 1 | <span class="profile-image-wrap" title="{{ctrl.profile.name}}"> |
2 | - <img ng-if="ctrl.profile.image" ng-src="{{ctrl.profile.image.url}}" class="img-responsive profile-image img-avatar"> | |
2 | + <img ng-if="ctrl.profile.image" ng-src="{{ctrl.profile.image.url}}" class=""> | |
3 | 3 | <i ng-if="!ctrl.profile.image" class="fa {{ctrl.defaultIcon}} fa-5x profile-image img-avatar"></i> |
4 | 4 | </span> | ... | ... |
src/app/profile/info/profile-info.component.ts
... | ... | @@ -24,9 +24,6 @@ export class ProfileInfoComponent { |
24 | 24 | init() { |
25 | 25 | this.profileService.getCurrentProfile().then((profile: noosfero.Profile) => { |
26 | 26 | this.profile = profile; |
27 | - return this.profileService.getActivities(<number>this.profile.id); | |
28 | - }).then((response: restangular.IResponse) => { | |
29 | - this.activities = response.data.activities; | |
30 | 27 | }); |
31 | 28 | } |
32 | 29 | } | ... | ... |
src/app/profile/info/profile-info.html
... | ... | @@ -28,13 +28,13 @@ |
28 | 28 | </div> |
29 | 29 | </div> |
30 | 30 | </div> --> |
31 | -<div class="bg-image"> | |
31 | +<div class="bg-image" style="background-color: black";> | |
32 | 32 | |
33 | 33 | </div> |
34 | 34 | |
35 | -<div class="container" id="noosfero-profile"> | |
35 | +<div class="container" id="noosfero-profile" style="background-color: aqua";> | |
36 | 36 | <div class="col-sm-2"> |
37 | - <noosfero-profile-image [profile]="vm.profile" class="img-avatar-main" data-pin-nopin="true"><noosfero-profile-image> | |
37 | + <noosfero-profile-image [profile]="vm.profile" class="img-avatar-main" data-pin-nopin="true"></noosfero-profile-image> | |
38 | 38 | <ul class="social"> |
39 | 39 | <li>Facebook</li> |
40 | 40 | <li>Twitter</li> | ... | ... |
src/app/profile/profile.html
src/app/profile/profile.scss
1 | 1 | .profile-container { |
2 | 2 | @extend .container-fluid; |
3 | - padding: 0 1%; | |
3 | + margin-top: -$wrapper-padding-top; | |
4 | + margin-left: -$wrapper-padding-left; | |
5 | + margin-bottom: -$wrapper-padding-bottom; | |
6 | + margin-right: -$wrapper-padding-right; | |
4 | 7 | @media (max-width: 978px) { |
5 | 8 | padding: 0 2%; |
6 | 9 | } |
... | ... | @@ -14,8 +17,6 @@ |
14 | 17 | @charset "UTF-8"; |
15 | 18 | /* CSS Document */ |
16 | 19 | |
17 | -@import "font-awesome.min.css"; | |
18 | -@import "font-awesome-ie7.min.css"; | |
19 | 20 | /* Space out content a bit */ |
20 | 21 | body { |
21 | 22 | padding-top: 0; |
... | ... | @@ -144,11 +145,33 @@ a{ |
144 | 145 | |
145 | 146 | /* NOOSFERO PROFILE */ |
146 | 147 | .bg-image {} |
147 | -#noosfero-profile {background:#fff; margin: -200px auto auto; z-index:9999; left:0; right:0; border:1px solid #eee; padding:20px 0;} | |
148 | - #noosfero-profile img {margin:10px; border:1px solid #eee;} | |
148 | +#noosfero-profile { | |
149 | + background:#fff; | |
150 | + margin: -200px auto auto; | |
151 | + z-index:9999; | |
152 | + left:0; | |
153 | + right:0; | |
154 | + border:1px solid #eee; | |
155 | + padding:20px 0; | |
156 | + font-size: 14px; | |
157 | + img, i { | |
158 | + text-align: center; | |
159 | + margin:10px; border:1px solid #eee; | |
160 | + } | |
161 | + .col-sm-2 { | |
162 | + text-align: center; | |
163 | + } | |
164 | + h3 { | |
165 | + margin-top: 16px; | |
166 | + } | |
167 | +} | |
149 | 168 | ul.social {list-style:none; text-align:center;padding:0; margin:0;} |
150 | 169 | #infocontato {max-width:200px;} |
151 | -#infocontato .alert-info{margin:.5rem 0; padding:1rem; font-size:1rem; line-height:1.5rem;} | |
170 | +#infocontato .alert-info{margin:.5rem 0; | |
171 | + padding:1rem; | |
172 | + font-size:1rem; | |
173 | + line-height:1.5rem; | |
174 | +} | |
152 | 175 | #noosfero-groups {margin:auto;} |
153 | 176 | |
154 | 177 | .secondary {border:1px solid #eee; padding:1rem; margin-top:2rem;} | ... | ... |