Merge branch 'master' into fix_javascript

Melissa Wen
2 parents da1e41c7 6177241d
Showing 3 changed files with 214 additions and 91 deletions Show diff stats
images/bottom-arrow.png
images/top-arrow.png
page-catalog-software.css
-  /*controller-search action-search-software_infos template-default webkit*/
+/*controller-search action-search-software_infos template-default webkit*/
+
+.action-search-software_infos br {
+  display:none;
+}
+
+.action-search-software_infos .org {
+  display:none !important;
+}
 #catalog-filter{
   display: none;
 }
-.action-search-software_infos #content #main-content-wrapper-8 h1{
-  border-top: 4px solid #3E67B1 !important;
-  color: #2B65cd !important;
+.action-search-software_infos .main-content {
+  border: none;
+  box-shadow: none;
+}
+.action-search-software_infos  input[type="checkbox"]{
+  vertical-align:sub;
+}
+
+.action-search-software_infos #content {
+  padding:0px !important;
+  margin-top: 10px;
+}
+
+.action-search-software_infos #content .main-content h2{
   text-transform: uppercase;
-  font-size: 16px !important;
-  padding: 15px 0px 10px 15px;
-  border-bottom:none !important;
-  background-color:#eee;
-  /*padding-left: 0.8em !important;*/
-  /*margin-left: 0px;*/
+  font-family: "open_sansregular",Arial, Helvetica,sans-serif;
+  color: #ff0066;
+  font-size:16px;
 }
-.action-search-software_infos #main-content-wrapper-8 .search-form{
-  margin-top:-10px;
+.action-search-software_infos #content .main-content h1{
+  padding:5px 0 10px 0;
+  font-family:Arial, Helvetica, sans-serif;
+  font-size: 35px !important;
+  font-variant: normal;
+}
+
+.action-search-software_infos .search-form {
   background-color: #eee; /*#f1f1f1;*/
 }
 .search-form{
   background: #ecedf1;
   border-radius: 4px;
+  border:1px solid #d7d7d7;
+  padding: 0;
+  margin-top:28px;
+}
+
+.action-search-software_infos #software-search-container .search-form h3{
+  padding:16px 0 10px 14px;
+  font-family:"open_sansregular", Arial, Helvetica, sans-serif;
+  margin:0;
+  font-weight:bold;
+  font-size: 15px;
+}
+
+.search-form #search-subheader{
+  padding-left: 14px;
+}
+
+.search-form #search-header #search-filters{
+  float: left !important;
+  padding-left: 14px;
+}
+
+.search-form{
+  background: #ecedf1;
+  border-radius: 4px;
 }
 .search-form #search-subheader{
@@ -43,10 +90,13 @@
 }
 #search-input {
+  width:95% !important;
   font-size:110%;
-  margin: 0px 0px 15px 15px;
+  margin: 4px 0px 0px 13px;
   border-radius: 4px;
-  padding: 0.55em;
+  padding: 6px;
+  font-size: 14px;
+  border: 1px solid #d7d7d7;
 }
 #search-input.blur {
@@ -58,20 +108,14 @@
   padding:0.55em;
 }
-.controller-search .search-field .formfield {
-  width: 80%;
-}
-
 .controller-search #content form input.button.submit {
   height: 30px;
   max-height: 30px;
-  width: 104px;
-  margin-bottom: 22px;
-  margin-left: 32px;
+  width: auto;
+  padding: 0 14px 0 14px; 
+  margin: 14px;
   text-transform: uppercase;
-  font-weight: bold;
-  /*border: 1px solid #4562b1;*/
-  /*padding:0px;*/
+  font-family:"open_sansbold",Arial,sans-serif;
   color:#ffffff;
   background-color:#4562b1;
 }
@@ -81,8 +125,8 @@
   color:#172738;
   font-size:20px;
   padding:5px;
-
 }
+
 .action-search-software_infos #content input.button{
   background-color:#2B65cd;
   border: 1px solid #2B65cd;
@@ -92,24 +136,128 @@
   padding:0px;
 }
-.action-search-software_infos .icon-search{
-  background-image:none !important;
+.action-search-software_infos #filter-option-catalog-software:hover {
+  background-color: #c7c7c7;
+}
+
+.action-search-software_infos #filter-option-catalog-software {
+  border:none; 
+  font-size: 11px;
+  padding: 14px;
+  background-color: #d7d7d7;
+}
+
+.action-search-software_infos #filter-option-catalog-software:after {
+  margin-left:5px;
+  background:url("/designs/themes/noosfero-spb-theme/images/bottom-arrow.png") no-repeat center;
+  background-color:#4562b1;
+  padding: 3px 10.5px;
+  border-radius: 4px;
+  content: "";
+}
+
+.action-search-software_infos #cleanup-filter-catalg {
+  background-color:#4562b1;
+  font-size: 14px;
+  font-family:Arial;
+  cursor:pointer;
+}
+
+.action-search-software_infos #close-filter-catalog {
+  cursor:pointer;
+}
+
+.action-search-software_infos #close-filter-catalog:after {
+  margin-left:5px;
+  background:url("/designs/themes/noosfero-spb-theme/images/top-arrow.png") no-repeat center;
+  background-color:#4562b1;
+  padding: 2.5px 10.5px;
+  border-radius: 4px;
+  content: "";
+}
+
+.action-search-software_infos #catalog-display-options {
+  font-size:14px;
+  font-family:Arial; 
+}
+
+.action-search-software_infos #catalog-display-options  #catalog-display-options-count{
+  padding: 45px 0 4px 0;
+}
+
+.action-search-software_infos #catalog-display-options  #catalog-display-options-show-and-sort{
+  padding: 38px 0 5px 0;
+  font-weight:bold;
+}
+
+.action-search-software_infos #filter-catalog-software {
+  background-color: #d7d7d7;
+}
+
+.action-search-software_infos #filter-catalog-software #filter-categories-option {
+  border:none;
+}
+
+.action-search-software_infos #group-categories #group-catalog-01 {
+  float: left;
+  width: 50%;
+}
+
+.action-search-software_infos #filter-catalog-software #filter-categories-catalog h4 {
+  color: black;
+  margin: 5px 0 10px 5px;
+  background: transparent;
+}
+
+.project-software{
+  font-weight:bold;
+  font-size:15px;
+  font-family:Arial;
+  margin: 0 0 30px;
+  border-top: 1px dotted;
+  border-bottom: 1px dotted;
+}
+
+.action-search-software_infos #group-categories label {
+  font-family:Arial;
+  font-size: 14px;
+}
+.action-search-software_infos #group-categories label span {
+  font-family:Arial;
+  font-size: 14px;
+}
+.action-search-software_infos #group-categories br {
+  display:inline;
+}
+
+.project-software span{
+  margin-left: 5px;
+  color:transparent;
+}
+.project-software span:before {
+  content:"?";
+  border-radius: 50%;  
+  font-size: 16px;
+  padding: 2px 6px;
+  background:#fff;
+  color: #3867b7;
+}
+
+.action-search-software_infos #search-results {
+  border-top: 1px solid #d7d7d7;
 }
-/*
-.search-enterprise-item {
-  border-bottom: 1px solid #eee;
-}*/
 .controller-search .action-search-software_infos .search-field .formfield {
-  width: 80%;
+  width: 100%;
+  margin: 0;
+  padding: 0;
 }
-.action-search-software_infos .only-one-result-box .search-enterprise-item {
-  padding-top:35px !important;
-  padding-bottom: 35px !important;
+.action-search-software_infos .only-one-result-box .search-software-item {
+  padding: 29px 0 31px 0 !important;
   background: #ffffff;
-  /*padding: 50px 0 !important;*/
+  border-bottom: 1px solid #d7d7d7;
 }
 .action-search-software_infos .search-results-innerbox {
@@ -130,30 +278,22 @@
   float:left; 
 }
-/*
-.common-profile-list-block .profile-image {
-  padding:0px 200px;
-}
-*/
-
-.action-search-software_infos .search-enterprise-item-column-left{
-  border-right: 1px solid #ccc;
-  width: 143px;
+.action-search-software_infos .search-software-item-column-left{
+  border-right: 1px dotted  #ccc;
+  width: 130px;
   height: 130px;
-  /*padding: 0px 60px 0px 10px; /*50 no lugar coloquei 70*/
-  /*margin:none;*/
-  /*position:absolute;*/
+  float: left;
 }
-.action-search-software_infos .search-enterprise-item-column-right{
+.action-search-software_infos .search-software-item-column-right{
   width:60%; /*440px;*/
   float:left;
   margin-left: 130px;
-  /*text-align: justify;*/
 }
 #content .search-results-box .vcard {
   display: table;
+  margin: 0;
 }
 #content .vcard a:hover{
@@ -164,19 +304,10 @@
   border: none;
 }
-.action-search-software_infos .org {
-  display:none !important;
-}
-
-.action-search-software_infos .search-enterprise-item-column-left .vcard img {
+.action-search-software_infos .search-software-item-column-left .vcard img {
   max-width: 90px;
   height: auto;
-  /*margin-left: 15px;
-  margin-right: 15px;*/
-  /*max-height: 130px; /*90px;*/
-  /*margin-left: 60%; /*30%;90px;
-  position: absolute;
-  float: left;*/
+  margin-left:170px;
 }
 .action-search-software_infos .common-profile-list-block img{
@@ -184,9 +315,8 @@
 }
 .action-search-software_infos .common-profile-list-block .profile-image{
-  /*padding:20px 40px;*/
-  margin-left: 140px; /*85px; TESTANDO*/ 
-  /*margin-top: 10px;*/
+  margin-left: 130px; 
+  margin-top: 35px;
   width: 130px;
   height: 130px;
 }
@@ -195,64 +325,57 @@
   font-size: 13px;
   font-family: Arial;
   opacity: inherit;
-  width:135px;
+  width:130px;
   padding-right:20px;
   text-align: left;
   position:absolute;
   top:0px;
- /* margin-bottom:130px;*/ /*verificar melhor forma de fazer, tamanho da barra laterial*/
-
+  color: #21376c;
 }
 .action-search-software_infos .common-profile-list-block .extra_info::before{
   content: url("images/ic-calendar.png");
-  line-height: 20px;
   margin-right:10px;
   margin-top:6px;
   float: left;
-  /*padding-top: 10px;*/
-  /* position: static; */
-  /* overflow: auto; */
 }
-.action-search-software_infos .search-enterprise-item .search-enterprise-item-column-right {
+.action-search-software_infos .search-software-item .search-software-item-column-right {
   font-size: 15px;
-  padding-top: 0px;
+  padding: 0 0 0 8px;
   font-family: Arial;
 }
-.action-search-software_infos .search-enterprise-item-column-right .search-community-content-block h4 a {
+.action-search-software_infos .search-software-item-column-right .search-software-content-block {
+}
+.action-search-software_infos .search-software-item-column-right .search-software-content-block h4 a {
   color:#172938 !important;
   font-size:19px !important;
 }
-.action-search-software_infos .search-enterprise-item-column-right span b{
+.action-search-software_infos .search-software-item-column-right span b{
   font-weight: normal;
+  font-size: 13px;
 }
-.action-search-software_infos .search-enterprise-item-column-right span b:last-child {
+.action-search-software_infos .search-software-item-column-right span b:last-child {
   float: left;
-  margin-right: 10px;
-  /*font-size: 13px;*/ /*font deve ser aplicada as categorias*/
-}
-/* Verificar a melhor maneira de fazer
-.action-search-software_infos .search-enterprise-item-column-right span b:nth-last-child(2){
-  display: none;
 }
-.action-search-software_infos .search-enterprise-item-column-right span a:nth-last-child(1){
-  display: none;
-}*/
-
-.action-search-software_infos .search-community-content-block #categories-list{
-  margin-top:35px;
+.action-search-software_infos .search-software-content-block #categories-list{
+  margin-top:30px; 
   margin-bottom: 10px;
 }
-.action-search-software_infos .search-community-content-block #categories-list li{
+
+.action-search-software_infos .search-software-content-block #categories-list li a{
+  color:#2B65cd;
+}
+
+.action-search-software_infos .search-software-content-block #categories-list li{
   text-decoration: underline;
   font-size: 13px;
   color:#2B65cd;
-  display:block !important;
   float:left;
-  margin-right: 10px !important;
+  line-height:18px;
+  margin-left: 7px !important;
   width: auto !important;
 }