Download as
Browse Code »

Commit b5dec28de170291fd27cf06983daab80443c3275

Authored by Daniela Feitosa
2 parents 0939848e 735d4349
Exists in master and in 28 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, stable, temp_ratings, tests, tests_fixies

Merge commit 'refs/merge-requests/246' of git://gitorious.org/noosfero/noosfero … 

…into merge-requests/246

Conflicts:
	public/stylesheets/search.css
Showing 1 changed file with 13 additions and 33 deletions   Show diff stats
public/stylesheets/search.css
  Diff comments   View file @b5dec28
... ... @@ -669,51 +669,31 @@ li.search-product-item hr {
669 669 /* Search field and button */
670 670  
671 671 .search-field input {
672   - vertical-align: middle;
673   -}
674   -.search-field .formfield {
675   - height: 34px;
676   - display: inline-block;
677   -}
678   -.box-1 .search-field .formfield input {
679   - height: 25px;
680   - width: 530px;
681   -}
682   -.box-2 .search-field .formfield input,
683   -.box-3 .search-field .formfield input {
684   - width: 165px;
  672 + vertical-align: bottom;
685 673 }
686   -#public-profile-search .search-field .formfield input {
687   - height: 25px;
688   - width: 395px;
  674 +
  675 +.search-field .formfield,
  676 +.search-field .formfield input {
  677 + width: 100%;
689 678 }
690 679  
691   -.search-field .formfield {
692   - height: 34px;
693   - display: inline-block;
  680 +#public-profile-search .formfield {
  681 + float: left;
  682 + width: 80%;
694 683 }
695   -#content #public-profile-search form .search-field input.button.submit {
696   - width: 75px;
  684 +#public-profile-search .submit {
  685 + float: right;
697 686 }
698   -
699   -form .search-field input:hover.button.submit {
700   - background-color:#444;
  687 +#public-profile-search .search-field div {
  688 + clear: both;
701 689 }
  690 +
702 691 .search-hint {
703 692 clear: both;
704 693 padding: 10px 0 10px 10px;
705 694 border-bottom: 1px solid #555;
706 695 font-size: 0.9em;
707 696 }
708   -#content form .search-field input:hover.button.submit {
709   - background-color:#444;
710   -}
711   -
712   -#content form .search-field input.button.submit {
713   - height: 30px;
714   - max-height:none;
715   -}
716   -
717 697  
718 698 .facet-any-result-found {
719 699 font-size: 75%;
... ...