Download as
Browse Code »

Commit d91beb1aa504ad080cf23dbbc84c3d8d016824eb

Authored by Melissa Wen
1 parent 32cb4807
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

remove redundance, realocate rules to correct file and remove force importance declarations

Showing 3 changed files with 70 additions and 148 deletions   Show diff stats
@@ -102,6 +102,20 @@ color:#717782 @@ -102,6 +102,20 @@ color:#717782
102 footer .footer-atalhos .voltar-ao-topo a:hover { 102 footer .footer-atalhos .voltar-ao-topo a:hover {
103 text-decoration:underline 103 text-decoration:underline
104 } 104 }
  105 +
  106 +.voltar-ao-topo {
  107 + margin-top: 1.915em;
  108 + text-align: right;
  109 +}
  110 +
  111 +
  112 +.voltar-ao-topo a {
  113 + padding-left: 20px;
  114 + background: url(images/voltar-topo.png) no-repeat left center !important;
  115 + color: #777 !important;
  116 + font-size: 15px;
  117 +}
  118 +
105 footer .container-menus { 119 footer .container-menus {
106 /*padding:46px 0 0 0*/ 120 /*padding:46px 0 0 0*/
107 } 121 }
noosfero-base-theme-overwriting.css
  Diff comments   View file @d91beb1
@@ -5,7 +5,6 @@ @@ -5,7 +5,6 @@
5 } 5 }
6 6
7 #wrap-2 { 7 #wrap-2 {
8 - /*margin-top: 0;*/  
9 width: 960px; 8 width: 960px;
10 margin: 0 auto; 9 margin: 0 auto;
11 border: none; 10 border: none;
@@ -69,6 +68,7 @@ @@ -69,6 +68,7 @@
69 padding-left: 0.3em; 68 padding-left: 0.3em;
70 border-bottom: 1px solid #CCCCCC; 69 border-bottom: 1px solid #CCCCCC;
71 border-top: 0px solid #172838; 70 border-top: 0px solid #172838;
  71 + font-weight: bold;
72 } 72 }
73 73
74 #content .title { 74 #content .title {
@@ -76,59 +76,22 @@ @@ -76,59 +76,22 @@
76 padding-right: 70px; 76 padding-right: 70px;
77 } 77 }
78 78
79 -/* verificar onde isso influencia*/  
80 -#content .main-block h1,  
81 -#content .no-boxes h1 {  
82 - font-size: 2.3em !important;  
83 - font-weight: bold !important;  
84 -}  
85 -  
86 -#content .main-block h2 {  
87 - font-size: 1.8em !important;  
88 - min-height: 48px;  
89 -}  
90 -  
91 #content .main-block h3 { 79 #content .main-block h3 {
92 - font-size: 1.5em !important; 80 + font-size: 1.5em;
93 min-height: 48px; 81 min-height: 48px;
94 } 82 }
95 83
96 -#content .main-block #article-cat h4 {  
97 - font-size: 1.3em !important;  
98 - min-height: 0px;  
99 -}  
100 -  
101 -div#article-parent {  
102 - /*position: absolute;*/  
103 - display: block;  
104 - position: relative;  
105 - right: 0px;  
106 - top: 0px;  
107 -}  
108 -  
109 -#article-tags a:link {  
110 - clear: both;  
111 - display: inline-block;  
112 - margin-bottom: 1.5em;  
113 - color: white;  
114 - padding: 3px 5px;  
115 -}  
116 -  
117 -#article-tags a:hover {  
118 - background-color: #000;  
119 - color: white;  
120 -}  
121 /****************************************/ 84 /****************************************/
122 85
123 -/*documentos recentes - todo o site*/ 86 +/*recent documents - everywhere on site*/
124 #content .recent-documents-block ul { 87 #content .recent-documents-block ul {
125 margin-left: 0; 88 margin-left: 0;
126 padding: 0; 89 padding: 0;
127 } 90 }
128 91
129 #content .recent-documents-block li { 92 #content .recent-documents-block li {
130 - background: none repeat scroll 0 0 #eeeff2;/*#FFF;*/  
131 - border-bottom: 1px solid #c0c1c1; /*#CCCCCC;*/ 93 + background: none repeat scroll 0 0 #eeeff2;
  94 + border-bottom: 1px solid #c0c1c1;
132 display: block; 95 display: block;
133 margin: 0; 96 margin: 0;
134 min-height: 1em; 97 min-height: 1em;
@@ -159,7 +122,7 @@ div#article-parent { @@ -159,7 +122,7 @@ div#article-parent {
159 border-top: 1px solid #ddd; 122 border-top: 1px solid #ddd;
160 } 123 }
161 124
162 -/* Menus que nao tiverem titulo, nao tem padding left e right e nao mostra os icones caso seja inserido */ 125 +/* Menus without title shouldn't have padding left and right and shouldn't display icons if are inserted 8 */
163 #content .link-list-block h3.empty + ul li a { 126 #content .link-list-block h3.empty + ul li a {
164 padding-left: 0px; 127 padding-left: 0px;
165 padding-right: 0px; 128 padding-right: 0px;
@@ -176,11 +139,10 @@ div#article-parent { @@ -176,11 +139,10 @@ div#article-parent {
176 139
177 #content .link-list-block li a { 140 #content .link-list-block li a {
178 background-color: #fff; 141 background-color: #fff;
179 - /*border-bottom: 1px solid #64946E !important;*/  
180 border-radius: 0 0 0 0; 142 border-radius: 0 0 0 0;
181 border-right: medium none; 143 border-right: medium none;
182 - border-top: 0px solid #64946E !important;  
183 - color: #2C66CE; /*#454545;*/ 144 + border-top: 0px solid #64946E;
  145 + color: #2C66CE;
184 font-weight: normal; 146 font-weight: normal;
185 width: auto; 147 width: auto;
186 font-size: 14px; 148 font-size: 14px;
@@ -200,25 +162,25 @@ div#article-parent { @@ -200,25 +162,25 @@ div#article-parent {
200 } 162 }
201 163
202 #content .box .link-list-block li a.link-this-page { 164 #content .box .link-list-block li a.link-this-page {
203 - background-color: #ffffff; /*#EEEFFF;*/ 165 + background-color: #ffffff;
204 font-weight: bold; 166 font-weight: bold;
205 width: auto; 167 width: auto;
206 margin-left: 0px; 168 margin-left: 0px;
207 } 169 }
208 170
209 #site-title { 171 #site-title {
210 -position: absolute;  
211 -left: 8px;  
212 -top: -160px;  
213 -height: 78px;  
214 -width: 480px;  
215 -display: none; 172 + position: absolute;
  173 + left: 8px;
  174 + top: -160px;
  175 + height: 78px;
  176 + width: 480px;
  177 + display: none;
216 } 178 }
217 179
218 #content { 180 #content {
219 left: -480px; 181 left: -480px;
220 margin-left: 50%; 182 margin-left: 50%;
221 - margin-top: 38px; /*30px;*/ 183 + margin-top: 38px;
222 position: relative; 184 position: relative;
223 width: 960px; 185 width: 960px;
224 } 186 }
@@ -241,7 +203,6 @@ input.button.with-text { @@ -241,7 +203,6 @@ input.button.with-text {
241 background-color: #EEEEEE; 203 background-color: #EEEEEE;
242 background-repeat: no-repeat; 204 background-repeat: no-repeat;
243 border: 0px solid #CCCCCC; 205 border: 0px solid #CCCCCC;
244 - /*border-bottom: 1px solid #CCCCCC;*/  
245 color: #555555; 206 color: #555555;
246 line-height: 16px; 207 line-height: 16px;
247 text-decoration: none; 208 text-decoration: none;
@@ -279,7 +240,7 @@ input.button.with-text { @@ -279,7 +240,7 @@ input.button.with-text {
279 border: 1px solid #CCCCCC; 240 border: 1px solid #CCCCCC;
280 } 241 }
281 242
282 -/*label dos radio buttons da busca*/ 243 +/*label of search's radio buttons*/
283 #content .search-field label { 244 #content .search-field label {
284 display: inline-block; 245 display: inline-block;
285 font-size: 12px; 246 font-size: 12px;
@@ -295,5 +256,5 @@ input.button.with-text { @@ -295,5 +256,5 @@ input.button.with-text {
295 margin-left: 1em; 256 margin-left: 1em;
296 } 257 }
297 258
298 -/*********************fim sobrescrevendo themes/base/style.css*********************************/ 259 +/*********************end of overwritting themes/base/style.css*********************************/
299 260
pagina-artigos.css
  Diff comments   View file @d91beb1
@@ -65,7 +65,6 @@ @@ -65,7 +65,6 @@
65 font-family: arial; 65 font-family: arial;
66 } 66 }
67 67
68 -#content .main-block .article-body .zoomable-image,  
69 #content .main-block .article-body img { 68 #content .main-block .article-body img {
70 display: block; 69 display: block;
71 } 70 }
@@ -78,6 +77,17 @@ @@ -78,6 +77,17 @@
78 color: #172938; 77 color: #172938;
79 } 78 }
80 79
  80 +#content .main-block .article-body P strong {
  81 + font-size: 16px;
  82 +}
  83 +
  84 +
  85 +#content .main-block .article-body .zoomable-image {
  86 + overflow: auto;
  87 + display: block;
  88 + margin-bottom: 10px;
  89 +}
  90 +
81 .article-body ul.lista-ajuda { 91 .article-body ul.lista-ajuda {
82 padding-top: 20px; 92 padding-top: 20px;
83 margin-top: 45px; 93 margin-top: 45px;
@@ -110,6 +120,10 @@ @@ -110,6 +120,10 @@
110 margin-right: 6px; 120 margin-right: 6px;
111 } 121 }
112 122
  123 +.article-body .etapas-publicacao-2{
  124 + font-weight: bold;
  125 +}
  126 +
113 #content .main-block .created-at { 127 #content .main-block .created-at {
114 font-family: arial !important; 128 font-family: arial !important;
115 border-top: 1px solid #D7D7D7; 129 border-top: 1px solid #D7D7D7;
@@ -135,12 +149,28 @@ @@ -135,12 +149,28 @@
135 #content .main-block #article-cat { 149 #content .main-block #article-cat {
136 font-size: 21px !important; 150 font-size: 21px !important;
137 } 151 }
  152 +
  153 +#content .main-block #article-cat h4 {
  154 + font-size: 1.3em;
  155 + min-height: 0px;
  156 +}
138 157
139 -.page-comment-form {  
140 - padding: 10px 0; 158 +#article-tags a:link {
  159 + clear: both;
  160 + display: inline-block;
  161 + margin-bottom: 1.5em;
  162 + color: white;
  163 + padding: 3px 5px;
141 } 164 }
142 165
  166 +#article-tags a:hover {
  167 + background-color: #000;
  168 + color: white;
  169 +}
143 170
  171 +.page-comment-form {
  172 + padding: 10px 0;
  173 +}
144 174
145 hr { 175 hr {
146 border: 0; 176 border: 0;
@@ -154,17 +184,11 @@ ol li { @@ -154,17 +184,11 @@ ol li {
154 margin-bottom: 5px; 184 margin-bottom: 5px;
155 } 185 }
156 186
157 -.voltar-ao-topo {  
158 - margin-top: 1.915em;  
159 - text-align: right;  
160 -}  
161 -  
162 -  
163 -.voltar-ao-topo a {  
164 - padding-left: 20px;  
165 - background: url(images/voltar-topo.png) no-repeat left center !important;  
166 - color: #777 !important;  
167 - font-size: 15px; 187 +div#article-parent {
  188 + display: block;
  189 + position: relative;
  190 + right: 0px;
  191 + top: 0px;
168 } 192 }
169 193
170 .ancor { 194 .ancor {
@@ -177,7 +201,6 @@ ol li { @@ -177,7 +201,6 @@ ol li {
177 border-bottom: 1px solid; 201 border-bottom: 1px solid;
178 } 202 }
179 203
180 -  
181 #article-hits { 204 #article-hits {
182 display:none !important; 205 display:none !important;
183 206
@@ -195,82 +218,6 @@ ol li { @@ -195,82 +218,6 @@ ol li {
195 font-size: 15px; 218 font-size: 15px;
196 } 219 }
197 220
198 -#content .main-block h2, #content .main-block h3 {  
199 - min-height: 0 !important;  
200 -}  
201 -  
202 -#content .main-block .article-body h2 {  
203 - font-size: 16px !important;  
204 - font-weight: bold;  
205 - line-height: 21px;  
206 - margin-bottom: 20px;  
207 - font-family: arial;  
208 -}  
209 -  
210 -#content .main-block .article-body h3 {  
211 - font-size: 15px !important;;  
212 - line-height: 21px;  
213 - font-weight: bold;  
214 - margin-bottom: 20px;  
215 - font-family: arial;  
216 -}  
217 -  
218 -#content .main-block .article-body P {  
219 - margin-bottom: 22px;  
220 - font-family: arial;  
221 -}  
222 -  
223 -#content .main-block .article-body P strong {  
224 - font-size: 16px;  
225 -}  
226 -  
227 -  
228 -#content .main-block .article-body .zoomable-image {  
229 - overflow: auto;  
230 - display: block;  
231 - margin-bottom: 10px;  
232 -}  
233 -  
234 -.article-body ul.lista-ajuda {  
235 - padding-top: 20px;  
236 - margin-top: 45px;  
237 - margin-bottom: 20px;  
238 - border-top: 1px solid #ddd;  
239 - font-size: 15px;  
240 -}  
241 -  
242 -.article-body ul.lista-ajuda li {  
243 - list-style-position: inside;  
244 - margin-bottom: 2px;  
245 -}  
246 -  
247 -.article-body ul.etapas-publicacao {  
248 - margin-bottom: 20px;  
249 -}  
250 -  
251 -.article-body ul.etapas-publicacao li {  
252 - list-style: none;  
253 - list-style-position: inside;  
254 - margin-bottom: 10px;  
255 -}  
256 -  
257 -.article-body ul.etapas-publicacao li strong {  
258 - background: #333;  
259 - padding: 2px 8px;  
260 - border-radius: 50%;  
261 - color: #fff;  
262 - float: left;  
263 - margin-right: 6px;  
264 -}  
265 -  
266 -.article-body .etapas-publicacao-2{  
267 - font-weight: bold;  
268 -}  
269 -  
270 -#content .main-block .created-at {  
271 - font-family: arial !important;  
272 -}  
273 -  
274 /* Pagina Ultimas noticias */ 221 /* Pagina Ultimas noticias */
275 222
276 .title_top { 223 .title_top {