Download as
Browse Code »

Commit 87caeeb3c7659c146ece6aa4f907493cb6b52ce8

Authored by Rodrigo Souto
1 parent 902dbc8b
Exists in master and in 27 other branches 1.2+SPB2, 2_split_by_role, add_fields_in_api, api_fixies, api_pagination, api_private_token, api_tasks, article_hit_count, blog_page_bug, checkbox_to_user_can_edit_page, communities_ratings, communities_ratings_moderation, community_ratings_rebase, fix_cloned_article_parent, fix_gallery_image_url, fix_javascript_categories, fix_optional_fields, fix_suggest_article, fix_user_email_validation, highlight_block_fix, notification_plugin, notification_plugin_rebase, script_to_update, split_by_role, temp_ratings, tests, tests_fixies

profile-suggestions: suggestions block style improvements

Showing 4 changed files with 39 additions and 40 deletions   Show diff stats
app/helpers/application_helper.rb
  Diff comments   View file @87caeeb
... ... @@ -1433,6 +1433,6 @@ module ApplicationHelper
1433 1433 end
1434 1434 last_tag = tags.pop
1435 1435 tags << last_tag.strip.chop if last_tag.present?
1436   - content_tag(:p, tags.join)
  1436 + content_tag(:div, tags.join, :class => 'tag-connections')
1437 1437 end
1438 1438 end
... ...
plugins/people_block/public/style.css
  Diff comments   View file @87caeeb
... ... @@ -73,17 +73,6 @@
73 73 width: auto;
74 74 display: block;
75 75 }
76   -#content .people-block .block-footer-content a,
77   -#content .friends-block .block-footer-content a,
78   -#content .members-block .block-footer-content a {
79   - position: absolute;
80   - top: 2px;
81   - right: 0px;
82   - font-size: 11px;
83   - color: #000;
84   - text-decoration: none;
85   - padding-right: 15px;
86   -}
87 76 #content .members-block .block-footer-content .join-leave-button a {
88 77 position: relative;
89 78 background-color: #EEE;
... ...
public/designs/themes/base/style.css
  Diff comments   View file @87caeeb
... ... @@ -416,7 +416,7 @@ div#notice {
416 416 font-variant: normal;
417 417 color: #AAA;
418 418 font-size: 11px;
419   - text-align: left;
  419 + text-align: center;
420 420 border-bottom: 1px solid #AAA;
421 421 padding: 2px 0;
422 422 }
... ... @@ -504,10 +504,7 @@ div#notice {
504 504 display: block;
505 505 }
506 506  
507   -#content .tags-block .block-footer-content a,
508   -#content .profile-list-block .block-footer-content a,
509   -#content .enterprises-block .block-footer-content a,
510   -#content .communities-block .block-footer-content a {
  507 +.block-footer-content a.view-all {
511 508 position: absolute;
512 509 top: 2px;
513 510 right: 0px;
... ... @@ -515,11 +512,6 @@ div#notice {
515 512 color: #000;
516 513 text-decoration: none;
517 514 padding-right: 15px;
518   -}
519   -#content .tags-block .block-footer-content a,
520   -#content .profile-list-block .block-footer-content a,
521   -#content .enterprises-block .block-footer-content a,
522   -#content .communities-block .block-footer-content a.view-all {
523 515 background: url(imgs/arrow-right-p.png) 100% 50% no-repeat;
524 516 }
525 517  
... ...
public/stylesheets/application.css
  Diff comments   View file @87caeeb
... ... @@ -1668,6 +1668,10 @@ a.button.disabled, input.disabled {
1668 1668 padding-bottom: 0px;
1669 1669 }
1670 1670  
  1671 +#content .block-footer-content .profiles-suggestions a {
  1672 + text-decoration: none;
  1673 +}
  1674 +
1671 1675 #content .communities-block .block-footer-content .profiles-suggestions a.accept-suggestion,
1672 1676 #content .communities-block .block-footer-content .profiles-suggestions a.remove-suggestion {
1673 1677 position: relative;
... ... @@ -1678,6 +1682,11 @@ a.button.disabled, input.disabled {
1678 1682 padding-bottom: 3px;
1679 1683 display: block;
1680 1684 color: #333;
  1685 + font-size: 11px
  1686 +}
  1687 +
  1688 +#content .block-footer-content .profiles-suggestions a.accept-suggestion:hover {
  1689 + text-decoration: underline;
1681 1690 }
1682 1691  
1683 1692 #content .profiles-suggestions .profile-list a.remove-suggestion {
... ... @@ -1690,6 +1699,7 @@ a.button.disabled, input.disabled {
1690 1699 font-size: 14px;
1691 1700 text-align: center;
1692 1701 font-weight: bold;
  1702 + margin: 1px 1px 0 0;
1693 1703 }
1694 1704  
1695 1705 #content .profiles-suggestions .profile-list a.remove-suggestion:hover {
... ... @@ -3995,39 +4005,31 @@ h1#agenda-title {
3995 4005  
3996 4006 /* ==> @import url(manage_contacts_list.css); <== */
3997 4007  
3998   -.controller-favorite_enterprises .profile-list,
3999   -.controller-friends .profile-list,
4000   -.profiles-suggestions .profile-list {
  4008 +.profile-list {
4001 4009 margin: 0px;
4002 4010 padding: 0px;
4003 4011 list-style: none;
4004 4012 }
4005   -.controller-favorite_enterprises .profile-list li,
4006   -.controller-friends .profile-list li,
4007   -.profiles-suggestions .profile-list li {
  4013 +
  4014 +.profile-list li {
4008 4015 float: left;
4009 4016 margin: 5px;
4010   - height: 90px;
4011   - max-height: 80px;
4012 4017 padding: 5px;
4013   - border: 2px solid transparent;
4014 4018 list-style: none;
4015 4019 position: relative;
4016 4020 }
  4021 +
  4022 +.profile-list li:hover {
  4023 + background-color: #eeeeec;
  4024 +}
  4025 +
4017 4026 .controller-favorite_enterprises .profile-list li,
4018 4027 .controller-friends .profile-list li {
4019 4028 width: 90px;
4020 4029 max-width: 80px;
4021 4030 }
4022 4031  
4023   -.controller-favorite_enterprises .profile-list li:hover,
4024   -.controller-friends .profile-list li:hover,
4025   -.box-1 .profiles-suggestions .profile-list li:hover {
4026   - border: 2px solid #eeeeec;
4027   -}
4028   -.controller-favorite_enterprises .profile-list img,
4029   -.controller-friends .profile-list img,
4030   -.profiles-suggestions .profile-list img {
  4032 +.profile-list img {
4031 4033 border: none;
4032 4034 }
4033 4035 .controller-favorite_enterprises .profile-list a.profile-link,
... ... @@ -4085,6 +4087,18 @@ h1#agenda-title {
4085 4087 margin: 0px;
4086 4088 }
4087 4089  
  4090 +.profiles-suggestions .profile-list .extra_info a {
  4091 + padding: 0;
  4092 +}
  4093 +
  4094 +.profile-connections {
  4095 + height: 20px;
  4096 +}
  4097 +
  4098 +.tag-connections {
  4099 + margin-left: 2px;
  4100 +}
  4101 +
4088 4102 #content .profiles-suggestions .profile-list .extra_info .profile-suggestion-connection-icon {
4089 4103 position: relative;
4090 4104 }
... ... @@ -4092,7 +4106,7 @@ h1#agenda-title {
4092 4106 .profiles-suggestions .profile-list .extra_info big {
4093 4107 font-size: 14px;
4094 4108 font-weight: bold;
4095   - vertical-align: text-bottom;
  4109 + line-height: 20px;
4096 4110 }
4097 4111  
4098 4112 .profiles-suggestions .profile-list .extra_info span {
... ... @@ -4127,6 +4141,10 @@ h1#agenda-title {
4127 4141 #content .common-profile-list-block .profiles-suggestions .profile-list a.profile-link {
4128 4142 text-align: left;
4129 4143 position: relative;
  4144 + height: 50px;
  4145 + width: 50px;
  4146 + float: left;
  4147 + margin-right: 5px;
4130 4148 }
4131 4149  
4132 4150 /* ==> public/stylesheets/controller_friends.css <== */
... ...