Commit d570e770d71bf7e97e33f897e38a157c694347a8
Exists in
master
and in
29 other branches
Merge branch 'favorite-enterprises' into 'master'
Favorite enterprises block footer and content fixes Before:  After:  Had to move the "view all" button to the bottom because of this problem:  See merge request !676
Showing
2 changed files
with
7 additions
and
7 deletions
Show diff stats
app/models/favorite_enterprises_block.rb
... | ... | @@ -16,7 +16,7 @@ class FavoriteEnterprisesBlock < ProfileListBlock |
16 | 16 | owner = self.owner |
17 | 17 | return '' unless owner.kind_of?(Person) |
18 | 18 | proc do |
19 | - link_to _('View all'), :profile => owner.identifier, :controller => 'profile', :action => 'favorite_enterprises' | |
19 | + link_to _('enterprises|View all'), {:profile => owner.identifier, :controller => 'profile', :action => 'favorite_enterprises'}, :class => 'view-all' | |
20 | 20 | end |
21 | 21 | end |
22 | 22 | ... | ... |
public/designs/themes/base/style.scss
... | ... | @@ -484,6 +484,7 @@ div#notice { |
484 | 484 | #content .profile-list-block ul, |
485 | 485 | #content .enterprises-block ul, |
486 | 486 | #content .communities-block ul, |
487 | +#content .favorite-enterprises-block ul, | |
487 | 488 | #content .fans-block ul { |
488 | 489 | min-width: 196px; |
489 | 490 | width: 192px; |
... | ... | @@ -499,15 +500,14 @@ div#notice { |
499 | 500 | display: block; |
500 | 501 | } |
501 | 502 | |
503 | +.block-footer-content { | |
504 | + text-align: center; | |
505 | + padding-top: 3px; | |
506 | +} | |
507 | + | |
502 | 508 | .block-footer-content a.view-all { |
503 | - position: absolute; | |
504 | - top: 2px; | |
505 | - right: 0px; | |
506 | 509 | font-size: 11px; |
507 | 510 | color: #000; |
508 | - text-decoration: none; | |
509 | - padding-right: 15px; | |
510 | - background: url(imgs/arrow-right-p.png) 100% 50% no-repeat; | |
511 | 511 | } |
512 | 512 | |
513 | 513 | #content .profile-list-block .block-title { | ... | ... |