Download as
Browse Code »

Commit d483f76429988ac03c5a522d6b383dce4c625437

Authored by Simiao Carvalho
1 parent e12023ce
Exists in master and in 54 other branches add_you_are_here_breadcrumbs_label, api_for_colab, backup_not_prod, create_institution_bootstrap_modal, design_validation, dev_env_minimal, disable_email_dev, fix_edit_software_permission, fix_edit_software_with_another_license, fix_hover_button_whitening, fix_members_pagination, fix_models_translations, fix_software_api, fix_software_block_migration, fix_validations_and_tests, focus_search_field_theme, gov-user-refactoring, gov-user-refactoring-rails4, header_fix, institution_modal_on_rating, kalibro-conf-refactoring, kalibro-processor-package, lxc, margin_fix, mezuro_cookbook, organization_rating_style_changes, prezento, refactor_software_communities, refactor_software_for_sisp, register_page, release-process, release-process-v2, remove-unused-images, remove_secondary_email_from_user, removing_super_archives_email, review_message, scope2method, signals_community_noosfero, sisp_colab_config, sisp_dev, sisp_dev_master, sisp_improvements, sisp_simple_version, software_as_organization, software_catalog_style_fix, software_catalog_style_fixes, spb_minimal_env, spec_refactor, stable-4.x, temp_soft_comm_refactoring, thread_dropdown, thread_page, update_software_api, update_softwares_boxes

Pagination style

Showing 2 changed files with 133 additions and 29 deletions   Show diff stats
@@ -15,6 +15,10 @@ @@ -15,6 +15,10 @@
15 width:90% !important; 15 width:90% !important;
16 } 16 }
17 17
  18 +body #content .main-block form .icon-add{
  19 + background-color: #2C66CE;
  20 +}
  21 +
18 #signup-form .formfieldline, 22 #signup-form .formfieldline,
19 #signup-formfield-group { 23 #signup-formfield-group {
20 /*background-color:#E7E7E7;*/ /*colorir linhas especificas*/ 24 /*background-color:#E7E7E7;*/ /*colorir linhas especificas*/
@@ -602,7 +606,8 @@ body #content .main-block h1 { @@ -602,7 +606,8 @@ body #content .main-block h1 {
602 606
603 .main-block form { 607 .main-block form {
604 font-size: 14px; 608 font-size: 14px;
605 - color: #172738; 609 + color: #231f20;
  610 + font-family: 'Open Sans', Arial, Helvetica, sans-serif;
606 } 611 }
607 612
608 .main-block form p .required-field, 613 .main-block form p .required-field,
@@ -637,18 +642,19 @@ body #content .main-block h1 { @@ -637,18 +642,19 @@ body #content .main-block h1 {
637 display: inline-block; 642 display: inline-block;
638 max-width: 100%; 643 max-width: 100%;
639 margin-bottom: 5px; 644 margin-bottom: 5px;
640 - color: #172738; 645 + color: #231f20;
641 } 646 }
642 647
643 .main-block form input[type="text"] { 648 .main-block form input[type="text"] {
644 display: block; 649 display: block;
645 - height: 34px; 650 + height: 19px;
646 padding: 6px; 651 padding: 6px;
647 border: 1px solid #ccc; 652 border: 1px solid #ccc;
648 border-radius: 4px; 653 border-radius: 4px;
649 - width: auto; 654 + width: 384px;
650 font-size: 15px; 655 font-size: 15px;
651 font-family: arial, helvetica; 656 font-family: arial, helvetica;
  657 + color: #585858;
652 } 658 }
653 659
654 .main-block form .formfield input[type="file"] { 660 .main-block form .formfield input[type="file"] {
@@ -658,6 +664,11 @@ body #content .main-block h1 { @@ -658,6 +664,11 @@ body #content .main-block h1 {
658 font-size: 14px; 664 font-size: 14px;
659 } 665 }
660 666
  667 +#software_categories_fields label input{
  668 + display: block;
  669 + padding-top: 10px;
  670 + vertical-align: middle;
  671 +}
661 672
662 .main-block form #community-join-before div, 673 .main-block form #community-join-before div,
663 .main-block form #community-join-after div { 674 .main-block form #community-join-after div {
@@ -685,6 +696,98 @@ body #content .main-block form .button-bar a.button{ @@ -685,6 +696,98 @@ body #content .main-block form .button-bar a.button{
685 text-align: center; 696 text-align: center;
686 } 697 }
687 698
  699 +body #content .main-block form .icon-add{
  700 + background-image: none;
  701 + border: 0;
  702 + padding: 0 10px 0 20px;
  703 + display: inline-block;
  704 + text-align: center;
  705 + color: #fff;
  706 + position: relative;
  707 +}
  708 +
  709 +body #content .main-block form .icon-add:before {
  710 + left: 6px;
  711 + vertical-align: middle;
  712 + font-size: 12px;
  713 + content: "\f067";
  714 + color: #fff;
  715 + width: 10px;
  716 + height: 10px;
  717 + text-align: center;
  718 +}
  719 +
  720 +.dynamic-table{
  721 + border: none;
  722 + font-family: 'Open Sans', Arial, Helvetica, sans-serif;
  723 +}
  724 +
  725 +.dynamic-table td{
  726 + padding: 10px 0 0 0;
  727 + vertical-align: middle;
  728 + font-size: 14px;
  729 +}
  730 +
  731 +#operating_system_fields{
  732 + width: 50%;
  733 +}
  734 +
  735 +.formfieldline label:first-child{
  736 + font-weight: 500;
  737 + padding-right: 10px;
  738 +}
  739 +
  740 +.formfield{
  741 + font-weight: 500;
  742 + padding-right: 10px;
  743 +}
  744 +
  745 +.formlabel{
  746 + padding: 10px 0 5px 0;
  747 +}
  748 +
  749 +.formfieldline .type-file .type-file .formlabel {
  750 + display: none;
  751 +}
  752 +
  753 +.formfieldline h4{
  754 + font-weight: 500;
  755 +}
  756 +
  757 +.formfieldline .formfieldline textarea{
  758 + border: 1px solid #ccc;
  759 + color: #585858;
  760 + font-family: arial, helvetica;
  761 + font-size: 15px;
  762 + padding: 6px;
  763 +}
  764 +
  765 +#libraries_fields{
  766 + padding-top: 20px;
  767 +}
  768 +
  769 +#software_categories_fields{
  770 + padding-top: 20px;
  771 +}
  772 +
  773 +#software_categories_fields label{
  774 + line-height: 30px;
  775 + vertical-align: middle;
  776 + padding-left: 2px;
  777 +}
  778 +
  779 +#software_categories_fields input{
  780 + vertical-align: middle;
  781 +}
  782 +
  783 +#database__database_description_id,
  784 +#language__programming_language_id,
  785 +#license_info_version,
  786 +#operating_system__operating_system_name_id{
  787 + padding: 5px 5px 5px 5px;
  788 +}
  789 +
  790 +
688 body #content .main-block form .button-bar .icon-back { 791 body #content .main-block form .button-bar .icon-back {
689 width: 150px !important; 792 width: 150px !important;
690 } 793 }
@@ -696,6 +799,7 @@ body #content .main-block form .button-bar .icon-back { @@ -696,6 +799,7 @@ body #content .main-block form .button-bar .icon-back {
696 background: #2C66CE; 799 background: #2C66CE;
697 } 800 }
698 801
  802 +body #content .main-block form .icon-add:hover,
699 body #content .main-block form .button-bar input:hover { 803 body #content .main-block form .button-bar input:hover {
700 background: #5E82C6; 804 background: #5E82C6;
701 } 805 }
@@ -740,7 +844,8 @@ body #content .main-block #delete-profile a { @@ -740,7 +844,8 @@ body #content .main-block #delete-profile a {
740 color: #172738; 844 color: #172738;
741 } 845 }
742 846
743 -#content .main-block .errorExplanation:before { 847 +#content .main-block .errorExplanation:before,
  848 +body #content .main-block form .icon-add:before {
744 font-family: FontAwesome; 849 font-family: FontAwesome;
745 font-style: normal; 850 font-style: normal;
746 font-weight: normal; 851 font-weight: normal;
@@ -978,37 +978,30 @@ p { @@ -978,37 +978,30 @@ p {
978 /*paginação*/ 978 /*paginação*/
979 979
980 .pagination { 980 .pagination {
  981 + border-top: 0 none;
981 } 982 }
982 983
983 #content .pagination a { 984 #content .pagination a {
984 - background-image: url("images/bg-paginacao.png");  
985 - background-repeat: no-repeat;  
986 - border-bottom: 0 none;  
987 - color: white;  
988 - display: inline-block;  
989 - font-size: 16px;  
990 - font-weight: bold;  
991 - height: 35px;  
992 - padding-top: 4px;  
993 - text-decoration: none;  
994 - width: 35px; 985 + padding: 7px 11px 7px 11px;
  986 + border-radius: 4px;
  987 + margin-right: 4px;
  988 + letter-spacing: 0.6px;
  989 + color: #172738;
  990 + border: 1px solid #D3D6DE;
995 } 991 }
996 992
997 .pagination .current { 993 .pagination .current {
998 - background: url("images/bg-paginacao-preto.png") no-repeat center top transparent;  
999 - background-repeat: no-repeat;  
1000 - border-bottom: 0 none;  
1001 - color: white;  
1002 - display: inline-block; 994 + background-color: #ECEDF1;
  995 + padding: 8px 11px 8px 11px;
  996 + border-radius: 4px;
  997 + margin-right: 4px;
  998 + font-family: Arial;
  999 + font-weight: 700;
1003 font-size: 16px; 1000 font-size: 16px;
1004 - font-weight: bold;  
1005 - height: 35px;  
1006 - padding-top: 4px;  
1007 - text-decoration: none;  
1008 - width: 35px; 1001 + border: 1px solid #D3D6DE;
1009 } 1002 }
1010 1003
1011 -#content .pagination a.prev_page, 1004 +#content .pagination a.previous_page,
1012 #content .pagination a.next_page{ 1005 #content .pagination a.next_page{
1013 background-image: none; 1006 background-image: none;
1014 color: #888888; 1007 color: #888888;
@@ -1018,7 +1011,7 @@ p { @@ -1018,7 +1011,7 @@ p {
1018 1011
1019 1012
1020 #content #article .pagination .next_page, 1013 #content #article .pagination .next_page,
1021 -#content #article .pagination .prev_page{ 1014 +#content #article .pagination .previous_page{
1022 background-image: none; 1015 background-image: none;
1023 color: #ccc; 1016 color: #ccc;
1024 width: auto; 1017 width: auto;
@@ -2890,10 +2883,16 @@ div.software-step-info div.current-step h3 { @@ -2890,10 +2883,16 @@ div.software-step-info div.current-step h3 {
2890 font-size: 12px !important; 2883 font-size: 12px !important;
2891 } 2884 }
2892 2885
  2886 +<<<<<<< Updated upstream
2893 2887
2894 /************************* MAIN PAGE REVIEW *******************************/ 2888 /************************* MAIN PAGE REVIEW *******************************/
2895 2889
2896 #content ul li.news-call .title { 2890 #content ul li.news-call .title {
2897 font-weight: 700; 2891 font-weight: 700;
2898 padding-right: 0px; 2892 padding-right: 0px;
2899 -}  
2900 \ No newline at end of file 2893 \ No newline at end of file
  2894 +}
  2895 +=======
  2896 +#search-header{
  2897 + border: 1px solid red !important;
  2898 +}
  2899 +>>>>>>> Stashed changes