Download as
Browse Code »

Commit 1255ac8a4a2397aaa0e4c647d95111e837b712e5

Authored by Tomáz Martins
2 parents a99335f5 872f06f2
Exists in master and in 79 other branches add_sisp_to_chef, add_super_archives_plugin, api_for_colab, automates_core_packing, backup_not_prod, changes_in_buttons_on_content_panel, colab_automated_login, colab_spb_plugin_recipe, colab_widgets_settings, design_validation, dev_env_minimal, 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_members_pagination, fix_merge_request_url, fix_models_translations, fix_no_license, fix_software_api, fix_software_block_migration, fix_software_communities_translations, fix_software_communities_unit_test, fix_style_create_institution_admin_panel, fix_superarchives_imports, fix_sym_links_noosfero, focus_search_field_theme, gov-user-refactoring, gov-user-refactoring-rails4, header_fix, institution_modal_on_rating, kalibro-conf-refactoring, kalibro-processor-package, lxc_settings, margin_fix, mezuro_cookbook, prezento, refactor_download_block, refactor_software_communities, refactor_software_for_sisp, register_page, release-process, release-process-v2, remove-unused-images, remove_broken_theme, remove_secondary_email_from_user, remove_sisp_buttons, removing_super_archives_email, review_message, scope2method, signals_user_noosfero, sisp_catalog_header, sisp_colab_config, sisp_dev, sisp_dev_master, sisp_simple_version, software_as_organization, software_catalog_style_fix, software_communities_html_refactor, software_infos_api, spb_minimal_env, spb_to_rails4, spec_refactor, stable-4.1, stable-4.2, stable-4.x, temp_soft_comm_refactoring, theme_header, theme_javascript_refactory, thread_dropdown, thread_page, update_search_by_categories, update_software_api, update_softwares_boxes

Solving Conflicts 

Conflicts:
	style.css
Showing 7 changed files with 547 additions and 103 deletions   Show diff stats
css/article-page.css
  Diff comments   View file @1255ac8
@@ -9,7 +9,6 @@ @@ -9,7 +9,6 @@
9 font-variant: normal; 9 font-variant: normal;
10 font-weight: bold; 10 font-weight: bold;
11 line-height: 37px; 11 line-height: 37px;
12 - text-transform: capitalize;  
13 } 12 }
14 13
15 #content .main-block #article-header .publishing-info span{ 14 #content .main-block #article-header .publishing-info span{
@@ -18,14 +17,26 @@ @@ -18,14 +17,26 @@
18 font-family: Arial; 17 font-family: Arial;
19 } 18 }
20 19
  20 +#content .main-block .publishing-info a{
  21 + color: #2C66CE;
  22 + font-family: Arial;
  23 +}
  24 +
21 #content .main-block .article-body { 25 #content .main-block .article-body {
22 font-family: Arial ; 26 font-family: Arial ;
23 font-size: 15px; 27 font-size: 15px;
24 line-height: 21px; 28 line-height: 21px;
25 } 29 }
26 30
27 -#content .main-block .article-body a {  
28 - color: #2c66ce; 31 +/* Need a dev solution - blog internal pages*/
  32 +
  33 +#article-header .preview{
  34 + display: none;
  35 +}
  36 +
  37 +#article-hits {
  38 + display: none;
  39 +
29 } 40 }
30 41
31 /* For software internal pages */ 42 /* For software internal pages */
@@ -48,7 +59,7 @@ @@ -48,7 +59,7 @@
48 59
49 #content .main-block .article-body p{ 60 #content .main-block .article-body p{
50 margin-bottom: 22px; 61 margin-bottom: 22px;
51 - font-family: arial; 62 + font-family: Arial;
52 } 63 }
53 64
54 #content .main-block .article-body .zoomable-image, 65 #content .main-block .article-body .zoomable-image,
@@ -161,11 +172,18 @@ @@ -161,11 +172,18 @@
161 #content .main-block .article-header h1.help-page-title { 172 #content .main-block .article-header h1.help-page-title {
162 margin-top: 0px; 173 margin-top: 0px;
163 margin-bottom: 30px; 174 margin-bottom: 30px;
164 - padding-top: 0px; 175 + padding: 0px;
  176 + color: #172738;
165 line-height: 30px; 177 line-height: 30px;
166 - border-top: none; 178 + border: none;
167 letter-spacing: -0.1px; 179 letter-spacing: -0.1px;
  180 + font-family: Arial;
168 font-size: 26px; 181 font-size: 26px;
  182 + font-variant: normal;
  183 +}
  184 +
  185 +#content .main-block .article-body p a {
  186 + color: #2c66ce;
169 } 187 }
170 188
171 /*** end of help page ***/ 189 /*** end of help page ***/
css/community-pages.css 0 → 100644
  Diff comments   View file @1255ac8
@@ -0,0 +1,151 @@ @@ -0,0 +1,151 @@
  1 +/*** Events ***/
  2 +
  3 +#content .event-card {
  4 + border-top: 1px dotted #D3D6D3;
  5 + background-repeat: no-repeat;
  6 + width: 494px;
  7 + height: 116px;
  8 + margin-bottom: 30px;
  9 +}
  10 +
  11 +#content .event-image {
  12 + border-right: 1px dotted #D3D6DE;
  13 +}
  14 +
  15 +#content .about-event > span {
  16 + font-family: Arial;
  17 + line-height: 13px;
  18 +}
  19 +
  20 +#content .about-event .event-date {
  21 + font-weight: bold;
  22 + letter-spacing: 0.49px;
  23 +}
  24 +
  25 +#content .about-event .event-address {
  26 + margin-top: 19px;
  27 +}
  28 +
  29 +#content .about-event .event-address span {
  30 + margin-top: 4.4px;
  31 + line-height: 14px;
  32 + letter-spacing: 0.5px;
  33 +}
  34 +
  35 +#content .event-link {
  36 + letter-spacing: 0.48px;
  37 +}
  38 +
  39 +#content .event-link a {
  40 + text-decoration: underline;
  41 +}
  42 +
  43 +#content .event-body .event-lead p {
  44 + font-size: 16px;
  45 + font-family: Arial;
  46 + font-weight: bold;
  47 + letter-spacing: -0.4px;
  48 + line-height: 21px;
  49 +}
  50 +
  51 +#content .event-body .event-content p {
  52 + font-size: 15px;
  53 + font-family: Arial;
  54 + line-height: 22px;
  55 +}
  56 +
  57 +/*** Profile page ***/
  58 +.action-profile-index #content .main-block h1 {
  59 + color: #172738;
  60 + border-bottom: none;
  61 + font-size: 2.3em;
  62 + font-weight: bold;
  63 + font-variant: normal;
  64 + font-family: Arial, open_sansbold, Helvetica, sans-serif;
  65 +}
  66 +
  67 +/* Search form */
  68 +
  69 +.action-profile-index .main-block #public-profile-search,
  70 +.action-profile-index .main-block #profile-search-results form,
  71 +.action-profile-index .main-block .profile-search-block form {
  72 + background-color: transparent;
  73 +}
  74 +
  75 +.action-profile-index .main-block #public-profile-search .search-field .formfield {
  76 + float: left;
  77 + margin-right: 0.5em;
  78 +}
  79 +
  80 +.action-profile-index .main-block #public-profile-search .search-field .formfield input {
  81 + margin-top: 0px;
  82 + margin-right: 0.5em;
  83 + padding: 6px;
  84 + height: 19px;
  85 + max-height: 19px;
  86 + border: 1px solid #ccc;
  87 + border-radius: 4px;
  88 +}
  89 +
  90 +.action-profile-index .main-block #public-profile-search .formfield input,
  91 +.action-profile-index .main-block #public-profile-search .formfield textarea{
  92 + width: 100%;
  93 + background: none #FFFFFF;
  94 + color: #585858;
  95 + border: 1px solid #DDDDDD;
  96 + font-size: 16px;
  97 + word-wrap: break-word;
  98 +}
  99 +
  100 +.action-profile-index .main-block #public-profile-search form input.button.submit {
  101 + height: 32px;
  102 + background: #2B51A8;
  103 + font-size: 14px;
  104 + margin-top: 8px;
  105 + color: #ffffff;
  106 + text-transform: uppercase;
  107 + border-radius: 4px;
  108 + border: 1px solid #2B51A8;
  109 + padding: 5px 15px;
  110 +}
  111 +
  112 +/* Profile tab */
  113 +
  114 +.action-profile-index .main-block .profile .ui-tabs{
  115 + border: none;
  116 +}
  117 +
  118 +.action-profile-index .main-block .profile .ui-tabs .ui-tabs-nav{
  119 + margin: 0 0 0 1em;
  120 + padding: 0;
  121 + background: none;
  122 + color: #172738;
  123 + border: 0px solid #aaaaaa;
  124 + border-radius: 4px;
  125 + font-weight: bold;
  126 +}
  127 +
  128 +.action-profile-index .main-block .profile .ui-widget-content .ui-state-default,
  129 +.action-profile-index .main-block .profile .ui-widget-header .ui-state-default{
  130 + background: #d5d5d5 none;
  131 + color: #555555;
  132 + font-weight: normal;
  133 +}
  134 +
  135 +.action-profile-index .main-block .profile .ui-widget-content .ui-state-active,
  136 +.action-profile-index .main-block .profile .ui-widget-header .ui-state-active{
  137 + background: #eeeff1;
  138 + color: #212121;
  139 + font-weight: normal;
  140 +}
  141 +
  142 +.action-profile-index .main-block .profile .ui-tabs .ui-tabs-panel{
  143 + display: block;
  144 + padding: 1em 1.4em;
  145 + background-color: #eeeff1;
  146 + color: #777;
  147 + border-width: 1px;
  148 + font-size: 13px;
  149 + text-decoration: none;
  150 +}
  151 +
css/edition-pages.css 0 → 100644
  Diff comments   View file @1255ac8
@@ -0,0 +1,222 @@ @@ -0,0 +1,222 @@
  1 +/*** General Form Fields ***/
  2 +
  3 +/*** Edit Blog and Articles ***/
  4 +
  5 +.controller-cms #content .main-block h1{
  6 + margin: 0 0 10px 0;
  7 + padding: 0;
  8 + color: #172738;
  9 + border-bottom: none;
  10 + font-family: Arial;
  11 + font-size: 32px;
  12 + font-weight: bold;
  13 + font-variant: normal;
  14 +}
  15 +
  16 +.controller-cms #content .main-block form{
  17 + font-size: 14px;
  18 + font-family: Arial;
  19 +}
  20 +
  21 +.controller-cms #content .main-block form .required-field .pseudoformlabel,
  22 +.controller-cms #content .main-block form .required-field label.formlabel:after {
  23 + color: #FF0366;
  24 + font-size: 14px;
  25 + font-weight: 500;
  26 +}
  27 +
  28 +.controller-cms #content .main-block .formlabel {
  29 + display: inline-block;
  30 + max-width: 100%;
  31 + margin-bottom: 5px;
  32 + padding: 10px 0 5px 0;
  33 + color: #231f20;
  34 + font-size: 14px;
  35 +}
  36 +
  37 +.controller-cms #content .main-block .formfieldline .formfield code {
  38 + display: block;
  39 + width: auto;
  40 + height: 30px;
  41 + padding: 2px 0px 2px 0px;
  42 + border: none;
  43 + border-radius: 4px;
  44 + font-size: 15px;
  45 + font-family: Arial, helvetica;
  46 +}
  47 +
  48 +.controller-cms #content .main-block .formfieldline .formfield code * {
  49 + display: inline;
  50 +}
  51 +
  52 +.controller-cms #content .main-block .formfieldline .formfield code input[type="text"] {
  53 + padding: 6px;
  54 + color: #585858;
  55 + background: none;
  56 + border: 1px solid #ccc;
  57 + border-radius: 4px;
  58 + font-size: 15px;
  59 + font-family: Arial, helvetica;
  60 +}
  61 +
  62 +.controller-cms #content .main-block .formfieldline textarea{
  63 + padding: 6px;
  64 + color: #585858;
  65 + background: none;
  66 + border: 1px solid #ccc;
  67 + border-radius: 4px;
  68 + font-family: Arial, helvetica;
  69 + font-size: 15px;
  70 +}
  71 +
  72 +.controller-cms #content .main-block .formfieldline .formfield code input[type="text"]:hover,
  73 +.controller-cms #content .main-block .formfieldline .formfield code input[type="text"]:focus,
  74 +.controller-cms #content .main-block .formfieldline textarea:hover,
  75 +.controller-cms #content .main-block .formfieldline textarea:focus{
  76 + border: 1px solid #172738;
  77 +}
  78 +
  79 +.controller-cms #content .main-block .formfieldline .type-file .type-file .formlabel{
  80 + display: none;
  81 +}
  82 +
  83 +.controller-cms #content .main-block .formfieldline .type-file .type-file .type-text .formlabel{
  84 + display: block;
  85 +}
  86 +
  87 +.controller-cms #content .formfield #article_image_builder_uploaded_data,
  88 +.controller-cms #content .formfield #article_image_builder_label{
  89 + height: 19px;
  90 + padding: 6px;
  91 + background: none;
  92 + border: 1px solid #ccc;
  93 + border-radius: 4px;
  94 + font-size: 12px;
  95 + text-indent: 0px;
  96 +}
  97 +
  98 +.controller-cms #content .formfield #article_image_builder_uploaded_data:hover,
  99 +.controller-cms #content .formfield #article_image_builder_label:hover,
  100 +.controller-cms #content .formfield #article_image_builder_uploaded_data:focus,
  101 +.controller-cms #content .formfield #article_image_builder_label:focus{
  102 + border: 1px solid #172738;
  103 +}
  104 +
  105 +.controller-cms #content .formfield #fetch-external-feed {
  106 + padding-left: 20px;
  107 + border-radius: 4px;
  108 +}
  109 +
  110 +.controller-cms #content .formfield #fetch-external-feed > input {
  111 + height: 13px;
  112 + margin: 8px 8px 8px 0px;
  113 + vertical-align: middle;
  114 + width: 13px;
  115 +}
  116 +
  117 +.controller-cms #content .formfield #fetch-external-feed #external-feed-options #external-feed-options-only-once input {
  118 + margin-right: 3px;
  119 + width: 13px;
  120 + vertical-align: middle;
  121 +}
  122 +
  123 +.controller-cms #content .formfield #fetch-external-feed #external-feed-options #external-feed-options-only-once label {
  124 + margin-right: 250px;
  125 +}
  126 +
  127 +.controller-cms #content .main-content form label.formlabel,
  128 +.controller-cms #content .main-content form .article-translation-field {
  129 + font-size: 14px;
  130 + margin-bottom: 5px;
  131 + color: #231f20;
  132 +}
  133 +
  134 +.controller-cms #content .main-content form .article-translation-field {
  135 + margin-top: 25px;
  136 + margin-bottom: 15px;
  137 +}
  138 +
  139 +.controller-cms #content .main-block form .button-bar input{
  140 + min-width: 100px;
  141 + margin-right: 10px;
  142 + padding: 2px 5px;
  143 + color: #FFF;
  144 + background: #2C66CE;
  145 + font-size: 15px;
  146 + border: none;
  147 +}
  148 +
  149 +.controller-cms #content .main-block form .button-bar input:hover {
  150 + background: #5E82C6;
  151 + border: none;
  152 +}
  153 +
  154 +.controller-cms #content .main-block form .button-bar a.button{
  155 + height: 29px;
  156 + min-width: 100px;
  157 + padding: 1px 0 0 0;
  158 + color: #2C66CE;
  159 + background: #FFF;
  160 + border: 1px solid #2C66CE;
  161 + font-size: 14px;
  162 + text-align: center;
  163 +}
  164 +
  165 +.controller-cms #content .main-block form .button-bar a.button:hover{
  166 + background: none;
  167 + color: #5E82C6;
  168 + border-color: #5E82C6;
  169 +}
  170 +
  171 +.controller-cms #content .main-block form .box-title{
  172 + font-size: 15px;
  173 + font-family: Arial, helvetica;
  174 +}
  175 +
  176 +.controller-cms #content .main-block #category-ajax-selector{
  177 + border-style: dotted;
  178 +}
  179 +
  180 +.controller-cms #content .main-block #category-ajax-selector label{
  181 + font-size: 14px;
  182 +}
  183 +
  184 +.controller-cms #content .main-block #category-ajax-selector .select-subcategory-link{
  185 + background: #FFF;
  186 + border: 1px solid #2C66CE;
  187 + color: #2C66CE;
  188 + padding: 3px;
  189 +}
  190 +
  191 +.controller-cms #content .main-block #category-ajax-selector .select-subcategory-link:hover{
  192 + background: #2C66CE;
  193 + color: #FFF;
  194 +}
  195 +
  196 +.controller-cms #content .main-block .inputosaurus-required{
  197 + background: none;
  198 + border: 1px solid #ccc;
  199 +}
  200 +
  201 +.controller-cms #content .main-block .inputosaurus-required:hover,
  202 +.controller-cms #content .main-block .inputosaurus-required:focus{
  203 + border: 1px solid #172738;
  204 +}
  205 +
  206 +.controller-cms #content .main-block .inputosaurus-required input:hover{
  207 + background: none;
  208 +}
  209 +
  210 +#content #edit-article-options h4 {
  211 + font-family: "open_sansbold", Arial, Helvetica, sans-serif;
  212 + font-size: 14px;
  213 +}
  214 +
  215 +#content #edit-article-options div div {
  216 + margin-top: 13px;
  217 + margin-bottom: 13px;
  218 +}
  219 +
  220 +
  221 +/*** Edit Organizations ***/
  222 +
css/main-content.css
  Diff comments   View file @1255ac8
@@ -29,3 +29,56 @@ @@ -29,3 +29,56 @@
29 font-family: "open_sansregular", Arial, Helvetica, sans-serif; 29 font-family: "open_sansregular", Arial, Helvetica, sans-serif;
30 text-transform: none; 30 text-transform: none;
31 } 31 }
  32 +
  33 +/*** Pagination ***/
  34 +
  35 +#content .pagination {
  36 + margin: 48px auto 30px auto;
  37 + border-top: 0 none;
  38 + font-family: "open_sansregular", Arial, Helvetica, sans-serif;
  39 +}
  40 +
  41 +#content .pagination a,
  42 +#content .pagination em,
  43 +#content .pagination span{
  44 + padding: 7px 11px 7px 11px;
  45 + margin-right: 4px;
  46 + color: #172738;
  47 + border: 1px solid #D3D6DE;
  48 + border-radius: 4px;
  49 + letter-spacing: 0.6px;
  50 + font-size: 15px;
  51 + font-weight: 700;
  52 + text-decoration: none;
  53 + display: inline-table;
  54 +}
  55 +
  56 +#content .pagination .current {
  57 + background-color: #ECEDF1;
  58 + font-style: normal;
  59 +}
  60 +
  61 +#content .pagination .previous_page{
  62 + padding: 7px 11px 10px 11px;
  63 + float: left;
  64 +}
  65 +
  66 +#content .pagination .next_page{
  67 + float: right;
  68 + padding: 7px 11px 10px 11px;
  69 +}
  70 +
  71 +#content .pagination .previous_page,
  72 +#content .pagination .next_page{
  73 + width: auto;
  74 + position: relative;
  75 + background-image: none;
  76 + font-weight: 500;
  77 +}
  78 +
  79 +#content .pagination .disabled{
  80 + opacity: 0.5;
  81 +}
  82 +
  83 +
  84 +
css/news-page.css
  Diff comments   View file @1255ac8
@@ -47,9 +47,10 @@ @@ -47,9 +47,10 @@
47 47
48 #content .blog .blog-post h1.title { 48 #content .blog .blog-post h1.title {
49 margin: 0px 0px 10px 0px; 49 margin: 0px 0px 10px 0px;
50 - border: none;  
51 padding: 0px 0px 0px 0px; 50 padding: 0px 0px 0px 0px;
  51 + max-width: 555px;
52 max-height: 40px; 52 max-height: 40px;
  53 + border: none;
53 font: normal normal bold 16px/20px arial; 54 font: normal normal bold 16px/20px arial;
54 overflow: hidden; 55 overflow: hidden;
55 display: inline-block; 56 display: inline-block;
@@ -192,4 +193,4 @@ @@ -192,4 +193,4 @@
192 clear: both; 193 clear: both;
193 } 194 }
194 195
195 -/*** end of News Page's homepage ***/  
196 \ No newline at end of file 196 \ No newline at end of file
  197 +/*** end of News Page's homepage ***/
css/overwriting-base-theme.css
  Diff comments   View file @1255ac8
1 /************overwriting themes/base/style.css****************/ 1 /************overwriting themes/base/style.css****************/
2 #wrap-1, #theme-footer { 2 #wrap-1, #theme-footer {
3 - margin: auto;  
4 - width: 100%; 3 + margin: auto;
  4 + width: 100%;
5 } 5 }
6 6
7 #wrap-2 { 7 #wrap-2 {
@@ -12,11 +12,11 @@ @@ -12,11 +12,11 @@
12 } 12 }
13 13
14 #main { 14 #main {
15 - background: #fff;  
16 - font-size: 1.3em;  
17 - padding: 1em 0;  
18 - max-width: 960px;  
19 - margin: 0 auto; 15 + background: #fff;
  16 + font-size: 1.3em;
  17 + padding: 1em 0;
  18 + max-width: 960px;
  19 + margin: 0 auto;
20 } 20 }
21 21
22 #wrapper { 22 #wrapper {
@@ -54,67 +54,65 @@ @@ -54,67 +54,65 @@
54 #content .main-block h2, 54 #content .main-block h2,
55 #content .main-block h3, 55 #content .main-block h3,
56 #content .main-block h4 { 56 #content .main-block h4 {
57 - font-family: 'Open Sans', Arial, Helvetica, sans-serif; 57 + font-family: 'Open Sans', Arial, Helvetica, sans-serif;
58 } 58 }
59 59
60 #content .main-block h1, 60 #content .main-block h1,
61 #not-found h1, 61 #not-found h1,
62 #access-denied h1, 62 #access-denied h1,
63 #content .no-boxes h1 { 63 #content .no-boxes h1 {
64 - color: #444;  
65 - font-size: 1.7em;  
66 - padding: 7px 0;  
67 - margin-left: 0;  
68 - padding-left: 0.3em;  
69 - border-bottom: 1px solid #CCCCCC;  
70 - border-top: 0px solid #172838;  
71 - font-weight: bold; 64 + color: #444;
  65 + font-size: 1.7em;
  66 + padding: 7px 0;
  67 + margin-left: 0;
  68 + padding-left: 0.3em;
  69 + border-bottom: 1px solid #CCCCCC;
  70 + border-top: 0px solid #172838;
  71 + font-weight: bold;
72 } 72 }
73 73
74 #content .title { 74 #content .title {
75 - font-weight: normal;  
76 - padding-right: 70px; 75 + font-weight: normal;
  76 + padding-right: 70px;
77 } 77 }
78 78
79 #content .main-block h3 { 79 #content .main-block h3 {
80 - font-size: 1.5em;  
81 - min-height: 48px; 80 + font-size: 1.5em;
  81 + min-height: 48px;
82 } 82 }
83 83
84 /****************************************/ 84 /****************************************/
85 85
86 /*recent documents - everywhere on site*/ 86 /*recent documents - everywhere on site*/
87 #content .recent-documents-block ul { 87 #content .recent-documents-block ul {
88 - margin-left: 0;  
89 - padding: 0; 88 + margin-left: 0;
  89 + padding: 0;
90 } 90 }
91 91
92 #content .recent-documents-block li { 92 #content .recent-documents-block li {
93 - background: none repeat scroll 0 0 #eeeff2;  
94 - border-bottom: 1px solid #c0c1c1;  
95 - display: block;  
96 - margin: 0;  
97 - min-height: 1em;  
98 - padding: 20px;  
99 - text-align: left; 93 + background: none repeat scroll 0 0 #eeeff2;
  94 + border-bottom: 1px solid #c0c1c1;
  95 + display: block;
  96 + margin: 0;
  97 + min-height: 1em;
  98 + padding: 20px;
  99 + text-align: left;
100 } 100 }
101 101
102 #content .recent-documents-block li a { 102 #content .recent-documents-block li a {
103 - color: #464A55;  
104 - line-height: 1.2em; 103 + color: #464A55;
  104 + line-height: 1.2em;
105 } 105 }
106 -  
107 #content .recent-documents-block li a:hover{ 106 #content .recent-documents-block li a:hover{
108 - color: #000; 107 + color: #000;
109 } 108 }
110 109
111 #content .recent-documents-block .block-title { 110 #content .recent-documents-block .block-title {
112 - border-bottom: 1px solid #757575;  
113 - margin-bottom: 0; 111 + border-bottom: 1px solid #757575;
  112 + margin-bottom: 0;
114 } 113 }
115 114
116 115
117 -  
118 #site-title { 116 #site-title {
119 position: absolute; 117 position: absolute;
120 left: 8px; 118 left: 8px;
@@ -125,82 +123,80 @@ @@ -125,82 +123,80 @@
125 } 123 }
126 124
127 #content { 125 #content {
128 - left: -480px;  
129 - margin-left: 50%;  
130 - margin-top: 38px;  
131 - position: relative;  
132 - width: 960px; 126 + left: -480px;
  127 + margin-left: 50%;
  128 + margin-top: 38px;
  129 + position: relative;
  130 + width: 960px;
133 } 131 }
134 132
135 133
136 input.button.with-text { 134 input.button.with-text {
137 - background-position: 3px 50%;  
138 - font-size: 12px;  
139 - padding: 0 2px 2px 20px;  
140 - max-height: 28px; 135 + background-position: 3px 50%;
  136 + font-size: 12px;
  137 + padding: 0 2px 2px 20px;
  138 + max-height: 28px;
141 } 139 }
142 140
143 #content a.button.with-text, 141 #content a.button.with-text,
144 #content a.button.with-text { 142 #content a.button.with-text {
145 - height: 28px;  
146 - max-height: 28px; 143 + height: 28px;
  144 + max-height: 28px;
147 } 145 }
148 -  
149 #content input.button, #content a.button { 146 #content input.button, #content a.button {
150 - background-color: #EEEEEE;  
151 - background-repeat: no-repeat;  
152 - border: 0px solid #CCCCCC;  
153 - color: #555555;  
154 - line-height: 16px;  
155 - text-decoration: none; 147 + background-color: #EEEEEE;
  148 + background-repeat: no-repeat;
  149 + border: 0px solid #CCCCCC;
  150 + color: #555555;
  151 + line-height: 16px;
  152 + text-decoration: none;
156 } 153 }
157 154
158 #content #article-actions input.button, 155 #content #article-actions input.button,
159 #content #article-actions a.button, 156 #content #article-actions a.button,
160 #content a.button, 157 #content a.button,
161 #content input.button { 158 #content input.button {
162 - background-color: transparent;  
163 - border: 1px solid #CCCCCC;  
164 - vertical-align: middle; 159 + background-color: transparent;
  160 + border: 1px solid #CCCCCC;
  161 + vertical-align: middle;
165 } 162 }
166 163
167 #content a.button.with-text { 164 #content a.button.with-text {
168 - line-height: 28px;  
169 - height: 30px;  
170 - max-height: 30px; 165 + line-height: 28px;
  166 + height: 30px;
  167 + max-height: 30px;
171 } 168 }
  169 +
172 #content form input.button.submit { 170 #content form input.button.submit {
173 - height: 32px;  
174 - max-height: 32px;  
175 - margin-right: 5px; 171 + height: 32px;
  172 + max-height: 32px;
  173 + margin-right: 5px;
176 } 174 }
177 -  
178 #content #article-actions input.button:hover, 175 #content #article-actions input.button:hover,
179 #content #article-actions a.button:hover { 176 #content #article-actions a.button:hover {
180 - background-color: #ccc;  
181 - border: 1px solid #CCCCCC;  
182 - color: white; 177 + background-color: #ccc;
  178 + border: 1px solid #CCCCCC;
  179 + color: white;
183 } 180 }
184 181
185 -  
186 #content a.button:hover { 182 #content a.button:hover {
187 - border: 1px solid #CCCCCC; 183 + border: 1px solid #CCCCCC;
188 } 184 }
189 185
190 /*label of search's radio buttons*/ 186 /*label of search's radio buttons*/
191 #content .search-field label { 187 #content .search-field label {
192 - display: inline-block;  
193 - font-size: 12px;  
194 - vertical-align: middle;  
195 - margin-left: 5px; 188 + display: inline-block;
  189 + font-size: 12px;
  190 + vertical-align: middle;
  191 + margin-left: 5px;
196 } 192 }
197 193
198 #public-profile-search .formfield, #public-profile-search .submit { 194 #public-profile-search .formfield, #public-profile-search .submit {
199 - margin-bottom: 5px; 195 + margin-bottom: 5px;
200 } 196 }
201 197
202 #content .profile ul{ 198 #content .profile ul{
203 - margin-left: 1em; 199 + margin-left: 1em;
204 } 200 }
205 201
206 /*********************end of overwritting themes/base/style.css*********************************/ 202 /*********************end of overwritting themes/base/style.css*********************************/
@@ -11,11 +11,9 @@ @@ -11,11 +11,9 @@
11 @import url(css/main-content.css); 11 @import url(css/main-content.css);
12 @import url(css/article-page.css); 12 @import url(css/article-page.css);
13 @import url(css/news-page.css); 13 @import url(css/news-page.css);
14 -/*  
15 @import url(css/community-pages.css); 14 @import url(css/community-pages.css);
16 -@import url(css/software-pages.css);  
17 -@import url(css/software-catalog-page.css);  
18 -@import url(css/news-page.css); 15 +@import url(css/edition-pages.css);
  16 +/*
19 @import url(css/use-report.css); 17 @import url(css/use-report.css);
20 @import url(css/tooltips.css); 18 @import url(css/tooltips.css);
21 */ 19 */
@@ -131,33 +129,38 @@ body { @@ -131,33 +129,38 @@ body {
131 } 129 }
132 130
133 #content h1, #content h2, #content h3, #content h4, #content h5, #content h6{ 131 #content h1, #content h2, #content h3, #content h4, #content h5, #content h6{
134 - color:inherit;  
135 - font-family: arial;  
136 - font-weight: 700;  
137 - margin-top:20px;  
138 - margin-bottom:10px 132 + margin-top: 20px;
  133 + margin-bottom:10px
  134 + color: inherit;
  135 + font-family: Arial;
  136 + font-weight: 700;
139 } 137 }
  138 +
140 #content h1{ 139 #content h1{
141 - font-size: 34px;  
142 - line-height: 37px; 140 + font-size: 34px;
  141 + line-height: 37px;
143 } 142 }
  143 +
144 #content h2{ 144 #content h2{
145 - font-size:22px;  
146 - line-height: 21px; 145 + font-size: 22px;
  146 + line-height: 21px;
147 } 147 }
  148 +
148 #content h3{ 149 #content h3{
149 - font-size:18px;  
150 - line-height: 1.3em; 150 + font-size: 18px;
  151 + line-height: 21px;
  152 + font-weight: 700;
151 } 153 }
  154 +
152 #content h4, content h5, #content h6 { 155 #content h4, content h5, #content h6 {
153 - font-size: 16px;  
154 - line-height: 21px; 156 + font-size: 16px;
  157 + line-height: 21px;
155 } 158 }
156 159
157 p { 160 p {
158 - font-size: 12px;  
159 - line-height: 1.5em;  
160 - margin: 0px 0px 10px 0px; 161 + margin: 0px 0px 10px 0px;
  162 + line-height: 21px;
  163 + font-size: 15px;
161 } 164 }
162 165
163 166