Commit 4ea3568f89afb48de487251b5304921c8884bc53

Authored by Melissa Wen
2 parents aa5ad781 3a723bcc

Merge branch 'design_44' into 'master'

Adjusts on previous page to access mail list

@julianahilario modifications to improve page which explain about mail list usage

See merge request !124
src/noosfero-spb/noosfero-spb-theme/css/software-pages.css
@@ -694,11 +694,11 @@ @@ -694,11 +694,11 @@
694 text-align: left; 694 text-align: left;
695 } 695 }
696 696
697 -.model-discussion-page .frequently-questions-top li a,  
698 -.model-discussion-page .frequently-questions-middle li a,  
699 -.model-discussion-page .frequently-questions-last li a { 697 +#content .model-discussion-page .frequently-questions-top li a,
  698 +#content .model-discussion-page .frequently-questions-middle li a,
  699 +#content .model-discussion-page .frequently-questions-last li a {
700 text-decoration: none; 700 text-decoration: none;
701 - color:#000; 701 + color:#172738;
702 font-size: 12px; 702 font-size: 12px;
703 font-weight: 700; 703 font-weight: 700;
704 line-height: 18px; 704 line-height: 18px;
@@ -729,16 +729,18 @@ @@ -729,16 +729,18 @@
729 729
730 .model-discussion-page .item-discussion-page-list{ 730 .model-discussion-page .item-discussion-page-list{
731 font-size: 15px; 731 font-size: 15px;
  732 + font-family:'open_sansregular';
732 font-weight: 800; 733 font-weight: 800;
733 border-bottom: 1px solid #ccc; 734 border-bottom: 1px solid #ccc;
734 margin-bottom: 20px; 735 margin-bottom: 20px;
735 padding-bottom: 5px; 736 padding-bottom: 5px;
736 } 737 }
737 738
738 -.model-discussion-page .frequently-questions-top #list-glyph,  
739 -.model-discussion-page .frequently-questions-middle #cancel-glyph,  
740 -.model-discussion-page .frequently-questions-last #send-glyph {  
741 - background: #D3D6DE; 739 +.model-discussion-page .frequently-questions-top .list-glyph,
  740 +.model-discussion-page .frequently-questions-middle .cancel-glyph,
  741 +.model-discussion-page .frequently-questions-last .send-glyph {
  742 + background:#C4C7CC;
  743 + border:1px solid #C4C7CC;
742 } 744 }
743 745
744 .model-discussion-page .email-list, 746 .model-discussion-page .email-list,
@@ -751,6 +753,7 @@ @@ -751,6 +753,7 @@
751 } 753 }
752 754
753 .model-discussion-page .sub-question{ 755 .model-discussion-page .sub-question{
  756 + font-family: 'open_sansregular';
754 font-weight: 800; 757 font-weight: 800;
755 padding-top: 30px; 758 padding-top: 30px;
756 } 759 }
src/noosfero-spb/noosfero-spb-theme/html-reference-resource/discussion-page.html
@@ -21,7 +21,7 @@ @@ -21,7 +21,7 @@
21 <p><img src="http://localhost:3000/articles/0000/2282/passo-01.png" alt="" /></p> 21 <p><img src="http://localhost:3000/articles/0000/2282/passo-01.png" alt="" /></p>
22 <p><img src="http://localhost:3000/articles/0000/2281/passo-02__1_.png" alt="" /></p> 22 <p><img src="http://localhost:3000/articles/0000/2281/passo-02__1_.png" alt="" /></p>
23 <p><img src="http://localhost:3000/articles/0000/2276/img-04.png" alt="" /></p> 23 <p><img src="http://localhost:3000/articles/0000/2276/img-04.png" alt="" /></p>
24 - <p>Deseja acessar a lista de discussao? <a href="http://localhost:3000/search/?order=latest&amp;list=software&amp;type=thread">clique aqui</a></p> 24 + <p>Deseja acessar a lista de discussao? <span class="macro" data-macro="software_communities_plugin/allow_variables"><a href="https://softwarepublico.gov.br/search/?order=latest&list={profile}&type=thread">clique aqui</a></span></p>
25 </div> 25 </div>
26 26
27 <div class="frequently-questions-middle"> 27 <div class="frequently-questions-middle">
@@ -52,7 +52,7 @@ @@ -52,7 +52,7 @@
52 <div class="mensage-list"> 52 <div class="mensage-list">
53 <div class="item-discussion-page-list"><a name="mensage-list">Como enviar mensagens para as listas?</a></div> 53 <div class="item-discussion-page-list"><a name="mensage-list">Como enviar mensagens para as listas?</a></div>
54 <p>Para enviar uma nova mensagem para as listas, basta enviar um e-mail para:</p> 54 <p>Para enviar uma nova mensagem para as listas, basta enviar um e-mail para:</p>
55 - <span class="email-list"><a>nome@listas.softwarepublico.gov.br</a></span> <span class="email-list"><a>nome@listas.softwarepublico.gov.br</a></span> 55 + <p><span class="macro" data-macro="software_communities_plugin/allow_variables">{profile}</span>@listas.softwarepublico.gov.br</p>
56 </div> 56 </div>
57 57
58 <div class="mensage-list"> 58 <div class="mensage-list">