Download as
Browse Code »

Commit 4ea3568f89afb48de487251b5304921c8884bc53

Authored by Melissa Wen
2 parents aa5ad781 3a723bcc
Exists in master and in 41 other branches add_sisp_to_chef, add_super_archives_plugin, automates_core_packing, backup_not_prod, changes_in_buttons_on_content_panel, colab_automated_login, colab_spb_plugin_recipe, colab_widgets_settings, disable_email_dev, fix_breadcrumbs_position, fix_categories_software_link, fix_edit_institution, fix_edit_software_with_another_license, fix_get_license_info, fix_gitlab_assets_permission, fix_list_style_inside_article, fix_list_style_on_folder_elements, fix_merge_request_url, fix_models_translations, fix_no_license, fix_software_communities_translations, fix_software_communities_unit_test, fix_style_create_institution_admin_panel, fix_superarchives_imports, fix_sym_links_noosfero, lxc_settings, margin_fix, mezuro_cookbook, refactor_download_block, remove_broken_theme, remove_sisp_buttons, sisp_catalog_header, software_catalog_style_fix, software_communities_html_refactor, software_infos_api, spb_to_rails4, stable-4.1, stable-4.2, theme_header, theme_javascript_refactory, update_search_by_categories

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
Showing 2 changed files with 13 additions and 10 deletions   Show diff stats
src/noosfero-spb/noosfero-spb-theme/css/software-pages.css
  Diff comments   View file @4ea3568
... ... @@ -694,11 +694,11 @@
694 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 700 text-decoration: none;
701   - color:#000;
  701 + color:#172738;
702 702 font-size: 12px;
703 703 font-weight: 700;
704 704 line-height: 18px;
... ... @@ -729,16 +729,18 @@
729 729  
730 730 .model-discussion-page .item-discussion-page-list{
731 731 font-size: 15px;
  732 + font-family:'open_sansregular';
732 733 font-weight: 800;
733 734 border-bottom: 1px solid #ccc;
734 735 margin-bottom: 20px;
735 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 746 .model-discussion-page .email-list,
... ... @@ -751,6 +753,7 @@
751 753 }
752 754  
753 755 .model-discussion-page .sub-question{
  756 + font-family: 'open_sansregular';
754 757 font-weight: 800;
755 758 padding-top: 30px;
756 759 }
... ...
src/noosfero-spb/noosfero-spb-theme/html-reference-resource/discussion-page.html
  Diff comments   View file @4ea3568
... ... @@ -21,7 +21,7 @@
21 21 <p><img src="http://localhost:3000/articles/0000/2282/passo-01.png" alt="" /></p>
22 22 <p><img src="http://localhost:3000/articles/0000/2281/passo-02__1_.png" alt="" /></p>
23 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 25 </div>
26 26  
27 27 <div class="frequently-questions-middle">
... ... @@ -52,7 +52,7 @@
52 52 <div class="mensage-list">
53 53 <div class="item-discussion-page-list"><a name="mensage-list">Como enviar mensagens para as listas?</a></div>
54 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 56 </div>
57 57  
58 58 <div class="mensage-list">
... ...