[Git][noosfero/noosfero][master] 4 commits: favorite-enterprises-block: add view-all class to footer link and fix translation
Antonio Terceiro
gitlab at gitlab.com
Wed Oct 7 10:45:46 BRT 2015
Antonio Terceiro pushed to branch master at Noosfero / noosfero
Commits:
09c3d5b0 by Rodrigo Souto at 2015-09-25T12:53:09Z
favorite-enterprises-block: add view-all class to footer link and fix translation
- - - - -
2d94b1d5 by Rodrigo Souto at 2015-09-25T12:53:38Z
profile-list-block: move view-all link to the bottom
With some translations the view all button gets overlaped by the title.
- - - - -
20bb3721 by Rodrigo Souto at 2015-09-25T12:55:04Z
favorite-enterprises-block: add its class to the proper css definition
- - - - -
d570e770 by Antonio Terceiro at 2015-10-07T13:45:22Z
Merge branch 'favorite-enterprises' into 'master'
Favorite enterprises block footer and content fixes
Before:
![profile-list-block-before](https://gitlab.com/diguliu/noosfero/uploads/de95f699a4e2b081f699450229818a38/profile-list-block-before.png)
After:
![profile-list-block-after](https://gitlab.com/diguliu/noosfero/uploads/4df324beee47ad7874af2b2bffa1b308/profile-list-block-after.png)
Had to move the "view all" button to the bottom because of this problem:
![view-all-problem](https://gitlab.com/diguliu/noosfero/uploads/a1e3b62eebf18b72c39034ff149de0e1/view-all-problem.png)
See merge request !676
- - - - -
2 changed files:
- app/models/favorite_enterprises_block.rb
- public/designs/themes/base/style.scss
Changes:
=====================================
app/models/favorite_enterprises_block.rb
=====================================
--- a/app/models/favorite_enterprises_block.rb
+++ b/app/models/favorite_enterprises_block.rb
@@ -16,7 +16,7 @@ class FavoriteEnterprisesBlock < ProfileListBlock
owner = self.owner
return '' unless owner.kind_of?(Person)
proc do
- link_to _('View all'), :profile => owner.identifier, :controller => 'profile', :action => 'favorite_enterprises'
+ link_to _('enterprises|View all'), {:profile => owner.identifier, :controller => 'profile', :action => 'favorite_enterprises'}, :class => 'view-all'
end
end
=====================================
public/designs/themes/base/style.scss
=====================================
--- a/public/designs/themes/base/style.scss
+++ b/public/designs/themes/base/style.scss
@@ -484,6 +484,7 @@ div#notice {
#content .profile-list-block ul,
#content .enterprises-block ul,
#content .communities-block ul,
+#content .favorite-enterprises-block ul,
#content .fans-block ul {
min-width: 196px;
width: 192px;
@@ -499,15 +500,14 @@ div#notice {
display: block;
}
+.block-footer-content {
+ text-align: center;
+ padding-top: 3px;
+}
+
.block-footer-content a.view-all {
- position: absolute;
- top: 2px;
- right: 0px;
font-size: 11px;
color: #000;
- text-decoration: none;
- padding-right: 15px;
- background: url(imgs/arrow-right-p.png) 100% 50% no-repeat;
}
#content .profile-list-block .block-title {
View it on GitLab: https://gitlab.com/noosfero/noosfero/compare/c7903fb7f6d4bbfa2504adec0da277c9481ffa36...d570e770d71bf7e97e33f897e38a157c694347a8
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listas.softwarelivre.org/pipermail/noosfero-dev/attachments/20151007/88251caa/attachment-0001.html>
More information about the Noosfero-dev
mailing list